diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt index b9a373637e..b998ef9cb2 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/mutiselect/forward/MultiselectForwardFragment.kt @@ -132,14 +132,16 @@ class MultiselectForwardFragment : FixedRoundedCornerBottomSheetDialogFragment() viewModel.state.observe(viewLifecycleOwner) { val toastTextResId: Int? = when (it.stage) { MultiselectForwardState.Stage.SELECTION -> null - MultiselectForwardState.Stage.SOME_FAILED -> R.string.MultiselectForwardFragment__messages_sent - MultiselectForwardState.Stage.ALL_FAILED -> R.string.MultiselectForwardFragment__messages_failed_to_send - MultiselectForwardState.Stage.SUCCESS -> R.string.MultiselectForwardFragment__messages_sent + MultiselectForwardState.Stage.SOME_FAILED -> R.plurals.MultiselectForwardFragment_messages_sent + MultiselectForwardState.Stage.ALL_FAILED -> R.plurals.MultiselectForwardFragment_messages_failed_to_send + MultiselectForwardState.Stage.SUCCESS -> R.plurals.MultiselectForwardFragment_messages_sent } if (toastTextResId != null) { + val argCount = getMultiShareArgs().size + dismissibleDialog?.dismiss() - Toast.makeText(requireContext(), toastTextResId, Toast.LENGTH_SHORT).show() + Toast.makeText(requireContext(), requireContext().resources.getQuantityString(toastTextResId, argCount), Toast.LENGTH_SHORT).show() dismissAllowingStateLoss() } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87ccda8131..79ff213dc4 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -3691,8 +3691,14 @@ Navigate up Forward to Add a message - Messages sent - Messages failed to send + + Message sent + Messages sent + + + Message failed to send + Messages failed to send + Limit reached