mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Add proper pluralization to message send toast.

fork-5.53.8
Alex Hart 2021-08-16 12:00:19 -03:00
rodzic 8cb3909093
commit a7c4199192
2 zmienionych plików z 14 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt
Wyświetl plik

@ -132,14 +132,16 @@ class MultiselectForwardFragment : FixedRoundedCornerBottomSheetDialogFragment()
viewModel.state.observe(viewLifecycleOwner) { viewModel.state.observe(viewLifecycleOwner) {
val toastTextResId: Int? = when (it.stage) { val toastTextResId: Int? = when (it.stage) {
MultiselectForwardState.Stage.SELECTION -> null MultiselectForwardState.Stage.SELECTION -> null
MultiselectForwardState.Stage.SOME_FAILED -> R.string.MultiselectForwardFragment__messages_sent MultiselectForwardState.Stage.SOME_FAILED -> R.plurals.MultiselectForwardFragment_messages_sent
MultiselectForwardState.Stage.ALL_FAILED -> R.string.MultiselectForwardFragment__messages_failed_to_send MultiselectForwardState.Stage.ALL_FAILED -> R.plurals.MultiselectForwardFragment_messages_failed_to_send
MultiselectForwardState.Stage.SUCCESS -> R.string.MultiselectForwardFragment__messages_sent MultiselectForwardState.Stage.SUCCESS -> R.plurals.MultiselectForwardFragment_messages_sent
} }
if (toastTextResId != null) { if (toastTextResId != null) {
val argCount = getMultiShareArgs().size
dismissibleDialog?.dismiss() dismissibleDialog?.dismiss()
Toast.makeText(requireContext(), toastTextResId, Toast.LENGTH_SHORT).show() Toast.makeText(requireContext(), requireContext().resources.getQuantityString(toastTextResId, argCount), Toast.LENGTH_SHORT).show()
dismissAllowingStateLoss() dismissAllowingStateLoss()
} }
} }

10
app/src/main/res/values/strings.xml
Wyświetl plik

@ -3691,8 +3691,14 @@
<string name="DSLSettingsToolbar__navigate_up">Navigate up</string> <string name="DSLSettingsToolbar__navigate_up">Navigate up</string>
<string name="MultiselectForwardFragment__forward_to">Forward to</string> <string name="MultiselectForwardFragment__forward_to">Forward to</string>
<string name="MultiselectForwardFragment__add_a_message">Add a message</string> <string name="MultiselectForwardFragment__add_a_message">Add a message</string>
<string name="MultiselectForwardFragment__messages_sent">Messages sent</string> <plurals name="MultiselectForwardFragment_messages_sent">
<string name="MultiselectForwardFragment__messages_failed_to_send">Messages failed to send</string> <item quantity="one">Message sent</item>
<item quantity="other">Messages sent</item>
</plurals>
<plurals name="MultiselectForwardFragment_messages_failed_to_send">
<item quantity="one">Message failed to send</item>
<item quantity="other">Messages failed to send</item>
</plurals>
<string name="MultiselectForwardFragment__limit_reached">Limit reached</string> <string name="MultiselectForwardFragment__limit_reached">Limit reached</string>
<!-- EOF --> <!-- EOF -->