From 183b1247129da696bcba82a922d461a445524059 Mon Sep 17 00:00:00 2001 From: Peter Edberg Date: Fri, 20 Jan 2017 20:07:27 +0000 Subject: [PATCH] ICU-12940 Add "ars" as alias to "ar_SA" locale, to "ar" for coll/rbnf X-SVN-Rev: 39587 --- icu4c/source/common/uloc.cpp | 4 ++-- icu4c/source/data/icu-coll-deprecates.xml | 1 + icu4c/source/data/icu-config.xml | 1 + icu4c/source/data/icu-locale-deprecates.xml | 1 + icu4c/source/data/icu-rbnf-deprecates.xml | 1 + icu4c/source/test/intltest/loctest.cpp | 4 ++-- icu4c/source/test/testdata/structLocale.txt | 1 + .../main/classes/core/src/com/ibm/icu/impl/LocaleIDs.java | 8 ++++---- 8 files changed, 13 insertions(+), 8 deletions(-) diff --git a/icu4c/source/common/uloc.cpp b/icu4c/source/common/uloc.cpp index c841962c92f..647ac29f169 100644 --- 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 f2802be005e..d418fa70b30 100644 --- a/icu4c/source/data/icu-coll-deprecates.xml +++ b/icu4c/source/data/icu-coll-deprecates.xml @@ -9,6 +9,7 @@ */ --> + diff --git a/icu4c/source/data/icu-config.xml b/icu4c/source/data/icu-config.xml index 9c44e85af1f..e2c3ad77b18 100644 --- a/icu4c/source/data/icu-config.xml +++ b/icu4c/source/data/icu-config.xml @@ -49,6 +49,7 @@ + diff --git a/icu4c/source/data/icu-locale-deprecates.xml b/icu4c/source/data/icu-locale-deprecates.xml index 566454d82b4..fb55e582684 100644 --- a/icu4c/source/data/icu-locale-deprecates.xml +++ b/icu4c/source/data/icu-locale-deprecates.xml @@ -9,6 +9,7 @@ */ --> + diff --git a/icu4c/source/data/icu-rbnf-deprecates.xml b/icu4c/source/data/icu-rbnf-deprecates.xml index 084219f4e5c..22df252f11c 100644 --- a/icu4c/source/data/icu-rbnf-deprecates.xml +++ b/icu4c/source/data/icu-rbnf-deprecates.xml @@ -9,6 +9,7 @@ */ --> + diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index 1194615a04e..e849b26fa19 100644 --- 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 f0de36c7c12..1405cb17723 100644 --- 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 b4f608dc5e4..1baf2131c8f 100644 --- 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", -- 2.40.0