From 4e329adaca934145a4b782c84596d670872271c3 Mon Sep 17 00:00:00 2001
From: "Dr. Tobias Quathamer" <toddy@debian.org>
Date: Wed, 8 Feb 2017 22:39:31 +0100
Subject: [PATCH] Use android plural handling for 'Minutes'

---
 .../com/b44t/ui/NotificationsSettingsActivity.java    |  6 +++---
 MessengerProj/src/main/res/values-de/strings.xml      | 10 ++++------
 MessengerProj/src/main/res/values-es/strings.xml      | 10 ++++------
 MessengerProj/src/main/res/values-fr/strings.xml      | 10 ++++------
 MessengerProj/src/main/res/values-it/strings.xml      | 10 ++++------
 MessengerProj/src/main/res/values-nl/strings.xml      | 10 ++++------
 MessengerProj/src/main/res/values-pl/strings.xml      | 11 +++++------
 MessengerProj/src/main/res/values-pt/strings.xml      | 10 ++++------
 MessengerProj/src/main/res/values/strings.xml         | 10 ++++------
 9 files changed, 36 insertions(+), 51 deletions(-)

diff --git a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java b/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java
index bbf28d8ed..0880633ae 100644
--- a/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java
+++ b/MessengerProj/src/main/java/com/b44t/ui/NotificationsSettingsActivity.java
@@ -434,9 +434,9 @@ public class NotificationsSettingsActivity extends BaseFragment implements Notif
                     builder.setTitle(LocaleController.getString("RepeatNotifications", R.string.RepeatNotifications));
                     builder.setItems(new CharSequence[]{
                             LocaleController.getString("Disabled", R.string.Disabled),
-                            LocaleController.formatPluralString("Minutes", 5),
-                            LocaleController.formatPluralString("Minutes", 10),
-                            LocaleController.formatPluralString("Minutes", 30),
+                            ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.Minutes, 5, 5),
+                            ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.Minutes, 10, 10),
+                            ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.Minutes, 30, 30),
                             LocaleController.formatPluralString("Hours", 1),
                             LocaleController.formatPluralString("Hours", 2),
                             LocaleController.formatPluralString("Hours", 4)
diff --git a/MessengerProj/src/main/res/values-de/strings.xml b/MessengerProj/src/main/res/values-de/strings.xml
index d14bce0d8..99432a4cc 100644
--- a/MessengerProj/src/main/res/values-de/strings.xml
+++ b/MessengerProj/src/main/res/values-de/strings.xml
@@ -370,12 +370,10 @@
         <item quantity="other">%d Chats</item>
     </plurals>
 
-    <string name="Minutes_zero">%1$d Minuten</string>
-    <string name="Minutes_one">%1$d Minute</string>
-    <string name="Minutes_two">%1$d Minuten</string>
-    <string name="Minutes_few">%1$d Minuten</string>
-    <string name="Minutes_many">%1$d Minuten</string>
-    <string name="Minutes_other">%1$d Minuten</string>
+    <plurals name="Minutes">
+        <item quantity="one">%d Minute</item>
+        <item quantity="other">%d Minuten</item>
+    </plurals>
     <string name="Hours_zero">%1$d Stunden</string>
     <string name="Hours_one">%1$d Stunde</string>
     <string name="Hours_two">%1$d Stunden</string>
diff --git a/MessengerProj/src/main/res/values-es/strings.xml b/MessengerProj/src/main/res/values-es/strings.xml
index 6dbf83c73..f370d6f79 100644
--- a/MessengerProj/src/main/res/values-es/strings.xml
+++ b/MessengerProj/src/main/res/values-es/strings.xml
@@ -329,12 +329,10 @@
         <item quantity="one">%d mensaje</item>
         <item quantity="other">%d mensajes</item>
     </plurals>
-    <string name="Minutes_zero">%1$d minutos</string>
-    <string name="Minutes_one">%1$d minuto</string>
-    <string name="Minutes_two">%1$d minutos</string>
-    <string name="Minutes_few">%1$d minutos</string>
-    <string name="Minutes_many">%1$d minutos</string>
-    <string name="Minutes_other">%1$d minutos</string>
+    <plurals name="Minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="other">%d minutos</item>
+    </plurals>
     <string name="Hours_zero">%1$d horas</string>
     <string name="Hours_one">%1$d hora</string>
     <string name="Hours_two">%1$d horas</string>
diff --git a/MessengerProj/src/main/res/values-fr/strings.xml b/MessengerProj/src/main/res/values-fr/strings.xml
index 8dc8d88ce..1072e6176 100644
--- a/MessengerProj/src/main/res/values-fr/strings.xml
+++ b/MessengerProj/src/main/res/values-fr/strings.xml
@@ -357,12 +357,10 @@
         <item quantity="other">%d conversations</item>
     </plurals>
 
-    <string name="Minutes_zero">%1$d minute</string>
-    <string name="Minutes_one">%1$d minute</string>
-    <string name="Minutes_two">%1$d minutes</string>
-    <string name="Minutes_few">%1$d minutes</string>
-    <string name="Minutes_many">%1$d minutes</string>
-    <string name="Minutes_other">%1$d minutes</string>
+    <plurals name="Minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
     <string name="Hours_zero">%1$d heure</string>
     <string name="Hours_one">%1$d heure</string>
     <string name="Hours_two">%1$d heures</string>
diff --git a/MessengerProj/src/main/res/values-it/strings.xml b/MessengerProj/src/main/res/values-it/strings.xml
index 04f5ce891..98ceaec07 100644
--- a/MessengerProj/src/main/res/values-it/strings.xml
+++ b/MessengerProj/src/main/res/values-it/strings.xml
@@ -335,12 +335,10 @@
         <item quantity="other">%d chat</item>
     </plurals>
 
-    <string name="Minutes_zero">%1$d minuti</string>
-    <string name="Minutes_one">%1$d minuto</string>
-    <string name="Minutes_two">%1$d minuti</string>
-    <string name="Minutes_few">%1$d minuti</string>
-    <string name="Minutes_many">%1$d minuti</string>
-    <string name="Minutes_other">%1$d minuti</string>
+    <plurals name="Minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="other">%d minuti</item>
+    </plurals>
     <string name="Hours_zero">%1$d ore</string>
     <string name="Hours_one">%1$d ora</string>
     <string name="Hours_two">%1$d ore</string>
diff --git a/MessengerProj/src/main/res/values-nl/strings.xml b/MessengerProj/src/main/res/values-nl/strings.xml
index c89df4d42..331ee8d22 100644
--- a/MessengerProj/src/main/res/values-nl/strings.xml
+++ b/MessengerProj/src/main/res/values-nl/strings.xml
@@ -329,12 +329,10 @@
         <item quantity="one">%d bericht</item>
         <item quantity="other">%d berichten</item>
     </plurals>
-    <string name="Minutes_zero">%1$d minuten</string>
-    <string name="Minutes_one">%1$d minuut</string>
-    <string name="Minutes_two">%1$d minuten</string>
-    <string name="Minutes_few">%1$d minuten</string>
-    <string name="Minutes_many">%1$d minuten</string>
-    <string name="Minutes_other">%1$d minuten</string>
+    <plurals name="Minutes">
+        <item quantity="one">%d minuut</item>
+        <item quantity="other">%d minuten</item>
+    </plurals>
     <string name="Hours_zero">%1$d uur</string>
     <string name="Hours_one">%1$d uur</string>
     <string name="Hours_two">%1$d uur</string>
diff --git a/MessengerProj/src/main/res/values-pl/strings.xml b/MessengerProj/src/main/res/values-pl/strings.xml
index 861588a70..d9c1dcabf 100644
--- a/MessengerProj/src/main/res/values-pl/strings.xml
+++ b/MessengerProj/src/main/res/values-pl/strings.xml
@@ -358,12 +358,11 @@ Uwaga! Jeśli zapomnisz kod dostępu, musisz usunąć i ponownie zainstalować a
         <item quantity="other">%d czatów</item>
     </plurals>
 
-    <string name="Minutes_zero">%1$d minut</string>
-    <string name="Minutes_one">%1$d min.</string>
-    <string name="Minutes_two">%1$d minut</string>
-    <string name="Minutes_few">%1$d minut</string>
-    <string name="Minutes_many">%1$d minut</string>
-    <string name="Minutes_other">%1$d minut</string>
+    <plurals name="Minutes">
+        <item quantity="one">%d minut</item>
+        <item quantity="few">%d minut</item>
+        <item quantity="other">%d minut</item>
+    </plurals>
     <string name="Hours_zero">%1$d godziny</string>
     <string name="Hours_one">%1$d godz.</string>
     <string name="Hours_two">%1$d godziny</string>
diff --git a/MessengerProj/src/main/res/values-pt/strings.xml b/MessengerProj/src/main/res/values-pt/strings.xml
index 77e5d8d50..a7ea67280 100644
--- a/MessengerProj/src/main/res/values-pt/strings.xml
+++ b/MessengerProj/src/main/res/values-pt/strings.xml
@@ -353,12 +353,10 @@
         <item quantity="one">%d mensagem</item>
         <item quantity="other">%d mensagens</item>
     </plurals>
-    <string name="Minutes_zero">%1$d minutos</string>
-    <string name="Minutes_one">%1$d minuto</string>
-    <string name="Minutes_two">%1$d minutos</string>
-    <string name="Minutes_few">%1$d minutos</string>
-    <string name="Minutes_many">%1$d minutos</string>
-    <string name="Minutes_other">%1$d minutos</string>
+    <plurals name="Minutes">
+        <item quantity="one">%d minuto</item>
+        <item quantity="other">%d minutos</item>
+    </plurals>
     <string name="Hours_zero">%1$d horas</string>
     <string name="Hours_one">%1$d hora</string>
     <string name="Hours_two">%1$d horas</string>
diff --git a/MessengerProj/src/main/res/values/strings.xml b/MessengerProj/src/main/res/values/strings.xml
index d08da0e8c..0809673a3 100644
--- a/MessengerProj/src/main/res/values/strings.xml
+++ b/MessengerProj/src/main/res/values/strings.xml
@@ -368,12 +368,10 @@
         <item quantity="one">%d chat</item>
         <item quantity="other">%d chats</item>
     </plurals>
-    <string name="Minutes_zero">%1$d minutes</string>
-    <string name="Minutes_one">%1$d minute</string>
-    <string name="Minutes_two">%1$d minutes</string>
-    <string name="Minutes_few">%1$d minutes</string>
-    <string name="Minutes_many">%1$d minutes</string>
-    <string name="Minutes_other">%1$d minutes</string>
+    <plurals name="Minutes">
+        <item quantity="one">%d minute</item>
+        <item quantity="other">%d minutes</item>
+    </plurals>
     <string name="Hours_zero">%1$d hours</string>
     <string name="Hours_one">%1$d hour</string>
     <string name="Hours_two">%1$d hours</string>