Merge "Annotate the typed word with its source dictionary"
diff --git a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
index 03dcdfc..dfa063c 100644
--- a/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
+++ b/tests/src/com/android/inputmethod/latin/utils/SubtypeLocaleUtilsTests.java
@@ -418,9 +418,17 @@
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI));
// These are preliminary subtypes and may not exist.
if (HI_LATN != null) {
- assertEquals("hi_ZZ", "हिंग्लिश",
+ // TODO: Uncommented because of the current translation of these strings
+ // in Hindi are described in Latin script.
+ // assertEquals("hi_ZZ", "हिंग्लिश",
+ // SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN));
+ // assertEquals("hi_ZZ", "हिंग्लिश (Dvorak)",
+ // SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN_DVORAK));
+ // TODO: Remove these tests once the translation of these strings in Hindi
+ // are described in Devanagari script.
+ assertEquals("hi_ZZ", "Hinglish",
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN));
- assertEquals("hi_ZZ", "हिंग्लिश (Dvorak)",
+ assertEquals("hi_ZZ", "Hinglish (Dvorak)",
SubtypeLocaleUtils.getSubtypeDisplayNameInSystemLocale(HI_LATN_DVORAK));
}
return null;