Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #3368 Add missing supported languages #3389

Merged
merged 1 commit into from
May 19, 2020
Merged

Fixes #3368 Add missing supported languages #3389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/src/common/shared/org/mozilla/vrbrowser/utils/LocaleUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand All @@ -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)));
Expand All @@ -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");
Expand Down
16 changes: 16 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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'. -->
Expand Down