diff options
| -rw-r--r-- | java/res/xml/rowkeys_bengali1.xml | 15 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java | 6 | ||||
| -rw-r--r-- | tests/src/com/android/inputmethod/keyboard/layout/Bengali.java | 15 | ||||
| -rw-r--r-- | tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml (renamed from tools/make-keyboard-text/res/values-bn/donottranslate-more-keys.xml) | 0 |
4 files changed, 23 insertions, 13 deletions
diff --git a/java/res/xml/rowkeys_bengali1.xml b/java/res/xml/rowkeys_bengali1.xml index c1fd8b434..971fff61f 100644 --- a/java/res/xml/rowkeys_bengali1.xml +++ b/java/res/xml/rowkeys_bengali1.xml @@ -20,35 +20,40 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"> <!-- U+0994: "ঔ" BENGALI LETTER AU + U+09CC: "ৌ" BENGALI VOWEL SIGN AU U+09E7: "১" BENGALI DIGIT ONE --> <Key latin:keySpec="ঔ" latin:keyHintLabel="১" - latin:additionalMoreKeys="১,1" /> + latin:additionalMoreKeys="ৌ,১,1" /> <!-- U+0990: "ঐ" BENGALI LETTER AI + U+09C8: "ৈ" BENGALI VOWEL SIGN AI U+09E8: "২" BENGALI DIGIT TWO --> <Key latin:keySpec="ঐ" latin:keyHintLabel="২" - latin:additionalMoreKeys="২,2" /> + latin:additionalMoreKeys="ৈ,২,2" /> <!-- U+0986: "আ" BENGALI LETTER AA + U+09BE: "া" BENGALI VOWEL SIGN AA U+09E9: "৩" BENGALI DIGIT THREE --> <Key latin:keySpec="আ" latin:keyHintLabel="৩" - latin:additionalMoreKeys="৩,3" /> + latin:additionalMoreKeys="া,৩,3" /> <!-- U+0988: "ঈ" BENGALI LETTER II + U+09C0: "ী" BENGALI VOWEL SIGN II U+09EA: "৪" BENGALI DIGIT FOUR --> <Key latin:keySpec="ঈ" latin:keyHintLabel="৪" - latin:additionalMoreKeys="৪,4" /> + latin:additionalMoreKeys="ী,৪,4" /> <!-- U+098A: "ঊ" BENGALI LETTER UU + U+09C2: "ূ" BENGALI VOWEL SIGN UU U+09EB: "৫" BENGALI DIGIT FIVE --> <Key latin:keySpec="ঊ" latin:keyHintLabel="৫" - latin:additionalMoreKeys="৫,5" /> + latin:additionalMoreKeys="ূ,৫,5" /> <!-- U+09AC: "ব" BENGALI LETTER BA U+09AD: "ভ" BENGALI LETTER BHA U+09EC: "৬" BENGALI DIGIT SIX --> diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java index 2d063fd67..8b8a9dd2a 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.java @@ -753,8 +753,8 @@ public final class KeyboardTextsTable { /* double_quotes */ "!text/double_9qm_lqm", }; - /* Locale bn: Bengali */ - private static final String[] TEXTS_bn = { + /* Locale bn_IN: Bengali (India) */ + private static final String[] TEXTS_bn_IN = { /* morekeys_a ~ */ null, null, null, null, null, /* ~ morekeys_i */ @@ -3841,7 +3841,7 @@ public final class KeyboardTextsTable { "az_AZ" , TEXTS_az_AZ, /* 8/ 18 Azerbaijani (Azerbaijan) */ "be_BY" , TEXTS_be_BY, /* 9/ 32 Belarusian (Belarus) */ "bg" , TEXTS_bg, /* 2/ 8 Bulgarian */ - "bn" , TEXTS_bn, /* 2/ 15 Bengali */ + "bn_IN" , TEXTS_bn_IN, /* 2/ 15 Bengali (India) */ "ca" , TEXTS_ca, /* 11/ 96 Catalan */ "cs" , TEXTS_cs, /* 17/ 21 Czech */ "da" , TEXTS_da, /* 19/ 54 Danish */ diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java b/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java index 79c7d08cc..2101ddf33 100644 --- a/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java +++ b/tests/src/com/android/inputmethod/keyboard/layout/Bengali.java @@ -72,20 +72,25 @@ public final class Bengali extends LayoutBase { private static final ExpectedKey[][] ALPHABET_COMMON = new ExpectedKeyboardBuilder() .setKeysOfRow(1, // U+0994: "ঔ" BENGALI LETTER AU + // U+09CC: "ৌ" BENGALI VOWEL SIGN AU // U+09E7: "১" BENGALI DIGIT ONE - key("\u0994", joinMoreKeys("\u09E7", "1")), + key("\u0994", joinMoreKeys("\u09CC", "\u09E7", "1")), // U+0990: "ঐ" BENGALI LETTER AI + // U+09C8: "ৈ" BENGALI VOWEL SIGN AI // U+09E8: "২" BENGALI DIGIT TWO - key("\u0990", joinMoreKeys("\u09E8", "2")), + key("\u0990", joinMoreKeys("\u09C8", "\u09E8", "2")), // U+0986: "আ" BENGALI LETTER AA + // U+09BE: "া" BENGALI VOWEL SIGN AA // U+09E9: "৩" BENGALI DIGIT THREE - key("\u0986", joinMoreKeys("\u09E9", "3")), + key("\u0986", joinMoreKeys("\u09BE", "\u09E9", "3")), // U+0988: "ঈ" BENGALI LETTER II + // U+09C0: "ী" BENGALI VOWEL SIGN II // U+09EA: "৪" BENGALI DIGIT FOUR - key("\u0988", joinMoreKeys("\u09EA", "4")), + key("\u0988", joinMoreKeys("\u09C0", "\u09EA", "4")), // U+098A: "ঊ" BENGALI LETTER UU + // U+09C2: "ূ" BENGALI VOWEL SIGN UU // U+09EB: "৫" BENGALI DIGIT FIVE - key("\u098A", joinMoreKeys("\u09EB", "5")), + key("\u098A", joinMoreKeys("\u09C2", "\u09EB", "5")), // U+09AC: "ব" BENGALI LETTER BA // U+09AD: "ভ" BENGALI LETTER BHA // U+09EC: "৬" BENGALI DIGIT SIX diff --git a/tools/make-keyboard-text/res/values-bn/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml index 4955cd46a..4955cd46a 100644 --- a/tools/make-keyboard-text/res/values-bn/donottranslate-more-keys.xml +++ b/tools/make-keyboard-text/res/values-bn-rIN/donottranslate-more-keys.xml |