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

X-SVN-Rev: 39587

diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp
index c841962c92fdb7e4b5e0673b9e3b12c949c022f9..647ac29f169299069d40042ac3c44386d43cdbd9 100644 (file)
--- a/icu4c/source/common/uloc.cpp
+++ b/icu4c/source/common/uloc.cpp
@@ -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",

diff --git a/icu4c/source/data/icu-coll-deprecates.xml b/icu4c/source/data/icu-coll-deprecates.xml
index f2802be005ef3a8cdc3ded17cce6f71f465f7d60..d418fa70b302badbe503a1edaca60cd55d2ceba9 100644 (file)
--- a/icu4c/source/data/icu-coll-deprecates.xml
+++ b/icu4c/source/data/icu-coll-deprecates.xml
@@ -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" />

diff --git a/icu4c/source/data/icu-config.xml b/icu4c/source/data/icu-config.xml
index 9c44e85af1f488296cf963e1524919c4ad232eb2..e2c3ad77b18465a8d85f1cdbf608ea63626a9013 100644 (file)
--- a/icu4c/source/data/icu-config.xml
+++ b/icu4c/source/data/icu-config.xml
@@ -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"/>

diff --git a/icu4c/source/data/icu-locale-deprecates.xml b/icu4c/source/data/icu-locale-deprecates.xml
index 566454d82b4d81ac851260ed264135d6f64bfe48..fb55e582684f84d02dcc92ccb8f6832967861167 100644 (file)
--- a/icu4c/source/data/icu-locale-deprecates.xml
+++ b/icu4c/source/data/icu-locale-deprecates.xml
@@ -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"/>

diff --git a/icu4c/source/data/icu-rbnf-deprecates.xml b/icu4c/source/data/icu-rbnf-deprecates.xml
index 084219f4e5c992fa6cb18f29dcbcbd818f2ee854..22df252f11c0ec84d7138467c4e7b1d50785799b 100644 (file)
--- a/icu4c/source/data/icu-rbnf-deprecates.xml
+++ b/icu4c/source/data/icu-rbnf-deprecates.xml
@@ -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" />

diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp
index 1194615a04e07de60bf3e6dae898a2ae81a65376..e849b26fa19f0a0db94c86cc16035f57b6b60355 100644 (file)
--- a/icu4c/source/test/intltest/loctest.cpp
+++ b/icu4c/source/test/intltest/loctest.cpp
@@ -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;

diff --git a/icu4c/source/test/testdata/structLocale.txt b/icu4c/source/test/testdata/structLocale.txt
index f0de36c7c12773e5d319d6e59ef1d87df056a72e..1405cb1772320c765394086b46f6c16685c2b54c 100644 (file)
--- a/icu4c/source/test/testdata/structLocale.txt
+++ b/icu4c/source/test/testdata/structLocale.txt
@@ -5409,6 +5409,7 @@ structLocale:table(nofallback){
         aro{""}
         arp{""}
         arq{""}
+        ars{""}
         arw{""}
         ary{""}
         arz{""}

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java
index b4f608dc5e42e6bdb390d51e00b804ed95973e39..1baf2131c8f4b7a6eba30129ad369a495ccd95cb 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java
@@ -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",