organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-14 17:24:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions 1

ICU-12940 Add "ars" as alias to "ar_SA" locale, to "ar" for coll/rbnf

Browse source 
X-SVN-Rev: 39587
This commit is contained in:
Peter Edberg 2017-01-20 20:07:27 +00:00
parent 242e02c388
commit 183b124712
8 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icu4c/source/common/uloc.cpp
View file

@ -101,7 +101,7 @@ static const char * const LANGUAGES[] = {
"aa", "ab", "ace", "ach", "ada", "ady", "ae", "aeb",
"af", "afh", "agq", "ain", "ak", "akk", "akz", "ale",
"aln", "alt", "am", "an", "ang", "anp", "ar", "arc",
"arn", "aro", "arp", "arq", "arw", "ary", "arz", "as",
"arn", "aro", "arp", "arq", "ars", "arw", "ary", "arz", "as",
"asa", "ase", "ast", "av", "avk", "awa", "ay", "az",
"ba", "bal", "ban", "bar", "bas", "bax", "bbc", "bbj",
"be", "bej", "bem", "bew", "bez", "bfd", "bfq", "bg",
@ -216,7 +216,7 @@ static const char * const LANGUAGES_3[] = {
"aar", "abk", "ace", "ach", "ada", "ady", "ave", "aeb",
"afr", "afh", "agq", "ain", "aka", "akk", "akz", "ale",
"aln", "alt", "amh", "arg", "ang", "anp", "ara", "arc",
"arn", "aro", "arp", "arq", "arw", "ary", "arz", "asm",
"arn", "aro", "arp", "arq", "ars", "arw", "ary", "arz", "asm",
"asa", "ase", "ast", "ava", "avk", "awa", "aym", "aze",
"bak", "bal", "ban", "bar", "bas", "bax", "bbc", "bbj",
"bel", "bej", "bem", "bew", "bez", "bfd", "bfq", "bul",

1
icu4c/source/data/icu-coll-deprecates.xml
View file

@ -9,6 +9,7 @@
*/
-->
<deprecates>
<alias from="ars" to="ar"/>
<alias from="de__PHONEBOOK" to="de" rbpath="/collations/default" value="phonebook"/>
<alias from="es__TRADITIONAL" to="es" rbpath="/collations/default" value="traditional"/>
<alias from="in" to="id" />

1
icu4c/source/data/icu-config.xml
View file

@ -49,6 +49,7 @@
<include locales="ar_TD"/>
<include locales="ar_TN"/>
<include locales="ar_YE"/>
<include locales="ars"/>
<include locales="as"/>
<include locales="as_IN"/>
<include locales="asa"/>

1
icu4c/source/data/icu-locale-deprecates.xml
View file

@ -9,6 +9,7 @@
*/
-->
<deprecates>
<alias from="ars" to="ar_SA"/>
<alias from="az_AZ" to="az_Latn_AZ"/>
<alias from="bs_BA" to="bs_Latn_BA" />
<alias from="en_NH" to="en_VU"/>

1
icu4c/source/data/icu-rbnf-deprecates.xml
View file

@ -9,6 +9,7 @@
*/
-->
<deprecates>
<alias from="ars" to="ar" />
<alias from="es_DO" to="es_419" />
<alias from="es_GT" to="es_419" />
<alias from="es_HN" to="es_419" />

4
icu4c/source/test/intltest/loctest.cpp
View file

@ -864,8 +864,8 @@ LocaleTest::TestGetLangsAndCountries()
;
/* TODO: Change this test to be more like the cloctst version? */
if (testCount != 593)
errln("Expected getISOLanguages() to return 593 languages; it returned %d", testCount);
if (testCount != 594)
errln("Expected getISOLanguages() to return 594 languages; it returned %d", testCount);
else {
for (i = 0; i < 15; i++) {
int32_t j;

1
icu4c/source/test/testdata/structLocale.txt vendored
View file

@ -5409,6 +5409,7 @@ structLocale:table(nofallback){
aro{""}
arp{""}
arq{""}
ars{""}
arw{""}
ary{""}
arz{""}

8
icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java
View file

@ -150,8 +150,8 @@ public class LocaleIDs {
"aa", "ab", "ace", "ach", "ada", "ady", "ae", "af",
"afa", "afh", "agq", "ain", "ak", "akk", "ale", "alg",
"alt", "am", "an", "ang", "anp", "apa", "ar", "arc",
"arn", "arp", "art", "arw", "as", "asa", "ast", "ath",
"aus", "av", "awa", "ay", "az",
"arn", "arp", "ars", "art", "arw", "as", "asa", "ast",
"ath", "aus", "av", "awa", "ay", "az",
"ba", "bad", "bai", "bal", "ban", "bas", "bat", "bax",
"bbj", "be", "bej", "bem", "ber", "bez", "bfd", "bg",
"bh", "bho", "bi", "bik", "bin", "bkm", "bla", "bm",
@ -243,8 +243,8 @@ public class LocaleIDs {
"aar", "abk", "ace", "ach", "ada", "ady", "ave", "afr",
"afa", "afh", "agq", "ain", "aka", "akk", "ale", "alg",
"alt", "amh", "arg", "ang", "anp", "apa", "ara", "arc",
"arn", "arp", "art", "arw", "asm", "asa", "ast", "ath",
"aus", "ava", "awa", "aym", "aze",
"arn", "arp", "ars", "art", "arw", "asm", "asa", "ast",
"ath", "aus", "ava", "awa", "aym", "aze",
"bak", "bad", "bai", "bal", "ban", "bas", "bat", "bax",
"bbj", "bel", "bej", "bem", "ber", "bez", "bfd", "bul",
"bih", "bho", "bis", "bik", "bin", "bkm", "bla", "bam",