From c247e3aa4e8f7bf897028a92f8050976b01077ba Mon Sep 17 00:00:00 2001 From: goapunk Date: Fri, 2 Nov 2018 13:50:38 +0100 Subject: [PATCH] Hardcode unsupported native language names --- .../android/settings/SettingsFragment.java | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java index 2be89b19e..b89f56a7b 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java @@ -300,13 +300,21 @@ public class SettingsFragment extends PreferenceFragmentCompat LOG.info("Skipping unsupported locale " + tag); continue; } - String nativeName = locale.getDisplayName(locale); - // Fallback to English if the name is unknown in both native and - // current locale. - if (nativeName.equals(tag)) { - String tmp = locale.getDisplayLanguage(Locale.ENGLISH); - if (!tmp.isEmpty() && !tmp.equals(nativeName)) - nativeName = tmp; + String nativeName; + // Unsupported languages won't be translated to their native name. + if (locale.getLanguage().equals("ast")) { + nativeName = "Asturianu"; + } else if (locale.getLanguage().equals("oc")) { + nativeName = "Occitan"; + } else { + nativeName = locale.getDisplayName(locale); + // Fallback to English if the name is unknown in both native and + // current locale. + if (nativeName.equals(tag)) { + String tmp = locale.getDisplayLanguage(Locale.ENGLISH); + if (!tmp.isEmpty() && !tmp.equals(nativeName)) + nativeName = tmp; + } } // Prefix with LRM marker to prevent any RTL direction entries.add("\u200E" + nativeName.substring(0, 1).toUpperCase()