mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 03:52:15 +02:00
Code

Uses correct locale

Browse Source 
a862073a8f was merged without third party review. So I guess that nothing is really
obviously correct. We have a method that returns the user's locale. There is no point in indicating a locale if it is
always ROOT.

(cherry picked from commit 6d96bbebd6)
This commit is contained in:
Arthur Milchior 2021-05-23 08:31:34 +02:00 committed by Mike Hardy
parent f036423e83
commit 7071390aee
No known key found for this signature in database
GPG Key ID: 2FB9315A0E38FF42
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.java
View File

@ -114,6 +114,7 @@ import timber.log.Timber;
import static com.ichi2.anki.CardBrowser.Column.*; import static com.ichi2.anki.CardBrowser.Column.*;
import static com.ichi2.libanki.stats.Stats.SECONDS_PER_DAY; import static com.ichi2.libanki.stats.Stats.SECONDS_PER_DAY;
import static com.ichi2.anim.ActivityTransitionAnimation.Direction.*; import static com.ichi2.anim.ActivityTransitionAnimation.Direction.*;
import static com.ichi2.utils.LanguageUtil.getLocaleCompat;
public class CardBrowser extends NavigationDrawerActivity implements public class CardBrowser extends NavigationDrawerActivity implements
DeckDropDownAdapter.SubtitleListener, DeckDropDownAdapter.SubtitleListener,
@ -1875,7 +1876,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
@Override @Override
protected void actualOnValidPostExecute(CardBrowser browser, BooleanGetter result) { protected void actualOnValidPostExecute(CardBrowser browser, BooleanGetter result) {
browser.hideProgressBar(); browser.hideProgressBar();
browser.mActionBarTitle.setText(String.format(Locale.ROOT, "%d", browser.checkedCardCount())); browser.mActionBarTitle.setText(String.format(getLocaleCompat(browser.getResources()), "%d", browser.checkedCardCount()));
browser.invalidateOptionsMenu(); // maybe the availability of undo changed browser.invalidateOptionsMenu(); // maybe the availability of undo changed
// snackbar to offer undo // snackbar to offer undo
String deletedMessage = browser.getResources().getQuantityString(R.plurals.card_browser_cards_deleted, mCardsDeleted, mCardsDeleted); String deletedMessage = browser.getResources().getQuantityString(R.plurals.card_browser_cards_deleted, mCardsDeleted, mCardsDeleted);
@ -2401,7 +2402,7 @@ public class CardBrowser extends NavigationDrawerActivity implements
} }
updateMultiselectMenu(); updateMultiselectMenu();
mActionBarTitle.setText(String.format(Locale.ROOT, "%d", checkedCardCount())); mActionBarTitle.setText(String.format(getLocaleCompat(getResources()), "%d", checkedCardCount()));
} finally { } finally {
if (colIsOpen() && mCardsAdapter != null) { if (colIsOpen() && mCardsAdapter != null) {
mCardsAdapter.notifyDataSetChanged(); mCardsAdapter.notifyDataSetChanged();