diff --git a/CHANGELOG.md b/CHANGELOG.md index 02decae24..1073142a3 100644 --- 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: diff --git a/app/src/main/java/protect/card_locker/MainActivity.java b/app/src/main/java/protect/card_locker/MainActivity.java index 3d6a252ed..152b264bb 100644 --- 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) { diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 98b4d0d93..e00e8c2e8 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -145,7 +145,6 @@ Ich möchte Karten mit dir teilen Kartennummern in die Zwischenablage kopiert Kartennummer(n) kopiert - "Ausgewählt: " Nein Ja Sie haben die Karten-ID geändert. Möchten Sie auch den Strichcode aktualisieren, um denselben Wert zu verwenden\? diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 6e9b310ad..bdd456ff2 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -50,7 +50,6 @@ Redakti Konservi Nuligi - "Elektita: " Aldoni Serĉi \ No newline at end of file diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 095d960a7..ebcb3e983 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -147,7 +147,6 @@ Nimi Ei hakutuloksia, kokeile toisella hakutermillä. Lisää ensin kortti napsauttamalla + plus-painiketta, tai mene ⋮ valikkoon tuodaksesi varmuuskopiosta. - "Valittu: " Lisää Hae Ota valokuva diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 9e6be1f3b..ebaeb7aa4 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -145,7 +145,6 @@ Je veux partager des cartes avec vous Identifiants des cartes copiés dans le presse-papiers Num. de la carte copié(s) - "Sélectionnée : " Vous avez changé l\'identifiant de la carte. Voulez-vous également mettre à jour le code-barres pour utiliser la même valeur \? Non Oui diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d2432639f..f3e9024f6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -145,7 +145,6 @@ Voglio condividere alcune carte con te Numeri delle carte copiati negli appunti Numero/i della carta copiato/i - "Selezionata: " No Hai cambiato l\'ID della carta. Vuoi anche aggiornare il codice a barre per usare lo stesso valore\? diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index a67c880c8..b9a8a7ed4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -144,5 +144,4 @@ あなたとカードを共有したいです カード番号をクリップボードにコピーしました コピーしたカード - "選択: " \ No newline at end of file diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 036ea20f7..dac9644fb 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -45,6 +45,5 @@ Ši kortelė neturi brūkšninio kodo Brūkšninio kodo tipas Nieko nerasta. Pabandykite pakeisti paiešką. - "Pasirinkta: " Ieškoti \ No newline at end of file diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 1906f1a88..18e9e3c28 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -143,7 +143,6 @@ Kopierte kort-ID-er til utklippstavle Frie tredjepartsressurser: %s Frie tredjepartsbibliotek: %s - "Valgt: " Kopierte kort-ID(er) Opphavsrett © 2019–%d Sylvia van Os. Du har endret kortets ID. Ønsker du å også oppdatere strekkoden til samme verdi\? diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index b031c77d1..712a6036e 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -145,7 +145,6 @@ Ik wil kaarten met je delen De kaart-id\'s zijn gekopieerd naar het klembord De kaart-id‘s zijn gekopieerd - "Geselecteerd: " Nee Ja Je hebt de kaart-id aangepast. Wil je dezelfde waarde toekennen aan de barcode\? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index f09557e1e..f52381da0 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -147,7 +147,6 @@ Поделиться картами Скопированные номера карт Номера карт скопированы в буфер обмена - "Выбрано: " Вы изменили номер карты. Обновить также значение штрих-кода, чтобы использовалось одинаковое значение\? Нет Да diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index fe0efcc18..2e5cb083f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -149,7 +149,6 @@ Замітка Ім\'я Збігів не знайдено. Спробуйте змінити параметри пошуку. - "Обрано: " Додати Пошук \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 58fd080c1..a21772158 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -141,7 +141,6 @@ 名称 没有找到任何东西。尝试改变你的搜索。 点击 \"+\"加号按钮来添加卡片,或者先从⋮菜单中导入一些。 - "选中: " 添加 搜索 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fa4cbc746..d27fa4488 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,7 +4,10 @@ Search Add - Selected:\u0020 + + Selected: %d card + Selected: %d cards + Click the + plus button to add a card, or import some from the ⋮ menu first. Didn\'t find anything. Try changing your search.