From 741eb5556280f1af44c0303f11606ee18c80d70b Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Fri, 14 Oct 2022 15:40:44 -0400
Subject: [PATCH] Fix some SMS strings.

---
 .../securesms/database/model/MessageRecord.java      |  2 +-
 .../exporter/flow/ExportSmsCompleteFragment.kt       |  2 +-
 .../exporter/flow/ExportingSmsMessagesFragment.kt    |  2 +-
 app/src/main/res/values/strings.xml                  | 12 +++++++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
index c45674978..3d309e4ae 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/model/MessageRecord.java
@@ -237,7 +237,7 @@ public abstract class MessageRecord extends DisplayRecord {
         throw new AssertionError(e);
       }
     } else if (isSmsExportType()) {
-      int messageResource = SignalStore.misc().getSmsExportPhase().isSmsSupported() ? R.string.MessageRecord__you_will_on_longer_be_able_to_send_sms_messages_from_signal_soon
+      int messageResource = SignalStore.misc().getSmsExportPhase().isSmsSupported() ? R.string.MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon
                                                                                     : R.string.MessageRecord__you_can_no_longer_send_sms_messages_in_signal;
       return fromRecipient(getIndividualRecipient(), r -> context.getString(messageResource, r.getDisplayName(context)), R.drawable.ic_update_info_16);
     }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/ExportSmsCompleteFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/ExportSmsCompleteFragment.kt
index a39238be8..1b89359f1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/ExportSmsCompleteFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/ExportSmsCompleteFragment.kt
@@ -20,6 +20,6 @@ class ExportSmsCompleteFragment : Fragment(R.layout.export_sms_complete_fragment
     val binding = ExportSmsCompleteFragmentBinding.bind(view)
 
     binding.exportCompleteNext.setOnClickListener { findNavController().safeNavigate(ExportSmsCompleteFragmentDirections.actionExportingSmsMessagesFragmentToChooseANewDefaultSmsAppFragment()) }
-    binding.exportCompleteStatus.text = getString(R.string.ExportSmsCompleteFragment__d_of_d_messages_exported, args.exportMessageCount, args.exportMessageCount)
+    binding.exportCompleteStatus.text = resources.getQuantityString(R.plurals.ExportSmsCompleteFragment__d_of_d_messages_exported, args.exportMessageCount, args.exportMessageCount, args.exportMessageCount)
   }
 }
diff --git a/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/ExportingSmsMessagesFragment.kt b/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/ExportingSmsMessagesFragment.kt
index 94f04e6e4..c18685426 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/ExportingSmsMessagesFragment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/exporter/flow/ExportingSmsMessagesFragment.kt
@@ -60,7 +60,7 @@ class ExportingSmsMessagesFragment : Fragment(R.layout.exporting_sms_messages_fr
           binding.progress.isIndeterminate = false
           binding.progress.max = it.total
           binding.progress.progress = it.progress
-          binding.progressLabel.text = getString(R.string.ExportingSmsMessagesFragment__exporting_d_of_d, it.progress, it.total)
+          binding.progressLabel.text = resources.getQuantityString(R.plurals.ExportingSmsMessagesFragment__exporting_d_of_d, it.total, it.progress, it.total)
         }
         SmsExportProgress.Init -> binding.progress.isIndeterminate = true
         SmsExportProgress.Starting -> binding.progress.isIndeterminate = true
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3cb3043e7..594b54eea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1391,7 +1391,7 @@
     </plurals>
 
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
-    <string name="MessageRecord__you_will_on_longer_be_able_to_send_sms_messages_from_signal_soon">You will on longer be able to send SMS messages from Signal soon. Invite %1$s to Signal to keep the conversation here.</string>
+    <string name="MessageRecord__you_will_no_longer_be_able_to_send_sms_messages_from_signal_soon">You will no longer be able to send SMS messages from Signal soon. Invite %1$s to Signal to keep the conversation here.</string>
     <!-- In-conversation update message to indicate that the current contact is sms only and will need to migrate to signal to continue the conversation in signal. -->
     <string name="MessageRecord__you_can_no_longer_send_sms_messages_in_signal">You can no longer send SMS messages in Signal. Invite %1$s to Signal to keep the conversation here.</string>
 
@@ -5339,7 +5339,10 @@
     <!-- Message of the screen when exporting sms messages -->
     <string name="ExportingSmsMessagesFragment__this_may_take_awhile">This may take awhile</string>
     <!-- Progress indicator for export -->
-    <string name="ExportingSmsMessagesFragment__exporting_d_of_d">Exporting %1$d of %2$d…</string>
+    <plurals name="ExportingSmsMessagesFragment__exporting_d_of_d">
+        <item quantity="one">Exporting %1$d of %2$d…</item>
+        <item quantity="other">Exporting %1$d of %2$d…</item>
+    </plurals>
 
     <!-- ChooseANewDefaultSmsAppFragment -->
     <!-- Title of the screen -->
@@ -5432,7 +5435,10 @@
     <!-- Button to continue to next screen -->
     <string name="ExportSmsCompleteFragment__next">Next</string>
     <!-- Message showing summary of sms export counts -->
-    <string name="ExportSmsCompleteFragment__d_of_d_messages_exported">%1$d of %2$d messages exported</string>
+    <plurals name="ExportSmsCompleteFragment__d_of_d_messages_exported">
+        <item quantity="one">%1$d of %2$d message exported</item>
+        <item quantity="other">%1$d of %2$d messages exported</item>
+    </plurals>
 
     <!-- EOF -->