diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-10-06 12:18:45 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2014-10-28 18:36:16 +0900 |
| commit | fec52199741454f70d5934c8553e1b5561dc2674 (patch) | |
| tree | 323e24ae672f271ce21d4ba918c7d4d123e5ccca /java/res | |
| parent | 395009c03eeda42b2b2114d005c3ed8d7e4bfd4b (diff) | |
| download | latinime-fec52199741454f70d5934c8553e1b5561dc2674.tar.gz latinime-fec52199741454f70d5934c8553e1b5561dc2674.tar.xz latinime-fec52199741454f70d5934c8553e1b5561dc2674.zip | |
Fix Serbian Latin subtype handling
This CL also adds unit tests for Hinglish and Serbian Latin.
Bug: 9687668
Bug: 17169632
Change-Id: Ib9aa1bcdf5b390a9d8c61f07165beacf850e2692
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/donottranslate.xml | 2 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 817bb5187..08d8bb260 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -39,6 +39,8 @@ <item>hi_ZZ</item> <item>sr_ZZ</item> </string-array> + <string name="subtype_in_root_locale_hi_ZZ">Hinglish</string> + <string name="subtype_in_root_locale_sr_ZZ">Srpski</string> <!-- Generic subtype label --> <string name="subtype_generic">%s</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 583c3b123..e1a72c476 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -214,8 +214,7 @@ <!-- Description for Hinglish (https://en.wikipedia.org/wiki/Hinglish) keyboard subtype [CHAR LIMIT=25] --> <string name="subtype_hi_ZZ">Hinglish</string> <!-- Description for Serbian (Latin) keyboard subtype [CHAR LIMIT=25] - (Latin) can be an abbreviation to fit in the CHAR LIMIT. - Note for Serbian translator: this should be translated with Latin script and (Latin) should be omitted. --> + (Latin) can be an abbreviation to fit in the CHAR LIMIT. --> <string name="subtype_sr_ZZ">Serbian (Latin)</string> <!-- Description for English (UK) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] (UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT. @@ -233,16 +232,14 @@ This should be identical to subtype_hi_ZZ aside from the trailing (%s). --> <string name="subtype_with_layout_hi_ZZ">Hinglish (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <!-- Description for Serbian (Latin) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] - This should be identical to subtype_sr_ZZ aside from the trailing (%s). - Note for Serbian translator: this should be translated with Latin script. --> + This should be identical to subtype_sr_ZZ aside from the trailing (%s). --> <string name="subtype_with_layout_sr_ZZ">Serbian (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <!-- Description for "LANGUAGE_NAME" (Traditional) keyboard subtype [CHAR LIMIT=25] (Traditional) can be an abbreviation to fit in the CHAR LIMIT. --> <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string> <!-- Description for "LANGUAGE_NAME" (Compact) keyboard subtype [CHAR LIMIT=25] - (Compact) can be an abbreviation to fit in the CHAR LIMIT. - TODO: Remove translatable=false once we are settled down with the naming. --> - <string name="subtype_generic_compact" translatable="false"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (Compact)</string> + (Compact) can be an abbreviation to fit in the CHAR LIMIT. --> + <string name="subtype_generic_compact"><xliff:g id="LANGUAGE_NAME" example="Hindi">%s</xliff:g> (Compact)</string> <!-- This string is displayed in a language list that allows to choose a language for suggestions in a software keyboard. This setting won't give suggestions in any particular language, hence "No language". |