luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-06-11 00:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use lowercase main locale to specifically fix problems with sr_zz and sr_ZZ

Browse source
This commit is contained in:
Helium 2022-03-21 09:49:12 +01:00
parent 115d0f8120
commit 034ebe780f
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/SecondaryLocaleSettingsFragment.java
View file

@ -67,7 +67,7 @@ public final class SecondaryLocaleSettingsFragment extends SubScreenFragment {
pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { pref.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
showSecondaryLocaleDialog(subtype.getLocale(), subtype.isAsciiCapable()); showSecondaryLocaleDialog(subtype.getLocale().toLowerCase(Locale.ENGLISH), subtype.isAsciiCapable());
return true; return true;
} }
}); });

3
app/src/main/java/org/dslul/openboard/inputmethod/latin/settings/Settings.java
View file

@ -514,12 +514,11 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
return prefs.getInt(PREF_LAST_SHOWN_EMOJI_CATEGORY_PAGE_ID, defValue); return prefs.getInt(PREF_LAST_SHOWN_EMOJI_CATEGORY_PAGE_ID, defValue);
} }
// TODO: test whether this gets updated on keyboard language switch!
public static Locale getSecondaryLocale(final SharedPreferences prefs, final String mainLocaleString) { public static Locale getSecondaryLocale(final SharedPreferences prefs, final String mainLocaleString) {
final Set<String> encodedLocales = prefs.getStringSet(PREF_SECONDARY_LOCALES, new HashSet<>()); final Set<String> encodedLocales = prefs.getStringSet(PREF_SECONDARY_LOCALES, new HashSet<>());
for (String loc : encodedLocales) { for (String loc : encodedLocales) {
String[] locales = loc.split("§"); String[] locales = loc.split("§");
if (locales.length == 2 && locales[0].equals(mainLocaleString)) if (locales.length == 2 && locales[0].equals(mainLocaleString.toLowerCase(Locale.ENGLISH)))
return LocaleUtils.constructLocaleFromString(locales[1]); return LocaleUtils.constructLocaleFromString(locales[1]);
} }
return null; return null;

2
app/src/main/java/org/dslul/openboard/inputmethod/latin/utils/ScriptUtils.java
View file

@ -202,7 +202,7 @@ public class ScriptUtils {
*/ */
public static int getScriptFromSpellCheckerLocale(final Locale locale) { public static int getScriptFromSpellCheckerLocale(final Locale locale) {
// need special treatment of serbian latin, which would get detected as cyrillic // need special treatment of serbian latin, which would get detected as cyrillic
if (locale.toString().equals("sr_ZZ")) if (locale.toString().toLowerCase(Locale.ENGLISH).equals("sr_zz"))
return ScriptUtils.SCRIPT_LATIN; return ScriptUtils.SCRIPT_LATIN;
String language = locale.getLanguage(); String language = locale.getLanguage();
Integer script = mLanguageCodeToScriptCode.get(language); Integer script = mLanguageCodeToScriptCode.get(language);