Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit 0e0c034

Browse files
authored
Add missing display languages (#3389)
1 parent 7677ed2 commit 0e0c034

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

app/src/common/shared/org/mozilla/vrbrowser/utils/LocaleUtils.java

+7-1
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,8 @@ private static Map<String, Language> getSupportedLocalizedLanguages(@NonNull Con
286286
mSupportedLanguagesCache = new LinkedHashMap<String, Language>() {{
287287
Locale locale = new Locale("en","US");
288288
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_english, locale)));
289+
locale = new Locale("en","GB");
290+
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_english_uk, locale)));
289291
locale = new Locale.Builder().setLanguage("zh").setScript("Hant").setRegion("TW").build();
290292
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_traditional_chinese, locale)));
291293
locale = new Locale.Builder().setLanguage("zh").setScript("Hans").setRegion("CN").build();
@@ -297,6 +299,8 @@ private static Map<String, Language> getSupportedLocalizedLanguages(@NonNull Con
297299
locale = new Locale("de","DE");
298300
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_german, locale)));
299301
locale = new Locale("es","ES");
302+
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_spanish_spain, locale)));
303+
locale = new Locale("es");
300304
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_spanish, locale)));
301305
locale = new Locale("ru","RU");
302306
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
309313
locale = new Locale("pl","PL");
310314
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_polish, locale)));
311315
locale = new Locale("nb","NO");
312-
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_norwegian, locale)));
316+
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_norwegian_bokmaal, locale)));
317+
locale = new Locale("nn","NO");
318+
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_norwegian_nynorsk, locale)));
313319
locale = new Locale("sv","SE");
314320
put(locale.toLanguageTag(), new Language(locale, StringUtils.getStringByLocale(context, R.string.settings_language_swedish, locale)));
315321
locale = new Locale("fi","FI");

app/src/main/res/values/strings.xml

+16
Original file line numberDiff line numberDiff line change
@@ -224,6 +224,10 @@
224224
changes the app and the language of the speech-recognition-based search to 'English (US)'. -->
225225
<string name="settings_language_english">English (US)</string>
226226

227+
<!-- This string is used to label a radio button in the 'Settings' Language dialog that, when pressed,
228+
changes the app and the language of the speech-recognition-based search to 'English (UK)'. -->
229+
<string name="settings_language_english_uk">English (UK)</string>
230+
227231
<!-- This string is used to label a radio button in the settings language dialog that, when pressed,
228232
changes the app and the language of the speech-recognition-based search to 'Chinese (Traditional/Zhuyin)'. -->
229233
<string name="settings_language_traditional_chinese">Chinese (Traditional/Zhuyin)</string>
@@ -248,6 +252,10 @@
248252
changes the app and the language of the speech-recognition-based search to 'Spanish'. -->
249253
<string name="settings_language_spanish">Spanish</string>
250254

255+
<!-- This string is used to label a radio button in the settings language dialog that, when pressed,
256+
changes the app and the language of the speech-recognition-based search to 'Spanish (Spain)'. -->
257+
<string name="settings_language_spanish_spain">Spanish (Spain)</string>
258+
251259
<!-- This string is used to label a radio button in the settings language dialog that, when pressed,
252260
changes the app and the language of the speech-recognition-based search to 'Korean'. -->
253261
<string name="settings_language_korean">Korean</string>
@@ -271,6 +279,14 @@
271279
<!-- This string is used to label a radio button in the settings language dialog that, when pressed,
272280
changes the app and the language of the speech-recognition-based search to 'Norwegian'. -->
273281
<string name="settings_language_norwegian">Norwegian</string>
282+
283+
<!-- This string is used to label a radio button in the settings language dialog that, when pressed,
284+
changes the app and the language of the speech-recognition-based search to 'Norwegian (Bokmaal)'. -->
285+
<string name="settings_language_norwegian_bokmaal">Norwegian (Bokmaal)</string>
286+
287+
<!-- This string is used to label a radio button in the settings language dialog that, when pressed,
288+
changes the app and the language of the speech-recognition-based search to 'Norwegian (Nynorsk)'. -->
289+
<string name="settings_language_norwegian_nynorsk">Norwegian (Nynorsk)</string>
274290

275291
<!-- This string is used to label a radio button in the settings language dialog that, when pressed,
276292
changes the app and the language of the speech-recognition-based search to 'Danish'. -->

0 commit comments

Comments
 (0)