Add missing display languages (#3389)

MozillaReality · May 19, 2020 · 0e0c034 · 0e0c034
1 parent 7677ed2
commit 0e0c034
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/utils/LocaleUtils.java b/app/src/common/shared/org/mozilla/vrbrowser/utils/LocaleUtils.java
@@ -286,6 +286,8 @@ private static Map<String, Language> getSupportedLocalizedLanguages(@NonNull Con
         mSupportedLanguagesCache = new LinkedHashMap<String, Language>() {{
             Locale locale = new Locale("en","US");
             put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_english, locale)));
+            locale = new Locale("en","GB");
+            put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_english_uk, locale)));
             locale = new Locale.Builder().setLanguage("zh").setScript("Hant").setRegion("TW").build();
             put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_traditional_chinese, locale)));
             locale = new Locale.Builder().setLanguage("zh").setScript("Hans").setRegion("CN").build();
@@ -297,6 +299,8 @@ private static Map<String, Language> getSupportedLocalizedLanguages(@NonNull Con
             locale = new Locale("de","DE");
             put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_german, locale)));
             locale = new Locale("es","ES");
+            put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_spanish_spain, locale)));
+            locale = new Locale("es");
             put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_spanish, locale)));
             locale = new Locale("ru","RU");
             put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_russian, locale)));
@@ -309,7 +313,9 @@ private static Map<String, Language> getSupportedLocalizedLanguages(@NonNull Con
             locale = new Locale("pl","PL");
             put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_polish, locale)));
             locale = new Locale("nb","NO");
-            put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_norwegian, locale)));
+            put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_norwegian_bokmaal, locale)));
+            locale = new Locale("nn","NO");
+            put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_norwegian_nynorsk, locale)));
             locale = new Locale("sv","SE");
             put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_swedish, locale)));
             locale = new Locale("fi","FI");

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -224,6 +224,10 @@
          changes the app and the language of the speech-recognition-based search to 'English (US)'. -->
     <string name="settings_language_english">English (US)</string>
 
+    <!-- This string is used to label a radio button in the 'Settings' Language dialog that, when pressed,
+         changes the app and the language of the speech-recognition-based search to 'English (UK)'. -->
+    <string name="settings_language_english_uk">English (UK)</string>
+
     <!-- This string is used to label a radio button in the settings language dialog that, when pressed,
          changes the app and the language of the speech-recognition-based search to 'Chinese (Traditional/Zhuyin)'. -->
     <string name="settings_language_traditional_chinese">Chinese (Traditional/Zhuyin)</string>
@@ -248,6 +252,10 @@
          changes the app and the language of the speech-recognition-based search to 'Spanish'. -->
     <string name="settings_language_spanish">Spanish</string>
 
+    <!-- This string is used to label a radio button in the settings language dialog that, when pressed,
+         changes the app and the language of the speech-recognition-based search to 'Spanish (Spain)'. -->
+    <string name="settings_language_spanish_spain">Spanish (Spain)</string>
+
     <!-- This string is used to label a radio button in the settings language dialog that, when pressed,
          changes the app and the language of the speech-recognition-based search to 'Korean'. -->
     <string name="settings_language_korean">Korean</string>
@@ -271,6 +279,14 @@
     <!-- This string is used to label a radio button in the settings language dialog that, when pressed,
      changes the app and the language of the speech-recognition-based search to 'Norwegian'. -->
     <string name="settings_language_norwegian">Norwegian</string>
+
+    <!-- This string is used to label a radio button in the settings language dialog that, when pressed,
+ changes the app and the language of the speech-recognition-based search to 'Norwegian (Bokmaal)'. -->
+    <string name="settings_language_norwegian_bokmaal">Norwegian (Bokmaal)</string>
+
+    <!-- This string is used to label a radio button in the settings language dialog that, when pressed,
+ changes the app and the language of the speech-recognition-based search to 'Norwegian (Nynorsk)'. -->
+    <string name="settings_language_norwegian_nynorsk">Norwegian (Nynorsk)</string>
 
     <!-- This string is used to label a radio button in the settings language dialog that, when pressed,
      changes the app and the language of the speech-recognition-based search to 'Danish'. -->