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 #2670 Language fixes #2672

Merged
merged 3 commits into from Jan 17, 2020
Merged

Fixes #2670 Language fixes #2672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3c37a37
Fix for Pico Taiwanese Chinese locale
keianhzo Jan 3, 2020
860a835
Language fixes
keianhzo Jan 6, 2020
a33549b
Fallback to en-US for Display/Voice when OS language is not supported
keianhzo Jan 6, 2020
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
7 changes: 0 additions & 7 deletions app/src/common/shared/org/mozilla/vrbrowser/browser/SettingsStore.java
View file
Open in desktop
Expand Up @@ -17,7 +17,6 @@
import org.mozilla.vrbrowser.telemetry.GleanMetricsService;
import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
import org.mozilla.vrbrowser.utils.DeviceType;
import org.mozilla.vrbrowser.utils.LocaleUtils;
import org.mozilla.vrbrowser.utils.StringUtils;
import org.mozilla.vrbrowser.utils.SystemUtils;

Expand Down Expand Up @@ -419,9 +418,6 @@ public void setAudioEnabled(boolean isEnabled) {
public String getVoiceSearchLocale() {
String language = mPrefs.getString(
mContext.getString(R.string.settings_key_voice_search_language), null);
if (language == null) {
return LocaleUtils.getDefaultSupportedLocale();
}
return language;
}

Expand All @@ -434,9 +430,6 @@ public void setVoiceSearchLocale(String language) {
public String getDisplayLocale() {
String language = mPrefs.getString(
mContext.getString(R.string.settings_key_display_language), null);
if (language == null) {
return LocaleUtils.getDefaultSupportedLocale();
}
return language;
}

Expand Down
13 changes: 9 additions & 4 deletions ...c/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/ContentLanguageOptionsView.java
View file
Open in desktop
Expand Up @@ -25,6 +25,7 @@
import org.mozilla.vrbrowser.utils.LocaleUtils;

import java.util.Collections;
import java.util.List;

public class ContentLanguageOptionsView extends SettingsView {

Expand Down Expand Up @@ -129,10 +130,14 @@ private void refreshLanguages() {

@Override
protected boolean reset() {
SettingsStore.getInstance(getContext()).setContentLocales(Collections.singletonList(LocaleUtils.getDeviceLanguage().getId()));
SessionStore.get().setLocales(Collections.singletonList(LocaleUtils.getDeviceLanguage().getId()));
LocaleUtils.resetLanguages();
refreshLanguages();
String systemLocale = LocaleUtils.getClosestAvailableLocale(LocaleUtils.getDeviceLanguage().getId());
List<Language> preferredLanguages = LocaleUtils.getPreferredLanguages(getContext());
if (preferredLanguages.size() > 1 || !preferredLanguages.get(0).getId().equals(systemLocale)) {
SettingsStore.getInstance(getContext()).setContentLocales(Collections.emptyList());
SessionStore.get().setLocales(Collections.emptyList());
LocaleUtils.resetLanguages();
refreshLanguages();
}

return false;
}
Expand Down
2 changes: 2 additions & 0 deletions ...c/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/DisplayLanguageOptionsView.java
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
import androidx.databinding.DataBindingUtil;

import org.mozilla.vrbrowser.R;
import org.mozilla.vrbrowser.browser.SettingsStore;
import org.mozilla.vrbrowser.browser.engine.SessionStore;
import org.mozilla.vrbrowser.databinding.OptionsLanguageDisplayBinding;
import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
Expand Down Expand Up @@ -65,6 +66,7 @@ protected boolean reset() {

} else {
setLanguage(LocaleUtils.getIndexForSupportedLocale(systemLocale), true);
SettingsStore.getInstance(getContext()).setDisplayLocale(null);
return true;
}
}
Expand Down
4 changes: 2 additions & 2 deletions app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/settings/LanguageOptionsView.java
View file
Open in desktop
Expand Up @@ -92,7 +92,7 @@ protected void onDismiss() {
};

private void setVoiceLanguage() {
mBinding.voiceSearchLanguageDescription.setText(getSpannedLanguageText(LocaleUtils.getVoiceSearchLanguage(getContext())), TextView.BufferType.SPANNABLE);
mBinding.voiceSearchLanguageDescription.setText(getSpannedLanguageText(LocaleUtils.getVoiceSearchLanguage(getContext()).getName()), TextView.BufferType.SPANNABLE);
}

private void setContentLanguage() {
Expand All @@ -105,7 +105,7 @@ private void setContentLanguage() {
}

private void setDisplayLanguage() {
mBinding.displayLanguageDescription.setText(getSpannedLanguageText(LocaleUtils.getDisplayLanguage()));
mBinding.displayLanguageDescription.setText(getSpannedLanguageText(LocaleUtils.getDisplayLanguage(getContext()).getName()));
}

private int getLanguageIndex(@NonNull String text) {
Expand Down
27 changes: 20 additions & 7 deletions ...mmon/shared/org/mozilla/vrbrowser/ui/widgets/settings/VoiceSearchLanguageOptionsView.java
View file
Open in desktop
Expand Up @@ -12,6 +12,7 @@
import androidx.databinding.DataBindingUtil;

import org.mozilla.vrbrowser.R;
import org.mozilla.vrbrowser.browser.SettingsStore;
import org.mozilla.vrbrowser.browser.engine.SessionStore;
import org.mozilla.vrbrowser.databinding.OptionsLanguageVoiceBinding;
import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
Expand Down Expand Up @@ -58,16 +59,25 @@ private void initialize(Context aContext) {
@Override
protected boolean reset() {
String systemLocale = LocaleUtils.getClosestSupportedLocale(getContext(), LocaleUtils.getDeviceLanguage().getId());
String value = LocaleUtils.getSupportedLocaleForIndex(mBinding.languageRadio.getCheckedRadioButtonId());
if (!value.equals(systemLocale)) {
setLanguage(LocaleUtils.getIndexForSupportedLocale(LocaleUtils.getSystemLocale()), true);
String currentLocale = LocaleUtils.getCurrentLocale();
if (currentLocale.equalsIgnoreCase(systemLocale)) {
setLanguage(LocaleUtils.getIndexForSupportedLocale(systemLocale), false);
return false;

} else {
setLanguage(LocaleUtils.getIndexForSupportedLocale(systemLocale), true);
SettingsStore.getInstance(getContext()).setVoiceSearchLocale(null);
return true;
}

return false;
}

private RadioGroupSetting.OnCheckedChangeListener mLanguageListener = (radioGroup, checkedId, doApply) -> {
setLanguage(checkedId, true);
String currentLocale = LocaleUtils.getCurrentLocale();
String locale = LocaleUtils.getSupportedLocaleForIndex(mBinding.languageRadio.getCheckedRadioButtonId());

if (!locale.equalsIgnoreCase(currentLocale)) {
setLanguage(checkedId, true);
}
};

private OnClickListener mResetListener = (view) -> {
Expand All @@ -79,7 +89,10 @@ private void setLanguage(int checkedId, boolean doApply) {
mBinding.languageRadio.setChecked(checkedId, doApply);
mBinding.languageRadio.setOnCheckedChangeListener(mLanguageListener);

LocaleUtils.setVoiceSearchLocale(getContext(), LocaleUtils.getSupportedLocaleForIndex(checkedId));
if (doApply) {
String locale = LocaleUtils.getSupportedLocaleForIndex(checkedId);
LocaleUtils.setVoiceSearchLocale(getContext(), locale);
}
}

@Override
Expand Down
107 changes: 82 additions & 25 deletions app/src/common/shared/org/mozilla/vrbrowser/utils/LocaleUtils.java
View file
Open in desktop
Expand Up @@ -37,8 +37,8 @@ public static void saveSystemLocale() {
}

@NonNull
public static String getSystemLocale() {
return mSystemLocale.toLanguageTag();
public static Locale getSystemLocale() {
return mSystemLocale;
}

@NonNull
Expand All @@ -60,6 +60,14 @@ private static HashMap<String, Language> getAllLanguages() {
mLanguagesCache.put(languageId, locale);
}

Locale locale = Locale.forLanguageTag(getDeviceLocale().toLanguageTag());
String languageId = locale.toLanguageTag();
if (!mLanguagesCache.containsKey(languageId)) {
String displayName = locale.getDisplayName().substring(0, 1).toUpperCase() + locale.getDisplayName().substring(1);
Language language = new Language(languageId, displayName + " [" + languageId + "]");
mLanguagesCache.put(languageId, language);
}

return mLanguagesCache;
}

Expand All @@ -75,7 +83,11 @@ public static void resetLanguages() {
}

public static Language getDeviceLanguage() {
return mLanguagesCache.get(Resources.getSystem().getConfiguration().getLocales().get(0).toLanguageTag());
return mLanguagesCache.get(getDeviceLocale().toLanguageTag());
}

public static Locale getDeviceLocale() {
return Resources.getSystem().getConfiguration().getLocales().get(0);
}

public static List<String> getLocalesFromLanguages(@NonNull final List<Language> languages) {
Expand All @@ -97,15 +109,21 @@ public static List<Language> getPreferredLanguages(@NonNull Context aContext) {
List<Language> preferredLanguages = new ArrayList<>();
if (savedLanguages != null) {
for (String language : savedLanguages) {
Language lang = languages.get(language);
Language lang = languages.get(getClosestAvailableLocale(language));
if (lang != null) {
lang.setPreferred(true);
preferredLanguages.add(lang);
}
}

}

if (savedLanguages == null || savedLanguages.isEmpty()) {
Language lang = languages.get(getClosestAvailableLocale(getDeviceLocale().toLanguageTag()));
if (lang != null) {
lang.setPreferred(true);
preferredLanguages.add(lang);
}

} else {
Language currentLanguage = getDeviceLanguage();
currentLanguage.setPreferred(true);
preferredLanguages.add(currentLanguage);
}

return preferredLanguages;
Expand All @@ -118,24 +136,64 @@ public static List<Language> getAvailableLanguages() {
.collect(Collectors.toList());
}

@NonNull
public static String getClosestAvailableLocale(@NonNull String languageTag) {
List<Locale> locales = Stream.of(Locale.getAvailableLocales()).collect(Collectors.toList());
Locale inputLocale = Locale.forLanguageTag(languageTag);
Optional<Locale> outputLocale = locales.stream().filter(item ->
item.equals(inputLocale)
).findFirst();

if (!outputLocale.isPresent()) {
outputLocale = locales.stream().filter(item ->
item.getLanguage().equals(inputLocale.getLanguage()) &&
item.getScript().equals(inputLocale.getScript()) &&
item.getCountry().equals(inputLocale.getCountry())
).findFirst();
}
if (!outputLocale.isPresent()) {
outputLocale = locales.stream().filter(item ->
item.getLanguage().equals(inputLocale.getLanguage()) &&
item.getCountry().equals(inputLocale.getCountry())
).findFirst();
}
if (!outputLocale.isPresent()) {
outputLocale = locales.stream().filter(item ->
item.getLanguage().equals(inputLocale.getLanguage())
).findFirst();
}

if (outputLocale.isPresent()) {
return outputLocale.get().toLanguageTag();
}

return getDeviceLocale().toLanguageTag();
}

@NonNull
public static String getVoiceSearchLocale(@NonNull Context aContext) {
return SettingsStore.getInstance(aContext).getVoiceSearchLocale();
String locale = SettingsStore.getInstance(aContext).getVoiceSearchLocale();
if (locale == null) {
locale = LocaleUtils.getDefaultSupportedLocale(aContext);
}
return locale;
}

public static void setVoiceSearchLocale(@NonNull Context context, @NonNull String locale) {
SettingsStore.getInstance(context).setVoiceSearchLocale(locale);
}

@NonNull
public static String getVoiceSearchLanguage(@NonNull Context aContext) {
String language = LocaleUtils.getVoiceSearchLocale(aContext);
return getAllLanguages().get(language).getName();
public static Language getVoiceSearchLanguage(@NonNull Context aContext) {
return mLanguagesCache.get(getClosestAvailableLocale(getVoiceSearchLocale(aContext)));
}

@NonNull
public static String getDisplayLocale(Context context) {
String locale = SettingsStore.getInstance(context).getDisplayLocale();
if (locale == null) {
locale = LocaleUtils.getDefaultSupportedLocale(context);
}
return mapOldLocaleToNew((locale));
}

Expand All @@ -144,12 +202,16 @@ public static void setDisplayLocale(@NonNull Context context, @NonNull String lo
}

@NonNull
public static String getDisplayLanguage() {
return getAllLanguages().get(getCurrentLocale()).getName();
public static Language getDisplayLanguage(@NonNull Context aContext) {
return mLanguagesCache.get(getClosestAvailableLocale(getDisplayLocale(aContext)));
}

public static Context setLocale(@NonNull Context context) {
return updateResources(context, SettingsStore.getInstance(context).getDisplayLocale());
String locale = SettingsStore.getInstance(context).getDisplayLocale();
if (locale == null) {
locale = LocaleUtils.getDefaultSupportedLocale(context);
}
return updateResources(context, locale);
}

private static Context updateResources(@NonNull Context context, @NonNull String language) {
Expand Down Expand Up @@ -256,14 +318,8 @@ public static String getSupportedLocaleForIndex(int index) {
return localizedSupportedLanguages.get(index).locale.toLanguageTag();
}

public static String getDefaultSupportedLocale() {
String locale = getCurrentLocale();
List<String> supportedLocales = getSupportedLocales();
if (!supportedLocales.contains(locale)) {
return supportedLocales.get(0);
}

return locale;
public static String getDefaultSupportedLocale(@NonNull Context context) {
return getClosestSupportedLocale(context, getDeviceLocale().toLanguageTag());
}

public static String getClosestSupportedLocale(@NonNull Context context, @NonNull String languageTag) {
Expand Down Expand Up @@ -295,7 +351,8 @@ public static String getClosestSupportedLocale(@NonNull Context context, @NonNul
return language.get().locale.toLanguageTag();

} else {
return getDisplayLocale(context);
// If there is no closest supported locale we fallback to en-US
return "en-US";
}
}

Expand Down