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

Merge "Fix Arabic keyboard text and test comments"

main
Tadashi G. Takaoka 2014-03-17 03:25:33 +00:00 committed by Android (Google) Code Review
parent 7db6162622 538abc27dc
commit 4b94d09444
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java
View File

@ -525,10 +525,10 @@ public final class KeyboardTextsTable {
null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
/* ~ more_keys_for_n */ /* ~ more_keys_for_n */
// Label for "switch to alphabetic" key. // Label for "switch to alphabetic" key.
// U+0623: "ا" ARABIC LETTER ALEF // U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
// U+200C: ZERO WIDTH NON-JOINER // U+200C: ZERO WIDTH NON-JOINER
// U+0628: "ب" ARABIC LETTER BEH // U+0628: "ب" ARABIC LETTER BEH
// U+062C: "پ" ARABIC LETTER PEH // U+062C: "ج" ARABIC LETTER JEEM
/* label_to_alpha_key */ "\u0623\u200C\u0628\u200C\u062C", /* label_to_alpha_key */ "\u0623\u200C\u0628\u200C\u062C",
/* more_keys_for_y ~ */ /* more_keys_for_y ~ */
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,

8
tests/src/com/android/inputmethod/keyboard/layout/Arabic.java
View File

@ -95,10 +95,10 @@ public final class Arabic extends LayoutBase {
return ARABIC_DIACRITICS; return ARABIC_DIACRITICS;
} }
// U+0623: "ا" ARABIC LETTER ALEF // U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
// U+200C: ZERO WIDTH NON-JOINER // U+200C: ZERO WIDTH NON-JOINER
// U+0628: "ب" ARABIC LETTER BEH // U+0628: "ب" ARABIC LETTER BEH
// U+062C: "پ" ARABIC LETTER PEH // U+062C: "ج" ARABIC LETTER JEEM
private static final ExpectedKey ARABIC_ALPHABET_KEY = key( private static final ExpectedKey ARABIC_ALPHABET_KEY = key(
"\u0623\u200C\u0628\u200C\u062C", Constants.CODE_SWITCH_ALPHA_SYMBOL); "\u0623\u200C\u0628\u200C\u062C", Constants.CODE_SWITCH_ALPHA_SYMBOL);
// U+0663: "٣" ARABIC-INDIC DIGIT THREE // U+0663: "٣" ARABIC-INDIC DIGIT THREE
@ -107,10 +107,6 @@ public final class Arabic extends LayoutBase {
// U+061F: "؟" ARABIC QUESTION MARK // U+061F: "؟" ARABIC QUESTION MARK
private static final ExpectedKey ARABIC_SYMBOLS_KEY = key( private static final ExpectedKey ARABIC_SYMBOLS_KEY = key(
"\u0663\u0662\u0661\u061F", Constants.CODE_SWITCH_ALPHA_SYMBOL); "\u0663\u0662\u0661\u061F", Constants.CODE_SWITCH_ALPHA_SYMBOL);
// U+0663: "٣" ARABIC-INDIC DIGIT THREE
// U+0662: "٢" ARABIC-INDIC DIGIT TWO
// U+0661: "١" ARABIC-INDIC DIGIT ONE
// U+061F: "؟" ARABIC QUESTION MARK
private static final ExpectedKey ARABIC_BACK_TO_SYMBOLS_KEY = key( private static final ExpectedKey ARABIC_BACK_TO_SYMBOLS_KEY = key(
"\u0663\u0662\u0661\u061F", Constants.CODE_SHIFT); "\u0663\u0662\u0661\u061F", Constants.CODE_SHIFT);

2
tests/src/com/android/inputmethod/keyboard/layout/tests/TestsArabic.java
View File

@ -25,7 +25,7 @@ import com.android.inputmethod.keyboard.layout.LayoutBase;
import java.util.Locale; import java.util.Locale;
/** /**
* ar: TestsArabic/arabic * ar: Arabic/arabic
*/ */
@SmallTest @SmallTest
public class TestsArabic extends LayoutTestsBase { public class TestsArabic extends LayoutTestsBase {

4
tools/make-keyboard-text/res/values-ar/donottranslate-more-keys.xml
View File

@ -19,10 +19,10 @@
--> -->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Label for "switch to alphabetic" key. <!-- Label for "switch to alphabetic" key.
U+0623: "ا" ARABIC LETTER ALEF U+0623: "أ" ARABIC LETTER ALEF WITH HAMZA ABOVE
U+200C: ZERO WIDTH NON-JOINER U+200C: ZERO WIDTH NON-JOINER
U+0628: "ب" ARABIC LETTER BEH U+0628: "ب" ARABIC LETTER BEH
U+062C: "پ" ARABIC LETTER PEH --> U+062C: "ج" ARABIC LETTER JEEM -->
<string name="label_to_alpha_key">&#x0623;&#x200C;&#x0628;&#x200C;&#x062C;</string> <string name="label_to_alpha_key">&#x0623;&#x200C;&#x0628;&#x200C;&#x062C;</string>
<!-- U+0661: "١" ARABIC-INDIC DIGIT ONE --> <!-- U+0661: "١" ARABIC-INDIC DIGIT ONE -->
<string name="keylabel_for_symbols_1">&#x0661;</string> <string name="keylabel_for_symbols_1">&#x0661;</string>