aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-05-24 03:37:22 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-24 03:37:22 -0700
commit35dacc8e78b8b6929f8aac05d77fa2c4118018eb (patch)
tree5bfabdc8b5c6eb319a97d314f9335c06ba729236 /java
parentfe36e7fd9b0692acbe7af24e54e261fc8ca2d2d0 (diff)
parent9b98c4a8ce496fa45b8ad6e7da57063c79d1d9e4 (diff)
downloadlatinime-35dacc8e78b8b6929f8aac05d77fa2c4118018eb.tar.gz
latinime-35dacc8e78b8b6929f8aac05d77fa2c4118018eb.tar.xz
latinime-35dacc8e78b8b6929f8aac05d77fa2c4118018eb.zip
am 9b98c4a8: am 69897af2: Merge "Add new locales for the spell checker." into jb-dev
* commit '9b98c4a8ce496fa45b8ad6e7da57063c79d1d9e4': Add new locales for the spell checker.
Diffstat (limited to 'java')
-rw-r--r--java/res/xml/spellchecker.xml16
-rw-r--r--java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java6
2 files changed, 22 insertions, 0 deletions
diff --git a/java/res/xml/spellchecker.xml b/java/res/xml/spellchecker.xml
index 2e4448c44..66cd66280 100644
--- a/java/res/xml/spellchecker.xml
+++ b/java/res/xml/spellchecker.xml
@@ -29,6 +29,14 @@
/>
<subtype
android:label="@string/subtype_generic"
+ android:subtypeLocale="en_US"
+ />
+ <subtype
+ android:label="@string/subtype_generic"
+ android:subtypeLocale="en_GB"
+ />
+ <subtype
+ android:label="@string/subtype_generic"
android:subtypeLocale="fr"
/>
<subtype
@@ -55,4 +63,12 @@
android:label="@string/subtype_generic"
android:subtypeLocale="nl"
/>
+ <subtype
+ android:label="@string/subtype_generic"
+ android:subtypeLocale="hr"
+ />
+ <subtype
+ android:label="@string/subtype_generic"
+ android:subtypeLocale="pt_BR"
+ />
</spell-checker>
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
index afd59c3f8..aa3250185 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
+++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
@@ -102,13 +102,19 @@ public class AndroidSpellCheckerService extends SpellCheckerService
// will never have any suggestions, so it makes no sense checking them.
mLanguageToScript = new TreeMap<String, Integer>();
mLanguageToScript.put("en", SCRIPT_LATIN);
+ mLanguageToScript.put("en_US", SCRIPT_LATIN);
+ mLanguageToScript.put("en_GB", SCRIPT_LATIN);
mLanguageToScript.put("fr", SCRIPT_LATIN);
mLanguageToScript.put("de", SCRIPT_LATIN);
mLanguageToScript.put("nl", SCRIPT_LATIN);
mLanguageToScript.put("cs", SCRIPT_LATIN);
mLanguageToScript.put("es", SCRIPT_LATIN);
mLanguageToScript.put("it", SCRIPT_LATIN);
+ mLanguageToScript.put("hr", SCRIPT_LATIN);
+ mLanguageToScript.put("pt_BR", SCRIPT_LATIN);
mLanguageToScript.put("ru", SCRIPT_CYRILLIC);
+ // TODO: Make a persian proximity, and activate the Farsi subtype.
+ // mLanguageToScript.put("fa", SCRIPT_PERSIAN);
}
@Override public void onCreate() {