Fix Persian currency symbol
Change-Id: Iea202e6d6857cbc0a3d4374c76bd72ed992da9a6
diff --git a/java/res/xml/key_currency.xml b/java/res/xml/key_currency.xml
index 92778c6..2e4f828 100644
--- a/java/res/xml/key_currency.xml
+++ b/java/res/xml/key_currency.xml
@@ -105,12 +105,9 @@
<case
latin:languageCode="fa|hi|iw|mn|th|uk|vi"
>
- <!-- U+00A3: "£" POUND SIGN
- U+20AC: "€" EURO SIGN
- U+00A2: "¢" CENT SIGN -->
<Key
- latin:keyLabel="!text/keylabel_for_currency_generic"
- latin:moreKeys="!text/more_keys_for_currency_generic" />
+ latin:keyLabel="!text/keylabel_for_currency"
+ latin:moreKeys="!text/more_keys_for_currency" />
</case>
<!-- GB: United Kingdom (Pound) -->
<case
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index 37f3974..fce2458 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -153,8 +153,8 @@
/* 48 */ "single_angle_quotes",
/* 49 */ "double_angle_quotes",
/* 50 */ "more_keys_for_currency_dollar",
- /* 51 */ "keylabel_for_currency_generic",
- /* 52 */ "more_keys_for_currency_generic",
+ /* 51 */ "keylabel_for_currency",
+ /* 52 */ "more_keys_for_currency",
/* 53 */ "more_keys_for_punctuation",
/* 54 */ "more_keys_for_star",
/* 55 */ "more_keys_for_bullet",
@@ -1401,9 +1401,10 @@
/* 47 */ null,
/* 48 */ "!text/single_laqm_raqm_rtl",
/* 49 */ "!text/double_laqm_raqm_rtl",
- /* 50~ */
- null, null, null,
- /* ~52 */
+ /* 50 */ null,
+ // U+FDFC: "﷼" RIAL SIGN
+ /* 51 */ "\uFDFC",
+ /* 52 */ null,
// U+061F: "؟" ARABIC QUESTION MARK
// U+060C: "،" ARABIC COMMA
// U+061B: "؛" ARABIC SEMICOLON
diff --git a/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
index 6d13d6b..5a03c80 100644
--- a/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-fa/donottranslate-more-keys.xml
@@ -86,6 +86,8 @@
<string name="keylabel_for_apostrophe">،</string>
<string name="keyhintlabel_for_apostrophe">؟</string>
<string name="more_keys_for_apostrophe">"!fixedColumnOrder!4,:,!,؟,؛,-,/,«|»,»|«"</string>
+ <!-- U+FDFC: "﷼" RIAL SIGN -->
+ <string name="keylabel_for_currency">﷼</string>
<!-- U+061F: "؟" ARABIC QUESTION MARK
U+060C: "،" ARABIC COMMA
U+061B: "؛" ARABIC SEMICOLON -->
diff --git a/tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml
index 98ad2cb..b0d010f 100644
--- a/tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-hi/donottranslate-more-keys.xml
@@ -59,5 +59,5 @@
<string name="additional_more_keys_for_symbols_9">9</string>
<string name="additional_more_keys_for_symbols_0">0</string>
<!-- U+20B9: "₹" INDIAN RUPEE SIGN -->
- <string name="keylabel_for_currency_generic">₹</string>
+ <string name="keylabel_for_currency">₹</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml
index acb1ef4..15ac050 100644
--- a/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-iw/donottranslate-more-keys.xml
@@ -52,5 +52,5 @@
<string name="single_angle_quotes">!text/single_laqm_raqm_rtl</string>
<string name="double_angle_quotes">!text/double_laqm_raqm_rtl</string>
<!-- U+20AA: "₪" NEW SHEQEL SIGN -->
- <string name="keylabel_for_currency_generic">₪</string>
+ <string name="keylabel_for_currency">₪</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml
index fd1853e..a7f3666 100644
--- a/tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml
@@ -24,5 +24,5 @@
U+0412: "В" CYRILLIC CAPITAL LETTER VE -->
<string name="label_to_alpha_key">АБВ</string>
<!-- U+20AE: "₮" TUGRIK SIGN -->
- <string name="keylabel_for_currency_generic">₮</string>
+ <string name="keylabel_for_currency">₮</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml
index 6350d4b..070c915 100644
--- a/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-th/donottranslate-more-keys.xml
@@ -24,5 +24,5 @@
U+0E04: "ค" THAI CHARACTER KHO KHWAI -->
<string name="label_to_alpha_key">กขค</string>
<!-- U+0E3F: "฿" THAI CURRENCY SYMBOL BAHT -->
- <string name="keylabel_for_currency_generic">฿</string>
+ <string name="keylabel_for_currency">฿</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml
index cc05cc6..6ee34e3 100644
--- a/tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-uk/donottranslate-more-keys.xml
@@ -35,7 +35,7 @@
<!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
<string name="more_keys_for_cyrillic_soft_sign">ъ</string>
<!-- U+20B4: "₴" HRYVNIA SIGN -->
- <string name="keylabel_for_currency_generic">₴</string>
+ <string name="keylabel_for_currency">₴</string>
<!-- Label for "switch to alphabetic" key.
U+0410: "А" CYRILLIC CAPITAL LETTER A
U+0411: "Б" CYRILLIC CAPITAL LETTER BE
diff --git a/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml
index fa98ea9..f01f068 100644
--- a/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-vi/donottranslate-more-keys.xml
@@ -93,5 +93,5 @@
<!-- U+0111: "đ" LATIN SMALL LETTER D WITH STROKE -->
<string name="more_keys_for_d">đ</string>
<!-- U+20AB: "₫" DONG SIGN -->
- <string name="keylabel_for_currency_generic">₫</string>
+ <string name="keylabel_for_currency">₫</string>
</resources>
diff --git a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
index 96db1e3..349baba 100644
--- a/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values/donottranslate-more-keys.xml
@@ -75,8 +75,8 @@
U+00A5: "¥" YEN SIGN
U+20B1: "₱" PESO SIGN -->
<string name="more_keys_for_currency_dollar">¢,£,€,¥,₱</string>
- <string name="keylabel_for_currency_generic">$</string>
- <string name="more_keys_for_currency_generic">$,¢,€,£,¥,₱</string>
+ <string name="keylabel_for_currency">$</string>
+ <string name="more_keys_for_currency">$,¢,€,£,¥,₱</string>
<string name="more_keys_for_punctuation">"!fixedColumnOrder!8,\",\',#,-,:,!,\\,,\?,\@,&,\\%,+,;,/,(,)"</string>
<!-- U+2020: "†" DAGGER
U+2021: "‡" DOUBLE DAGGER