From bbba4b2e118863a199507c8526bd3064ca66d460 Mon Sep 17 00:00:00 2001
From: Sylvia van Os <sylvia@hackerchick.me>
Date: Mon, 30 Nov 2020 21:44:38 +0100
Subject: [PATCH] Correctly use plural string

---
 .../main/java/protect/card_locker/GroupCursorAdapter.java   | 5 ++++-
 app/src/main/res/values-de/strings.xml                      | 1 -
 app/src/main/res/values-fr/strings.xml                      | 1 -
 app/src/main/res/values-it/strings.xml                      | 1 -
 app/src/main/res/values-nb-rNO/strings.xml                  | 1 -
 app/src/main/res/values-nl/strings.xml                      | 1 -
 app/src/main/res/values-pl/strings.xml                      | 1 -
 app/src/main/res/values-ru/strings.xml                      | 1 -
 app/src/main/res/values/strings.xml                         | 6 +++++-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
index 536ac643b..54a96a9a2 100644
--- a/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
+++ b/app/src/main/java/protect/card_locker/GroupCursorAdapter.java
@@ -43,9 +43,12 @@ class GroupCursorAdapter extends CursorAdapter
         // Extract properties from cursor
         Group group = Group.toGroup(cursor);
 
+        Integer groupCardCount = db.getGroupCardCount(group._id);
+
         // Populate fields with extracted properties
         nameField.setText(group._id);
-        countField.setText(String.format(context.getString(R.string.groupCardCount), db.getGroupCardCount(group._id)));
+
+        countField.setText(context.getResources().getQuantityString(R.plurals.groupCardCount, groupCardCount, groupCardCount));
 
         nameField.setTextSize(settings.getCardTitleListFontSize());
         countField.setTextSize(settings.getCardNoteListFontSize());
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7bfe5cf10..e3beb991e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -96,7 +96,6 @@
     <string name="starImage">Favoritenstern</string>
     <string name="deleteConfirmationGroup">Bitte bestätigen Sie, dass Sie diese Gruppe löschen möchten</string>
     <string name="all">Alle</string>
-    <string name="groupCardCount"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> Karten</string>
     <string name="noGroups">Klicken Sie auf die Schaltfläche + (plus), um zuerst Gruppen hinzuzufügen.
 \n
 \nGruppen machen es einfacher, Dinge zu finden.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 2981e242d..4efd4fa11 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -96,7 +96,6 @@
     <string name="starImage">Étoile favorite</string>
     <string name="deleteConfirmationGroup">Confirmez que vous voulez supprimer cette carte</string>
     <string name="all">Tous</string>
-    <string name="groupCardCount"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> cartes</string>
     <string name="noGroups">Cliquez d\'abord sur le bouton \"+\" (plus) pour ajouter un groupe.
 \n
 \nLes groupes permettent de facilement retrouver vos cartes.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 53c86f7b0..cef549de7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -94,7 +94,6 @@
     <string name="starImage">Stella preferita</string>
     <string name="deleteConfirmationGroup">Conferma di voler eliminare questo gruppo</string>
     <string name="all">Tutti</string>
-    <string name="groupCardCount"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> carte</string>
     <string name="noGroups">Al momento non hai gruppi. Fai clic sul pulsante + (più) per iniziare.
 \n
 \nLe carte possono essere assegnate a gruppi per renderle più facili da trovare.</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index c733a2757..00626be68 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -94,7 +94,6 @@
     <string name="starImage">Favorittstjerne</string>
     <string name="unstar">Fjern fra favoritter</string>
     <string name="star">Legg til i favoritter</string>
-    <string name="groupCardCount"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kort</string>
     <string name="noGroups">Klikk på «+»-tegnet for å legge til grupper først.
 \n
 \nGrupper gjør ting enklere å finne.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3bb533637..8acb7925a 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -91,7 +91,6 @@
     <string name="all">Alles</string>
     <string name="importSuccessful">De kaartgegevens zijn geïmporteerd</string>
     <string name="deleteConfirmationGroup">Bevestig dat je deze groep wilt verwijderen</string>
-    <string name="groupCardCount"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> kaart</string>
     <string name="noGroups">Druk op de knop \'+\' (plus) om een groep toe te voegen.
 \n
 \nDoor kaarten te groeperen vind je ze makkelijker terug.</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 270c795c1..4cccbebe5 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -83,7 +83,6 @@
     <string name="settings_display_barcode_max_brightness">Rozjaśnij widok kodu kreskowego</string>
     <string name="settings_lock_barcode_orientation">Zablokuj autoobracanie kodów kreskowych</string>
     <string name="intent_import_card_from_url_share_text">Chcę udostępnić Ci kartę lojalnościową</string>
-    <string name="groupCardCount"><xliff:g xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">%d</xliff:g> karty</string>
     <string name="deleteConfirmationGroup">Potwierdź, że chcesz usunąć tę grupę</string>
     <string name="all">Wszystko</string>
     <string name="noGroups">Kliknij przycisk + (plus), aby najpierw dodać grupy.
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5002b8020..b589a046e 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -90,7 +90,6 @@
     <string name="intent_import_card_from_url_share_text">Я хочу поделиться картой с вами</string>
     <string name="exportSuccessful">Данные карты экспортированы</string>
     <string name="all">Все</string>
-    <string name="groupCardCount">&lt;xliff:g xmlns:xliff=\"urn:oasis:names:tc:xliff:document:1.2\"&gt;%d&lt;/xliff:g&gt; карт</string>
     <string name="noGroups">Нажмите кнопку + (плюс), чтобы сначала добавить группы.
 \n
 \nГруппы упрощают поиск.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7d98919a4..3d7ad24fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -130,7 +130,11 @@
     <string name="enter_group_name">Enter group name</string>
     <string name="groups">Groups</string>
     <string name="noGroups">Click the "+" (plus) button to add groups first.\n\nGroups make things easier to find.</string>
-    <string name="groupCardCount"><xliff:g>%d</xliff:g> cards</string>
+    <plurals name="groupCardCount">
+        <item quantity="one"><xliff:g>%d</xliff:g> card</item>
+        <item quantity="other"><xliff:g>%d</xliff:g> cards</item>
+    </plurals>
+
     <string name="all">All</string>
     <string name="deleteConfirmationGroup">Please confirm you want to delete this group</string>
     <string name="failedOpeningFileManager">Failed opening a file manager. Please make sure one is installed.</string>