diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2012-04-25 14:17:49 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-04-26 11:50:28 +0900 |
| commit | 27b42ced86e1c85de3d59d91a9e5c577fa552569 (patch) | |
| tree | 320d2e6c6429eded514f9c1c75f422d53c47ecee /java/res | |
| parent | 49caddbdabe5ca666bdef9f842f134e30e7ffed9 (diff) | |
| download | latinime-27b42ced86e1c85de3d59d91a9e5c577fa552569.tar.gz latinime-27b42ced86e1c85de3d59d91a9e5c577fa552569.tar.xz latinime-27b42ced86e1c85de3d59d91a9e5c577fa552569.zip | |
Fix "no language" subtype name (DO NOT MERGE)
* Move SubtypeLocale.get{Full,Middle,Short}DisplayName() to
LatinLeyboardView and add unit tests (SpacebarTextTests).
* Add SubtypeLocale.getSubtypeDisplayName()
This is a cherry-pick of I57420c6a from Master.
Bug: 6393865
Change-Id: I68748189c17c73984ac4ae05a5a40fb54bf46453
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/donottranslate.xml | 4 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 0be886015..4fe447e20 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -166,7 +166,9 @@ <item>PC</item> </string-array> <!-- Description for generic subtype that has predefined layout. - The string resource name must be "subtype_generic_<layout name>". --> + The string resource name must be "subtype_generic_<layout name>". + The string resource with "No language" also must be added to strings.xml and the resource + name must be "subtype_no_language_<layout name>" --> <string name="subtype_generic_qwerty">%s (QWERTY)</string> <string name="subtype_generic_qwertz">%s (QWERTZ)</string> <string name="subtype_generic_azerty">%s (AZERTY)</string> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 93bd26867..0d6eaee09 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -256,6 +256,16 @@ <string name="subtype_no_language">No language</string> <!-- Description for language agnostic QWERTY keyboard subtype [CHAR LIMIT=22] --> <string name="subtype_no_language_qwerty">No language (QWERTY)</string> + <!-- Description for language agnostic QWERTZ keyboard subtype [CHAR LIMIT=22] --> + <string name="subtype_no_language_qwertz">No language (QWERTZ)</string> + <!-- Description for language agnostic AZERTY keyboard subtype [CHAR LIMIT=22] --> + <string name="subtype_no_language_azerty">No language (AZERTY)</string> + <!-- Description for language agnostic Dvorak keyboard subtype [CHAR LIMIT=22] --> + <string name="subtype_no_language_dvorak">No language (Dvorak)</string> + <!-- Description for language agnostic Colemak keyboard subtype [CHAR LIMIT=22] --> + <string name="subtype_no_language_colemak">No language (Colemak)</string> + <!-- Description for language agnostic PC QWERTY keyboard subtype [CHAR LIMIT=22] --> + <string name="subtype_no_language_pcqwerty">No language (PC)</string> <!-- Title of the preference settings for custom input styles (language and keyboard layout pairs) [CHAR LIMIT=22]--> <string name="custom_input_styles_title">Custom input styles</string> |