From 2c25c7c9e1c98feaa3fc739244badacfa0719576 Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Sat, 14 Dec 2013 12:13:20 +0900
Subject: [PATCH] Fix locale names in the make-keyboard-text tool
Change-Id: I33c3fafcff124bb94e395cc604ce264daad55d2d
---
java/res/xml/method.xml | 48 +++++++++----------
.../keyboard/internal/KeyboardTextsSet.java | 12 ++---
.../donottranslate-more-keys.xml | 0
.../donottranslate-more-keys.xml | 0
4 files changed, 30 insertions(+), 30 deletions(-)
rename tools/make-keyboard-text/res/{values-az => values-az-rAZ}/donottranslate-more-keys.xml (100%)
rename tools/make-keyboard-text/res/{values-ne => values-ne-rNP}/donottranslate-more-keys.xml (100%)
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 78e771fdad..c8e3c198e2 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -24,54 +24,54 @@
keyboard_locale: script_name/keyboard_layout_set
af: Afrikaans/qwerty
ar: Arabic/arabic
- (az: Azerbaijani/qwerty) # disabled temporarily. waiting for string resources.
- be_BY: Belarusian/east_slavic
+ (az_AZ: Azerbaijani (Azerbaijan)/qwerty) # disabled temporarily. waiting for string resources.
+ be_BY: Belarusian (Belarus)/east_slavic
bg: Bulgarian/bulgarian
bg: Bulgarian/bulgarian_bds
ca: Catalan/spanish
cs: Czech/qwertz
da: Danish/nordic
de: German/qwertz
- de_CH: German Switzerland/swiss
+ de_CH: German (Switzerland)/swiss
el: Greek/greek
- en_US: English United States/qwerty
- en_GB: English Great Britain/qwerty
+ en_US: English (United States)/qwerty
+ en_GB: English (Great Britain)/qwerty
eo: Esperanto/spanish
es: Spanish/spanish
- es_US: Spanish United States/spanish
- (es_419: Spanish Latin America/qwerty)
- et_EE: Estonian/nordic
+ es_US: Spanish (United States)/spanish
+ (es_419: Spanish (Latin America)/qwerty)
+ et_EE: Estonian (Estonia)/nordic
fa: Persian/arabic
fi: Finnish/nordic
fr: French/azerty
- fr_CA: French Canada/qwerty
- fr_CH: French Switzerland/swiss
+ fr_CA: French (Canada)/qwerty
+ fr_CH: French (Switzerland)/swiss
hi: Hindi/hindi
hr: Croatian/qwertz
hu: Hungarian/qwertz
- hy_AM: Armenian Phonetic/armenian_phonetic
+ hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic
in: Indonesian/qwerty # "id" is official language code of Indonesian.
is: Icelandic/qwerty
it: Italian/qwerty
iw: Hebrew/hebrew # "he" is official language code of Hebrew.
- ka_GE: Georgian/georgian
+ ka_GE: Georgian (Georgia)/georgian
(kk: Kazakh/east_slavic) # disabled temporarily. waiting for string resources.
- km_KH: Khmer/khmer
+ km_KH: Khmer (Cambodia)/khmer
ky: Kyrgyz/east_slavic
- lo_LA: Lao/lao
+ lo_LA: Lao (Laos)/lao
lt: Lithuanian/qwerty
lv: Latvian/qwerty
mk: Macedonian/south_slavic
- mn_MN: Mongolian/mongolian
- ms_MY: Malay/qwerty
+ mn_MN: Mongolian (Mongolia)/mongolian
+ ms_MY: Malay (Malaysia)/qwerty
nb: Norwegian Bokmål/nordic
- (ne: Nepali Romanized/nepali_romanized) # disabled temporarily
- (ne: Nepali Traditional/nepali_traditional) # disabled temporarily
+ (ne_NP: Nepali (Nepal) Romanized/nepali_romanized) # disabled temporarily
+ (ne_NP: Nepali (Nepal) Traditional/nepali_traditional) # disabled temporarily
nl: Dutch/qwerty
- nl_BE: Dutch Belgium/azerty
+ nl_BE: Dutch (Belgium)/azerty
pl: Polish/qwerty
- pt_BR: Portuguese Brazil/qwerty
- pt_PT: Portuguese Portugal/qwerty
+ pt_BR: Portuguese (Brazil)/qwerty
+ pt_PT: Portuguese (Portugal)/qwerty
ro: Romanian/qwerty
ru: Russian/east_slavic
sk: Slovak/qwerty
@@ -135,7 +135,7 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0x70b0f974"
- android:imeSubtypeLocale="az"
+ android:imeSubtypeLocale="az_AZ"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=qwerty,AsciiCapable,EmojiCapable"
android:isAsciiCapable="true"
@@ -455,7 +455,7 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_generic"
android:subtypeId="0xd80a4cee"
- android:imeSubtypeLocale="ne"
+ android:imeSubtypeLocale="ne_NP"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_romanized,EmojiCapable"
android:isAsciiCapable="false"
@@ -463,7 +463,7 @@
<subtype android:icon="@drawable/ic_ime_switcher_dark"
android:label="@string/subtype_nepali_traditional"
android:subtypeId="0x5fafea88"
- android:imeSubtypeLocale="ne"
+ android:imeSubtypeLocale="ne_NP"
android:imeSubtypeMode="keyboard"
android:imeSubtypeExtraValue="KeyboardLayoutSet=nepali_traditional,EmojiCapable"
android:isAsciiCapable="false"
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index 1b722c5ce0..f708c2cdd5 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -635,8 +635,8 @@ public final class KeyboardTextsSet {
/* 118 */ "\\%,\u2030",
};
- /* Language az: Azerbaijani */
- private static final String[] LANGUAGE_az = {
+ /* Language az_AZ: Azerbaijani (Azerbaijan) */
+ private static final String[] LANGUAGE_az_AZ = {
// U+00E2: "â" LATIN SMALL LETTER A WITH CIRCUMFLEX
/* 0 */ "\u00E2",
// U+0259: "É™" LATIN SMALL LETTER SCHWA
@@ -2454,8 +2454,8 @@ public final class KeyboardTextsSet {
/* 53 */ "!text/double_9qm_rqm",
};
- /* Language ne: Nepali */
- private static final String[] LANGUAGE_ne = {
+ /* Language ne_NP: Nepali (Nepal) */
+ private static final String[] LANGUAGE_ne_NP = {
/* 0~ */
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
@@ -3519,7 +3519,7 @@ public final class KeyboardTextsSet {
"DEFAULT", LANGUAGE_DEFAULT, /* default */
"af", LANGUAGE_af, /* Afrikaans */
"ar", LANGUAGE_ar, /* Arabic */
- "az", LANGUAGE_az, /* Azerbaijani */
+ "az" /* "az_AZ" */, LANGUAGE_az_AZ, /* Azerbaijani (Azerbaijan) */
"be" /* "be_BY" */, LANGUAGE_be_BY, /* Belarusian (Belarus) */
"bg", LANGUAGE_bg, /* Bulgarian */
"ca", LANGUAGE_ca, /* Catalan */
@@ -3551,7 +3551,7 @@ public final class KeyboardTextsSet {
"mk", LANGUAGE_mk, /* Macedonian */
"mn" /* "mn_MN" */, LANGUAGE_mn_MN, /* Mongolian (Mongolia) */
"nb", LANGUAGE_nb, /* Norwegian Bokmål */
- "ne", LANGUAGE_ne, /* Nepali */
+ "ne" /* "ne_NP" */, LANGUAGE_ne_NP, /* Nepali (Nepal) */
"nl", LANGUAGE_nl, /* Dutch */
"pl", LANGUAGE_pl, /* Polish */
"pt", LANGUAGE_pt, /* Portuguese */
diff --git a/tools/make-keyboard-text/res/values-az/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-az/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-ne/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml
similarity index 100%
rename from tools/make-keyboard-text/res/values-ne/donottranslate-more-keys.xml
rename to tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml
--
GitLab