nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Do not merge. Fix the list of supported languages

Browse source 
Bug: 4390528
Change-Id: I5a9444d9addd6185d2633ab021702f7d0241c6b2
This commit is contained in:
satok 2011-05-12 19:19:20 +09:00
parent c741398f36
commit 795fc1a47b
1 changed files with 41 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
java/src/com/android/inputmethod/latin/InputLanguageSelection.java
View file

@ -36,10 +36,20 @@ public class InputLanguageSelection extends PreferenceActivity {
private String mSelectedLanguages; private String mSelectedLanguages;
private ArrayList<Loc> mAvailableLanguages = new ArrayList<Loc>(); private ArrayList<Loc> mAvailableLanguages = new ArrayList<Loc>();
private static final String[] BLACKLIST_LANGUAGES = {
"ko", "ja", "zh", "el" private static final String[] WHITELIST_LANGUAGES = {
"cs", "da", "de", "en_GB", "en_US", "es", "es_US", "fr", "it", "nb", "nl", "pl", "pt", "ru"
}; };
private static boolean isWhitelisted(String lang) {
for (String s : WHITELIST_LANGUAGES) {
if (s.equalsIgnoreCase(lang)) {
return true;
}
}
return false;
}
private static class Loc implements Comparable<Object> { private static class Loc implements Comparable<Object> {
static Collator sCollator = Collator.getInstance(); static Collator sCollator = Collator.getInstance();
@ -157,35 +167,41 @@ public class InputLanguageSelection extends PreferenceActivity {
for (int i = 0 ; i < origSize; i++ ) { for (int i = 0 ; i < origSize; i++ ) {
String s = locales[i]; String s = locales[i];
int len = s.length(); int len = s.length();
final Locale l;
final String language;
if (len == 5) { if (len == 5) {
String language = s.substring(0, 2); language = s.substring(0, 2);
String country = s.substring(3, 5); String country = s.substring(3, 5);
Locale l = new Locale(language, country); l = new Locale(language, country);
} else if (len == 2) {
language = s;
l = new Locale(language);
} else {
continue;
}
// Exclude languages that are not relevant to LatinIME
if (!isWhitelisted(s)) continue;
// Exclude languages that are not relevant to LatinIME if (finalSize == 0) {
if (arrayContains(BLACKLIST_LANGUAGES, language)) continue; preprocess[finalSize++] =
new Loc(LanguageSwitcher.toTitleCase(l.getDisplayName(l)), l);
if (finalSize == 0) { } else {
// check previous entry:
// same lang and a country -> upgrade to full name and
// insert ours with full name
// diff lang -> insert ours with lang-only name
if (preprocess[finalSize-1].locale.getLanguage().equals(
language)) {
preprocess[finalSize-1].label = LanguageSwitcher.toTitleCase(
preprocess[finalSize-1].locale.getDisplayName());
preprocess[finalSize++] = preprocess[finalSize++] =
new Loc(LanguageSwitcher.toTitleCase(l.getDisplayName(l)), l); new Loc(LanguageSwitcher.toTitleCase(l.getDisplayName()), l);
} else { } else {
// check previous entry: String displayName;
// same lang and a country -> upgrade to full name and if (s.equals("zz_ZZ")) {
// insert ours with full name
// diff lang -> insert ours with lang-only name
if (preprocess[finalSize-1].locale.getLanguage().equals(
language)) {
preprocess[finalSize-1].label = LanguageSwitcher.toTitleCase(
preprocess[finalSize-1].locale.getDisplayName());
preprocess[finalSize++] =
new Loc(LanguageSwitcher.toTitleCase(l.getDisplayName()), l);
} else { } else {
String displayName; displayName = LanguageSwitcher.toTitleCase(l.getDisplayName(l));
if (s.equals("zz_ZZ")) { preprocess[finalSize++] = new Loc(displayName, l);
} else {
displayName = LanguageSwitcher.toTitleCase(l.getDisplayName(l));
preprocess[finalSize++] = new Loc(displayName, l);
}
} }
} }
} }
@ -195,11 +211,4 @@ public class InputLanguageSelection extends PreferenceActivity {
} }
return uniqueLocales; return uniqueLocales;
} }
private boolean arrayContains(String[] array, String value) {
for (int i = 0; i < array.length; i++) {
if (array[i].equalsIgnoreCase(value)) return true;
}
return false;
}
} }