From 50982060aca8be819621dc0c9db2f2223dfa8fa7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 18 Apr 2017 23:17:22 +0200 Subject: [PATCH] support index locales that do not include country (e.g. 'en') --- app/src/main/java/org/fdroid/fdroid/data/App.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/fdroid/fdroid/data/App.java b/app/src/main/java/org/fdroid/fdroid/data/App.java index e1d46ea26..bb4f84d0f 100644 --- a/app/src/main/java/org/fdroid/fdroid/data/App.java +++ b/app/src/main/java/org/fdroid/fdroid/data/App.java @@ -373,7 +373,14 @@ public class App extends ValueObject implements Comparable, Parcelable { private void setLocalized(Map> localized) { // NOPMD Locale defaultLocale = Locale.getDefault(); String languageTag = defaultLocale.getLanguage(); - String localeTag = languageTag + "-" + defaultLocale.getCountry(); + String countryTag = defaultLocale.getCountry(); + String localeTag; + if (TextUtils.isEmpty(countryTag)) { + localeTag = languageTag; + } else { + localeTag = languageTag + "-" + countryTag; + } + Set locales = localized.keySet(); Set localesToUse = new LinkedHashSet<>();