2 files changed, 10 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
index 00f69f158..766b385a9 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
+++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
@@ -125,7 +125,12 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
         return mRecommendedThreshold;
     }
 
-    private static String getKeyboardLayoutNameForScript(final int script) {
+    private static String getKeyboardLayoutNameForLocale(final Locale locale) {
+        // See b/19963288.
+        if (locale.getLanguage().equals("sr")) {
+            return "south_slavic";
+        }
+        final int script = ScriptUtils.getScriptFromSpellCheckerLocale(locale);
         switch (script) {
         case ScriptUtils.SCRIPT_LATIN:
             return "qwerty";
@@ -133,6 +138,8 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
             return "east_slavic";
         case ScriptUtils.SCRIPT_GREEK:
             return "greek";
+        case ScriptUtils.SCRIPT_HEBREW:
+            return "hebrew";
         default:
             throw new RuntimeException("Wrong script supplied: " + script);
         }
@@ -247,8 +254,7 @@ public final class AndroidSpellCheckerService extends SpellCheckerService
     }
 
     private Keyboard createKeyboardForLocale(final Locale locale) {
-        final int script = ScriptUtils.getScriptFromSpellCheckerLocale(locale);
-        final String keyboardLayoutName = getKeyboardLayoutNameForScript(script);
+        final String keyboardLayoutName = getKeyboardLayoutNameForLocale(locale);
         final InputMethodSubtype subtype = AdditionalSubtypeUtils.createDummyAdditionalSubtype(
                 locale.toString(), keyboardLayoutName);
         final KeyboardLayoutSet keyboardLayoutSet = createKeyboardSetForSpellChecker(subtype);
diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
index da5c71738..5aa7783bb 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
+++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidWordLevelSpellCheckerSession.java
@@ -320,7 +320,7 @@ public abstract class AndroidWordLevelSpellCheckerSession extends Session {
             if (DBG) {
                 throw e;
             }
-            Log.e(TAG, "Exception while spellcheking", e);
+            Log.e(TAG, "Exception while spellchecking", e);
             return AndroidSpellCheckerService.getNotInDictEmptySuggestions(
                     false /* reportAsTypo */);
         }