Make selected in main screen selectable

2026-04-02 06:42:47 -04:00 · 2021-07-15 22:09:31 +02:00
parent cb979bfbec
commit b6ef6806a0
15 changed files with 14 additions and 22 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog

+## Unreleased
+
+Changes:
+
+- Fix selected count not being translated
+
 ## v2.0 (2021-07-14)

 Breaking changes:
--- a/app/src/main/java/protect/card_locker/MainActivity.java
+++ b/app/src/main/java/protect/card_locker/MainActivity.java
@@ -439,14 +439,9 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
            searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName()));
            searchView.setSubmitButtonEnabled(false);

-            searchView.setOnCloseListener(new SearchView.OnCloseListener()
-            {
-                @Override
-                public boolean onClose()
-                {
-                    invalidateOptionsMenu();
-                    return false;
-                }
+            searchView.setOnCloseListener(() -> {
+                invalidateOptionsMenu();
+                return false;
            });

            searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener()
@@ -619,7 +614,7 @@ public class MainActivity extends AppCompatActivity implements LoyaltyCardCursor
        if (count == 0) {
            mCurrentActionMode.finish();
        } else {
-            mCurrentActionMode.setTitle("Selected: " + count + " Cards");
+            mCurrentActionMode.setTitle(getResources().getQuantityString(R.plurals.selectedCardCount, count, count));

            MenuItem editItem = mCurrentActionMode.getMenu().findItem(R.id.action_edit);
            if (count == 1) {
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -145,7 +145,6 @@
    <string name="intent_import_card_from_url_share_multiple_text">Ich möchte Karten mit dir teilen</string>
    <string name="copy_to_clipboard_multiple_toast">Kartennummern in die Zwischenablage kopiert</string>
    <string name="card_ids_copied">Kartennummer(n) kopiert</string>
-    <string name="card_selected">"Ausgewählt: "</string>
    <string name="no">Nein</string>
    <string name="yes">Ja</string>
    <string name="updateBarcodeQuestionText">Sie haben die Karten-ID geändert. Möchten Sie auch den Strichcode aktualisieren, um denselben Wert zu verwenden\?</string>
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@@ -50,7 +50,6 @@
    <string name="edit">Redakti</string>
    <string name="save">Konservi</string>
    <string name="cancel">Nuligi</string>
-    <string name="card_selected">"Elektita: "</string>
    <string name="action_add">Aldoni</string>
    <string name="action_search">Serĉi</string>
 </resources>
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -147,7 +147,6 @@
    <string name="storeName">Nimi</string>
    <string name="noMatchingGiftCards">Ei hakutuloksia, kokeile toisella hakutermillä.</string>
    <string name="noGiftCards">Lisää ensin kortti napsauttamalla + plus-painiketta, tai mene ⋮ valikkoon tuodaksesi varmuuskopiosta.</string>
-    <string name="card_selected">"Valittu: "</string>
    <string name="action_add">Lisää</string>
    <string name="action_search">Hae</string>
    <string name="takePhoto">Ota valokuva</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -145,7 +145,6 @@
    <string name="intent_import_card_from_url_share_multiple_text">Je veux partager des cartes avec vous</string>
    <string name="copy_to_clipboard_multiple_toast">Identifiants des cartes copiés dans le presse-papiers</string>
    <string name="card_ids_copied">Num. de la carte copié(s)</string>
-    <string name="card_selected">"Sélectionnée : "</string>
    <string name="updateBarcodeQuestionText">Vous avez changé l\'identifiant de la carte. Voulez-vous également mettre à jour le code-barres pour utiliser la même valeur \?</string>
    <string name="no">Non</string>
    <string name="yes">Oui</string>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -145,7 +145,6 @@
    <string name="intent_import_card_from_url_share_multiple_text">Voglio condividere alcune carte con te</string>
    <string name="copy_to_clipboard_multiple_toast">Numeri delle carte copiati negli appunti</string>
    <string name="card_ids_copied">Numero/i della carta copiato/i</string>
-    <string name="card_selected">"Selezionata: "</string>
    <string name="no">No</string>
    <string name="yes">Sì</string>
    <string name="updateBarcodeQuestionText">Hai cambiato l\'ID della carta. Vuoi anche aggiornare il codice a barre per usare lo stesso valore\?</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -144,5 +144,4 @@
    <string name="intent_import_card_from_url_share_multiple_text">あなたとカードを共有したいです</string>
    <string name="copy_to_clipboard_multiple_toast">カード番号をクリップボードにコピーしました</string>
    <string name="card_ids_copied">コピーしたカード</string>
-    <string name="card_selected">"選択: "</string>
 </resources>
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -45,6 +45,5 @@
    <string name="barcodeNoBarcode">Ši kortelė neturi brūkšninio kodo</string>
    <string name="barcodeType">Brūkšninio kodo tipas</string>
    <string name="noMatchingGiftCards">Nieko nerasta. Pabandykite pakeisti paiešką.</string>
-    <string name="card_selected">"Pasirinkta: "</string>
    <string name="action_search">Ieškoti</string>
 </resources>
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -143,7 +143,6 @@
    <string name="copy_to_clipboard_multiple_toast">Kopierte kort-ID-er til utklippstavle</string>
    <string name="app_resources">Frie tredjepartsressurser: <xliff:g id="app_resources_list">%s</xliff:g></string>
    <string name="app_libraries">Frie tredjepartsbibliotek: <xliff:g id="app_libraries_list">%s</xliff:g></string>
-    <string name="card_selected">"Valgt: "</string>
    <string name="card_ids_copied">Kopierte kort-ID(er)</string>
    <string name="app_copyright_fmt" tools:ignore="PluralsCandidate">Opphavsrett © 2019–<xliff:g>%d</xliff:g> Sylvia van Os.</string>
    <string name="updateBarcodeQuestionText">Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi\?</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -145,7 +145,6 @@
    <string name="intent_import_card_from_url_share_multiple_text">Ik wil kaarten met je delen</string>
    <string name="copy_to_clipboard_multiple_toast">De kaart-id\'s zijn gekopieerd naar het klembord</string>
    <string name="card_ids_copied">De kaart-id‘s zijn gekopieerd</string>
-    <string name="card_selected">"Geselecteerd: "</string>
    <string name="no">Nee</string>
    <string name="yes">Ja</string>
    <string name="updateBarcodeQuestionText">Je hebt de kaart-id aangepast. Wil je dezelfde waarde toekennen aan de barcode\?</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -147,7 +147,6 @@
    <string name="intent_import_card_from_url_share_multiple_text">Поделиться картами</string>
    <string name="card_ids_copied">Скопированные номера карт</string>
    <string name="copy_to_clipboard_multiple_toast">Номера карт скопированы в буфер обмена</string>
-    <string name="card_selected">"Выбрано: "</string>
    <string name="updateBarcodeQuestionText">Вы изменили номер карты. Обновить также значение штрих-кода, чтобы использовалось одинаковое значение\?</string>
    <string name="no">Нет</string>
    <string name="yes">Да</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -149,7 +149,6 @@
    <string name="note">Замітка</string>
    <string name="storeName">Ім\'я</string>
    <string name="noMatchingGiftCards">Збігів не знайдено. Спробуйте змінити параметри пошуку.</string>
-    <string name="card_selected">"Обрано: "</string>
    <string name="action_add">Додати</string>
    <string name="action_search">Пошук</string>
 </resources>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -141,7 +141,6 @@
    <string name="storeName">名称</string>
    <string name="noMatchingGiftCards">没有找到任何东西。尝试改变你的搜索。</string>
    <string name="noGiftCards">点击 \"+\"加号按钮来添加卡片，或者先从⋮菜单中导入一些。</string>
-    <string name="card_selected">"选中： "</string>
    <string name="action_add">添加</string>
    <string name="action_search">搜索</string>
 </resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,7 +4,10 @@

    <string name="action_search">Search</string>
    <string name="action_add">Add</string>
-    <string name="card_selected">Selected:\u0020</string>
+    <plurals name="selectedCardCount">
+        <item quantity="one">Selected: <xliff:g>%d</xliff:g> card</item>
+        <item quantity="other">Selected: <xliff:g>%d</xliff:g> cards</item>
+    </plurals>

    <string name="noGiftCards">Click the + plus button to add a card, or import some from the ⋮ menu first.</string>
    <string name="noMatchingGiftCards">Didn\'t find anything. Try changing your search.</string>