nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am ac3720ce: Fix layout switch keys\' label of no language subtype keyboard 

* commit 'ac3720ce6d5d9a0084c9275d0e0f3e846c5b27c6':
  Fix layout switch keys' label of no language subtype keyboard
main
Tadashi G. Takaoka 2012-12-13 01:49:49 -08:00 committed by Android Git Automerger
parent 34117769aa ac3720ce6d
commit 4bfc89b5bd
19 changed files with 664 additions and 364 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
java/res/values/strings.xml
View File

@ -147,13 +147,6 @@
<string name="label_done_key">Done</string>
<!-- Label for soft enter key when it performs SEND action. Must be short to fit on key! [CHAR LIMIT=5] -->
<string name="label_send_key">Send</string>
<!-- Label for "switch to alphabetic" key. Must be short to fit on key! [CHAR LIMIT=3] -->
<string name="label_to_alpha_key">ABC</string>
<!-- Label for "switch to symbols" key. Must be short to fit on key! [CHAR LIMIT=4] -->
<string name="label_to_symbol_key">\?123</string>
<!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
part because it'll be appended by the code. Must be short to fit on key! [CHAR LIMIT=3] -->
<string name="label_to_symbol_with_microphone_key">123</string>
<!-- Label for "Pause" key of phone number keyboard. Must be short to fit on key! [CHAR LIMIT=5] -->
<string name="label_pause_key">Pause</string>
<!-- Label for "Wait" key of phone number keyboard. Must be short to fit on key! [CHAR LIMIT=5]-->

854
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
View File

File diff suppressed because it is too large Load Diff

3
tools/maketext/res/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.tmpl
View File

@ -97,9 +97,6 @@ public final class KeyboardTextsSet {
"label_done_key",
"label_previous_key",
// Other labels.
"label_to_alpha_key",
"label_to_symbol_key",
"label_to_symbol_with_microphone_key",
"label_pause_key",
"label_wait_key",
};

12
tools/maketext/res/values-ar/donottranslate-more-keys.xml
View File

@ -18,6 +18,12 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+0623: "ا" ARABIC LETTER ALEF
U+200C: ZERO WIDTH NON-JOINER
U+0628: "ب" ARABIC LETTER BEH
U+062C: "پ" ARABIC LETTER PEH -->
<string name="label_to_alpha_key">&#x0623;&#x200C;&#x0628;&#x200C;&#x062C;</string>
<!-- U+0661: "١" ARABIC-INDIC DIGIT ONE -->
<string name="keylabel_for_symbols_1">&#x0661;</string>
<!-- U+0662: "٢" ARABIC-INDIC DIGIT TWO -->
@ -38,6 +44,12 @@
<string name="keylabel_for_symbols_9">&#x0669;</string>
<!-- U+0660: "٠" ARABIC-INDIC DIGIT ZERO -->
<string name="keylabel_for_symbols_0">&#x0660;</string>
<!-- Label for "switch to symbols" key.
U+061F: "؟" ARABIC QUESTION MARK -->
<string name="label_to_symbol_key">&#x0663;&#x0662;&#x0661;&#x061F;</string>
<!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
part because it'll be appended by the code. -->
<string name="label_to_symbol_with_microphone_key">&#x0663;&#x0662;&#x0661;</string>
<string name="additional_more_keys_for_symbols_1">1</string>
<string name="additional_more_keys_for_symbols_2">2</string>
<string name="additional_more_keys_for_symbols_3">3</string>

5
tools/maketext/res/values-be/donottranslate-more-keys.xml
View File

@ -32,4 +32,9 @@
<string name="more_keys_for_cyrillic_ie">&#x0451;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
</resources>

26
tools/maketext/res/values-bg/donottranslate-more-keys.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
</resources>

26
tools/maketext/res/values-el/donottranslate-more-keys.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+0391: "Α" GREEK CAPITAL LETTER ALPHA
U+0392: "Β" GREEK CAPITAL LETTER BETA
U+0393: "Γ" GREEK CAPITAL LETTER GAMMA -->
<string name="label_to_alpha_key">&#x0391;&#x0392;&#x0393;</string>
</resources>

12
tools/maketext/res/values-fa/donottranslate-more-keys.xml
View File

@ -18,6 +18,12 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+0627: "ا" ARABIC LETTER ALEF
U+200C: ZERO WIDTH NON-JOINER
U+0628: "ب" ARABIC LETTER BEH
U+067E: "پ" ARABIC LETTER PEH -->
<string name="label_to_alpha_key">&#x0627;&#x200C;&#x0628;&#x200C;&#x067E;</string>
<!-- U+06F1: "۱" EXTENDED ARABIC-INDIC DIGIT ONE -->
<string name="keylabel_for_symbols_1">&#x06F1;</string>
<!-- U+06F2: "۲" EXTENDED ARABIC-INDIC DIGIT TWO -->
@ -38,6 +44,12 @@
<string name="keylabel_for_symbols_9">&#x06F9;</string>
<!-- U+06F0: "۰" EXTENDED ARABIC-INDIC DIGIT ZERO -->
<string name="keylabel_for_symbols_0">&#x06F0;</string>
<!-- Label for "switch to symbols" key.
U+061F: "؟" ARABIC QUESTION MARK -->
<string name="label_to_symbol_key">&#x06F3;&#x06F2;&#x06F1;&#x061F;</string>
<!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
part because it'll be appended by the code. -->
<string name="label_to_symbol_with_microphone_key">&#x06F3;&#x06F2;&#x06F1;</string>
<string name="additional_more_keys_for_symbols_1">1</string>
<string name="additional_more_keys_for_symbols_2">2</string>
<string name="additional_more_keys_for_symbols_3">3</string>

10
tools/maketext/res/values-hi/donottranslate-more-keys.xml
View File

@ -18,6 +18,11 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+0915: "क" DEVANAGARI LETTER KA
U+0916: "ख" DEVANAGARI LETTER KHA
U+0917: "ग" DEVANAGARI LETTER GA -->
<string name="label_to_alpha_key">&#x0915;&#x0916;&#x0917;</string>
<!-- U+0967: "१" DEVANAGARI DIGIT ONE -->
<string name="keylabel_for_symbols_1">&#x0967;</string>
<!-- U+0968: "२" DEVANAGARI DIGIT TWO -->
@ -38,6 +43,11 @@
<string name="keylabel_for_symbols_9">&#x096F;</string>
<!-- U+0966: "०" DEVANAGARI DIGIT ZERO -->
<string name="keylabel_for_symbols_0">&#x0966;</string>
<!-- Label for "switch to symbols" key. -->
<string name="label_to_symbol_key">\?&#x0967;&#x0968;&#x0969;</string>
<!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
part because it'll be appended by the code. -->
<string name="label_to_symbol_with_microphone_key">&#x0967;&#x0968;&#x0969;</string>
<string name="additional_more_keys_for_symbols_1">1</string>
<string name="additional_more_keys_for_symbols_2">2</string>
<string name="additional_more_keys_for_symbols_3">3</string>

5
tools/maketext/res/values-iw/donottranslate-more-keys.xml
View File

@ -18,6 +18,11 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+05D0: "א" HEBREW LETTER ALEF
U+05D1: "ב" HEBREW LETTER BET
U+05D2: "ג" HEBREW LETTER GIMEL -->
<string name="label_to_alpha_key">&#x05D0;&#x05D1;&#x05D2;</string>
<!-- U+2605: "★" BLACK STAR -->
<string name="more_keys_for_star">&#x2605;</string>
<!-- U+00B1: "±" PLUS-MINUS SIGN

26
tools/maketext/res/values-ka/donottranslate-more-keys.xml Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2012, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+10D0: "ა" GEORGIAN LETTER AN
U+10D1: "ბ" GEORGIAN LETTER BAN
U+10D2: "გ" GEORGIAN LETTER GAN -->
<string name="label_to_alpha_key">&#x10D0;&#x10D1;&#x10D2;</string>
</resources>

5
tools/maketext/res/values-ky/donottranslate-more-keys.xml
View File

@ -38,4 +38,9 @@
<string name="more_keys_for_cyrillic_o">&#x04E9;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
</resources>

5
tools/maketext/res/values-mk/donottranslate-more-keys.xml
View File

@ -30,6 +30,11 @@
<string name="more_keys_for_cyrillic_ie">&#x0450;</string>
<!-- U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
<string name="more_keys_for_cyrillic_i">&#x045D;</string>
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
<!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
U+2019: "’" RIGHT SINGLE QUOTATION MARK
U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

5
tools/maketext/res/values-mn/donottranslate-more-keys.xml
View File

@ -18,6 +18,11 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
<!-- U+20AE: "₮" TUGRIK SIGN -->
<string name="keylabel_for_currency_generic">&#x20AE;</string>
</resources>

5
tools/maketext/res/values-ru/donottranslate-more-keys.xml
View File

@ -32,4 +32,9 @@
<string name="more_keys_for_cyrillic_ie">&#x0451;</string>
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
</resources>

5
tools/maketext/res/values-sr/donottranslate-more-keys.xml
View File

@ -49,6 +49,11 @@
<!-- U+045D: "ѝ" CYRILLIC SMALL LETTER I WITH GRAVE -->
<string name="more_keys_for_cyrillic_i">&#x045D;</string>
<!-- END: More keys definitions for Serbian (Cyrillic) -->
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
<!-- U+2018: "‘" LEFT SINGLE QUOTATION MARK
U+2019: "’" RIGHT SINGLE QUOTATION MARK
U+201A: "‚" SINGLE LOW-9 QUOTATION MARK

5
tools/maketext/res/values-th/donottranslate-more-keys.xml
View File

@ -18,6 +18,11 @@
*/
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key.
U+0E01: "ก" THAI CHARACTER KO KAI
U+0E02: "ข" THAI CHARACTER KHO KHAI
U+0E04: "ค" THAI CHARACTER KHO KHWAI -->
<string name="label_to_alpha_key">&#x0E01;&#x0E02;&#x0E04;</string>
<!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
<string name="keylabel_for_currency_generic">&#x0E3F;</string>
</resources>

5
tools/maketext/res/values-uk/donottranslate-more-keys.xml
View File

@ -36,4 +36,9 @@
<string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>
<!-- U+20B4: "₴" HRYVNIA SIGN -->
<string name="keylabel_for_currency_generic">&#x20B4;</string>
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">&#x0410;&#x0411;&#x0412;</string>
</resources>

7
tools/maketext/res/values/donottranslate-more-keys.xml
View File

@ -60,6 +60,8 @@
<string name="keylabel_for_south_slavic_row3_8"></string>
<string name="more_keys_for_cyrillic_ie"></string>
<string name="more_keys_for_cyrillic_i"></string>
<!-- Label for "switch to alphabetic" key. -->
<string name="label_to_alpha_key">ABC</string>
<string name="more_keys_for_single_quote">!fixedColumnOrder!4,&#x2018;,&#x2019;,&#x201A;,&#x201B;</string>
<!-- TODO: Neither DroidSans nor Roboto have the glyph for U+201F DOUBLE HIGH-REVERSED-9 QUOTATION MARK. -->
<!-- <string name="more_keys_for_double_quote">!fixedColumnOrder!6,&#x201C;,&#x201D;,&#x201E;,&#x201F;,&#x00AB;,&#x00BB;</string> -->
@ -121,6 +123,11 @@
<string name="keylabel_for_symbols_8">8</string>
<string name="keylabel_for_symbols_9">9</string>
<string name="keylabel_for_symbols_0">0</string>
<!-- Label for "switch to symbols" key. -->
<string name="label_to_symbol_key">\?123</string>
<!-- Label for "switch to symbols with microphone" key. This string shouldn't include the "mic"
part because it'll be appended by the code. -->
<string name="label_to_symbol_with_microphone_key">123</string>
<string name="additional_more_keys_for_symbols_1"></string>
<string name="additional_more_keys_for_symbols_2"></string>
<string name="additional_more_keys_for_symbols_3"></string>