From 9db117e47d94cd613e5cf29f2a9a0c29971162bd Mon Sep 17 00:00:00 2001
From: Julien Humbert <julroy67@gmail.com>
Date: Wed, 23 Aug 2023 19:17:23 +0900
Subject: [PATCH] Add pluralized string (WIP 2)

---
 .../infinityforlemmy/PullNotificationWorker.java | 12 ++++++++++--
 .../activities/PostPollActivity.java             | 16 ++++++++++++++--
 app/src/main/res/values/strings.xml              | 16 ++++++++++++----
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/PullNotificationWorker.java b/app/src/main/java/eu/toldi/infinityforlemmy/PullNotificationWorker.java
index 31da6e5f..afc6fd51 100644
--- a/app/src/main/java/eu/toldi/infinityforlemmy/PullNotificationWorker.java
+++ b/app/src/main/java/eu/toldi/infinityforlemmy/PullNotificationWorker.java
@@ -102,7 +102,11 @@ public class PullNotificationWorker extends Worker {
                     if (!messages.isEmpty()) {
                         NotificationCompat.Builder summaryBuilder = NotificationUtils.buildSummaryNotification(context,
                                 notificationManager, accountName,
-                                context.getString(R.string.notification_new_messages, messages.size()),
+                                context.getResources().getQuantityString(
+                                        R.plurals.notification_new_messages,
+                                        messages.size(),
+                                        messages.size()
+                                ),
                                 NotificationUtils.CHANNEL_ID_NEW_MESSAGES, NotificationUtils.CHANNEL_NEW_MESSAGES,
                                 NotificationUtils.getAccountGroupName(accountName), color);
 
@@ -152,7 +156,11 @@ public class PullNotificationWorker extends Worker {
                         }
 
                         if (hasValidMessage) {
-                            inboxStyle.setBigContentTitle(context.getString(R.string.notification_new_messages, messages.size()))
+                            inboxStyle.setBigContentTitle(context.getResources().getQuantityString(
+                                            R.plurals.notification_new_messages,
+                                            messages.size(),
+                                            messages.size()
+                                    ))
                                     .setSummaryText(accountName);
 
                             summaryBuilder.setStyle(inboxStyle);
diff --git a/app/src/main/java/eu/toldi/infinityforlemmy/activities/PostPollActivity.java b/app/src/main/java/eu/toldi/infinityforlemmy/activities/PostPollActivity.java
index cbf03903..ab190f9d 100644
--- a/app/src/main/java/eu/toldi/infinityforlemmy/activities/PostPollActivity.java
+++ b/app/src/main/java/eu/toldi/infinityforlemmy/activities/PostPollActivity.java
@@ -352,8 +352,20 @@ public class PostPollActivity extends BaseActivity implements FlairBottomSheetFr
             receivePostReplyNotificationsSwitchMaterial.performClick();
         });
 
-        votingLengthTextView.setText(getString(R.string.voting_length, (int) votingLengthSlider.getValue()));
-        votingLengthSlider.addOnChangeListener((slider, value, fromUser) -> votingLengthTextView.setText(getString(R.string.voting_length, (int) value)));
+        votingLengthTextView.setText(
+                getResources().getQuantityString(
+                        R.plurals.voting_length,
+                        (int) votingLengthSlider.getValue(),
+                        (int) votingLengthSlider.getValue()
+                )
+        );
+        votingLengthSlider.addOnChangeListener((slider, value, fromUser) -> votingLengthTextView.setText(
+                getResources().getQuantityString(
+                        R.plurals.voting_length,
+                        (int) value,
+                        (int) value
+                )
+        ));
     }
 
     private void loadCurrentAccount() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4552561d..5f61bcae 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -225,7 +225,10 @@
     <string name="title_required">The post needs a good title</string>
     <string name="link_required">Hey where is the link?</string>
     <string name="select_an_image">Please select an image first</string>
-    <string name="voting_length">Voting length: %1$d days</string>
+    <plurals name="voting_length">
+        <item quantity="one">Voting length: %1$d day</item>
+        <item quantity="other">Voting length: %1$d days</item>
+    </plurals>
     <string name="posting">Posting</string>
     <string name="post_failed">Could not post it</string>
     <string name="error_processing_image">Error processing image</string>
@@ -382,7 +385,10 @@
     <string name="notification_summary_message">New Message</string>
     <string name="notification_summary_community">Community</string>
     <string name="notification_summary_award">Award</string>
-    <string name="notification_new_messages">%1$d New Messages</string>
+    <plurals name="notification_new_messages">
+        <item quantity="one">%1$d New Message</item>
+        <item quantity="other">%1$d New Messages</item>
+    </plurals>
 
     <string name="label_account">Account</string>
     <string name="label_reddit">Lemmy</string>
@@ -1023,8 +1029,10 @@
     <string name="edit_multi_reddit">Edit Multicommunity</string>
     <string name="delete_multi_reddit">Delete Multicommunity</string>
 
-    <string name="n_awards">%1$,d Awards</string>
-    <string name="one_award">1 Award</string>
+    <plurals name="awards">
+        <item quantity="one">%1$,d Award</item>
+        <item quantity="other">%1$,d Awards</item>
+    </plurals>
 
     <string name="report">Report</string>
     <string name="reporting">Reporting</string>