diff --git a/icu4c/source/test/cintltst/cloctst.c b/icu4c/source/test/cintltst/cloctst.c index 8dbf04572daf..4e81eb17e4a2 100644 --- a/icu4c/source/test/cintltst/cloctst.c +++ b/icu4c/source/test/cintltst/cloctst.c @@ -4634,12 +4634,12 @@ const char* const full_data[][3] = { "bn_IN" }, { "und_CD", - "sw_Latn_CD", - "sw_CD" + "fr_Latn_CD", + "fr_CD" }, { "und_CF", - "fr_Latn_CF", - "fr_CF" + "sg_Latn_CF", + "sg" }, { "und_CG", "fr_Latn_CG", @@ -4706,8 +4706,8 @@ const char* const full_data[][3] = { "de" }, { "und_DJ", - "aa_Latn_DJ", - "aa_DJ" + "fr_Latn_DJ", + "fr_DJ" }, { "und_DK", "da_Latn_DK", @@ -5258,8 +5258,8 @@ const char* const full_data[][3] = { "it_SM" }, { "und_SN", - "fr_Latn_SN", - "fr_SN" + "wo_Latn_SN", + "wo" }, { "und_SO", "so_Latn_SO", @@ -5286,8 +5286,8 @@ const char* const full_data[][3] = { "si" }, { "und_TD", - "fr_Latn_TD", - "fr_TD" + "ar_Arab_TD", + "ar_TD" }, { "und_TG", "fr_Latn_TG", diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c index c500b99f5ea5..0038d0f8e4cb 100644 --- a/icu4c/source/test/cintltst/creststn.c +++ b/icu4c/source/test/cintltst/creststn.c @@ -2185,7 +2185,7 @@ static void TestFallback(void) UResourceBundle* myResB = ures_open(NULL,"no_NO_NY",&err); UResourceBundle* resLocID = ures_getByKey(myResB, "Version", NULL, &err); const UChar* version = NULL; - static const UChar versionStr[] = u"46"; // 46 in nn_NO or in a parent bundle/root + static const UChar versionStr[] = u"47"; // 47 in nn_NO or in a parent bundle/root if(U_FAILURE(err)) { log_data_err("Expected success when trying to test no_NO_NY aliased to nn_NO for Version " diff --git a/icu4c/source/test/intltest/dtfmttst.cpp b/icu4c/source/test/intltest/dtfmttst.cpp index 8476deb7d920..4da99586b525 100644 --- a/icu4c/source/test/intltest/dtfmttst.cpp +++ b/icu4c/source/test/intltest/dtfmttst.cpp @@ -2725,7 +2725,7 @@ void DateFormatTest::TestTimeZoneDisplayName() { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" }, { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" }, { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney Time", "Australia/Sydney" }, - { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" }, + { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Australian Eastern Time", "Australia/Sydney" }, { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "VVVV", "Sydney Time", "Australia/Sydney" }, { "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" }, @@ -2737,7 +2737,7 @@ void DateFormatTest::TestTimeZoneDisplayName() { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" }, { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" }, { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney Time", "Australia/Sydney" }, - { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" }, + { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Australian Eastern Time", "Australia/Sydney" }, { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "VVVV", "Sydney Time", "Australia/Sydney" }, { "en", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" }, @@ -2778,7 +2778,7 @@ void DateFormatTest::TestTimeZoneDisplayName() // Proper CLDR primary zone support #9733 { "en", "America/Santiago", "2013-01-01T00:00:00Z", "VVVV", "Chile Time", "America/Santiago" }, - { "en", "Pacific/Easter", "2013-01-01T00:00:00Z", "VVVV", "Easter Time", "Pacific/Easter" }, + { "en", "Pacific/Easter", "2013-01-01T00:00:00Z", "VVVV", "Easter Island Time", "Pacific/Easter" }, // ========== diff --git a/icu4c/source/test/intltest/loctest.cpp b/icu4c/source/test/intltest/loctest.cpp index f3e16d3fa0dc..73f0bcb64887 100644 --- a/icu4c/source/test/intltest/loctest.cpp +++ b/icu4c/source/test/intltest/loctest.cpp @@ -2582,12 +2582,12 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "bn_IN" }, { "und_CD", - "sw_Latn_CD", - "sw_CD" + "fr_Latn_CD", + "fr_CD" }, { "und_CF", - "fr_Latn_CF", - "fr_CF" + "sg_Latn_CF", + "sg" }, { "und_CG", "fr_Latn_CG", @@ -2650,8 +2650,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "de" }, { "und_DJ", - "aa_Latn_DJ", - "aa_DJ" + "fr_Latn_DJ", + "fr_DJ" }, { "und_DK", "da_Latn_DK", @@ -3194,8 +3194,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "it_SM" }, { "und_SN", - "fr_Latn_SN", - "fr_SN" + "wo_Latn_SN", + "wo" }, { "und_SO", "so_Latn_SO", @@ -3226,8 +3226,8 @@ LocaleTest::TestAddLikelyAndMinimizeSubtags() { "syr" }, { "und_TD", - "fr_Latn_TD", - "fr_TD" + "ar_Arab_TD", + "ar_TD" }, { "und_TG", "fr_Latn_TG", diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java index 5bdf2faabfbc..b0cd3e47d934 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/format/DateFormatTest.java @@ -943,7 +943,7 @@ public void TestTimeZoneInLocale() { { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" }, { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" }, { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "v", "Sydney Time", "Australia/Sydney" }, - { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" }, + { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "vvvv", "Australian Eastern Time", "Australia/Sydney" }, { "en", "Australia/ACT", "2004-07-15T00:00:00Z", "VVVV", "Sydney Time", "Australia/Sydney" }, { "en", "Australia/Sydney", "2004-01-15T00:00:00Z", "Z", "+1100", "+11:00" }, @@ -955,7 +955,7 @@ public void TestTimeZoneInLocale() { { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "z", "GMT+10", "+10:00" }, { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "zzzz", "Australian Eastern Standard Time", "+10:00" }, { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "v", "Sydney Time", "Australia/Sydney" }, - { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Eastern Australia Time", "Australia/Sydney" }, + { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "vvvv", "Australian Eastern Time", "Australia/Sydney" }, { "en", "Australia/Sydney", "2004-07-15T00:00:00Z", "VVVV", "Sydney Time", "Australia/Sydney" }, { "en", "Europe/London", "2004-01-15T00:00:00Z", "Z", "+0000", "+0:00" }, @@ -996,7 +996,7 @@ public void TestTimeZoneInLocale() { // Proper CLDR primary zone support #9733 { "en", "America/Santiago", "2013-01-01T00:00:00Z", "VVVV", "Chile Time", "America/Santiago" }, - { "en", "Pacific/Easter", "2013-01-01T00:00:00Z", "VVVV", "Easter Time", "Pacific/Easter" }, + { "en", "Pacific/Easter", "2013-01-01T00:00:00Z", "VVVV", "Easter Island Time", "Pacific/Easter" }, // ========== diff --git a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java index 084cd93d0665..15497f007acc 100644 --- a/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java +++ b/icu4j/main/common_tests/src/test/java/com/ibm/icu/dev/test/util/ULocaleTest.java @@ -2725,12 +2725,12 @@ else if (!res.toString().equals(exp)) { "bn_IN" }, { "und_CD", - "sw_Latn_CD", - "sw_CD" + "fr_Latn_CD", + "fr_CD" }, { "und_CF", - "fr_Latn_CF", - "fr_CF" + "sg_Latn_CF", + "sg" }, { "und_CG", "fr_Latn_CG", @@ -2793,8 +2793,8 @@ else if (!res.toString().equals(exp)) { "de" }, { "und_DJ", - "aa_Latn_DJ", - "aa_DJ" + "fr_Latn_DJ", + "fr_DJ" }, { "und_DK", "da_Latn_DK", @@ -3337,8 +3337,8 @@ else if (!res.toString().equals(exp)) { "it_SM" }, { "und_SN", - "fr_Latn_SN", - "fr_SN" + "wo_Latn_SN", + "wo" }, { "und_SO", "so_Latn_SO", @@ -3369,8 +3369,8 @@ else if (!res.toString().equals(exp)) { "syr" }, { "und_TD", - "fr_Latn_TD", - "fr_TD" + "ar_Arab_TD", + "ar_TD" }, { "und_TG", "fr_Latn_TG", diff --git a/icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java b/icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java index 7686eb131adf..608c13e474ae 100644 --- a/icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java +++ b/icu4j/main/core/src/main/java/com/ibm/icu/impl/LocaleFallbackData.java @@ -332,6 +332,7 @@ private static Map buildDefaultScriptTable() { t.put("ha_SD", "Arab"); t.put("hac", "Arab"); t.put("hak", "Hans"); + t.put("hak_TW", "Hant"); t.put("har", "Ethi"); t.put("haz", "Arab"); t.put("hbo", "Hebr"); @@ -553,6 +554,7 @@ private static Map buildDefaultScriptTable() { t.put("lwm", "Thai"); t.put("lya", "Tibt"); t.put("lzh", "Hans"); + t.put("lzz_GE", "Geor"); t.put("mag", "Deva"); t.put("mai", "Deva"); t.put("man_GN", "Nkoo"); @@ -616,6 +618,7 @@ private static Map buildDefaultScriptTable() { t.put("myz", "Mand"); t.put("mzn", "Arab"); t.put("nan", "Hans"); + t.put("nan_TW", "Hant"); t.put("nao", "Deva"); t.put("ncd", "Deva"); t.put("ncq", "Laoo"); @@ -723,6 +726,7 @@ private static Map buildDefaultScriptTable() { t.put("pll", "Mymr"); t.put("pmh", "Brah"); t.put("pnt", "Grek"); + t.put("pnt_RU", "Cyrl"); t.put("pra", "Khar"); t.put("prc", "Arab"); t.put("prd", "Arab"); @@ -787,7 +791,6 @@ private static Map buildDefaultScriptTable() { t.put("sds", "Arab"); t.put("sel", "Cyrl"); t.put("sfm", "Plrd"); - t.put("sga", "Ogam"); t.put("sgh", "Cyrl"); t.put("sgj", "Deva"); t.put("sgr", "Arab"); @@ -1098,30 +1101,36 @@ private static Map buildParentLocaleTable() { t.put("en_CM", "en_001"); t.put("en_CX", "en_001"); t.put("en_CY", "en_001"); + t.put("en_CZ", "en_150"); t.put("en_DE", "en_150"); t.put("en_DG", "en_001"); t.put("en_DK", "en_150"); t.put("en_DM", "en_001"); t.put("en_Dsrt", "root"); t.put("en_ER", "en_001"); + t.put("en_ES", "en_150"); t.put("en_FI", "en_150"); t.put("en_FJ", "en_001"); t.put("en_FK", "en_001"); t.put("en_FM", "en_001"); + t.put("en_FR", "en_150"); t.put("en_GB", "en_001"); t.put("en_GD", "en_001"); t.put("en_GG", "en_001"); t.put("en_GH", "en_001"); t.put("en_GI", "en_001"); t.put("en_GM", "en_001"); + t.put("en_GS", "en_001"); t.put("en_GY", "en_001"); t.put("en_HK", "en_001"); + t.put("en_HU", "en_150"); t.put("en_ID", "en_001"); t.put("en_IE", "en_001"); t.put("en_IL", "en_001"); t.put("en_IM", "en_001"); t.put("en_IN", "en_001"); t.put("en_IO", "en_001"); + t.put("en_IT", "en_150"); t.put("en_JE", "en_001"); t.put("en_JM", "en_001"); t.put("en_KE", "en_001"); @@ -1143,13 +1152,16 @@ private static Map buildParentLocaleTable() { t.put("en_NF", "en_001"); t.put("en_NG", "en_001"); t.put("en_NL", "en_150"); + t.put("en_NO", "en_150"); t.put("en_NR", "en_001"); t.put("en_NU", "en_001"); t.put("en_NZ", "en_001"); t.put("en_PG", "en_001"); t.put("en_PK", "en_001"); t.put("en_PN", "en_001"); + t.put("en_PT", "en_150"); t.put("en_PW", "en_001"); + t.put("en_RO", "en_150"); t.put("en_RW", "en_001"); t.put("en_SB", "en_001"); t.put("en_SC", "en_001"); @@ -1158,6 +1170,7 @@ private static Map buildParentLocaleTable() { t.put("en_SG", "en_001"); t.put("en_SH", "en_001"); t.put("en_SI", "en_150"); + t.put("en_SK", "en_150"); t.put("en_SL", "en_001"); t.put("en_SS", "en_001"); t.put("en_SX", "en_001"); diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleMatcherTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleMatcherTest.java index aa8a7203dcd5..58e0c9650ad1 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleMatcherTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/LocaleMatcherTest.java @@ -570,7 +570,7 @@ private void check2(Set sorted) { public void testAsymmetry() { LocaleMatcher matcher; matcher = new LocaleMatcher("mul, nl"); - assertEquals("nl", matcher.getBestMatch("af").toString()); // af => nl + assertEquals("mul", matcher.getBestMatch("af").toString()); // af => nl matcher = new LocaleMatcher("mul, af"); assertEquals("mul", matcher.getBestMatch("nl").toString()); // but nl !=> af diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TestLocaleValidity.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TestLocaleValidity.java index 5d8ae0f0e66a..a9777dd7ef47 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TestLocaleValidity.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/util/TestLocaleValidity.java @@ -56,7 +56,7 @@ public void testBasic() { {"OK", "en-u-ca-buddhist"}, {"OK", "en-u-ca-islamic-umalqura"}, // additive {"OK", "en-u-cf-account"}, - {"OK", "en-u-co-big5han"}, + {"{u, co-big5han}", "en-u-co-big5han"}, // deprecated in 47 {"OK", "en-u-cu-adp"}, {"OK", "en-u-fw-fri"}, {"OK", "en-u-dx-thai"}, @@ -106,7 +106,7 @@ public void testBasic() { // really long case - {"OK", "en-u-ca-buddhist-ca-islamic-umalqura-cf-account-co-big5han-cu-adp-fw-fri-hc-h11-ka-noignore-kb-false-kc-false-kf-false-kk-false-kn-false-kr-latn-digit-symbol-ks-identic-kv-currency-nu-ahom-sd-usny-tz-adalv-va-posix"}, + {"OK", "en-u-ca-buddhist-ca-islamic-umalqura-cf-account-co-pinyin-cu-adp-fw-fri-hc-h11-ka-noignore-kb-false-kc-false-kf-false-kk-false-kn-false-kr-latn-digit-symbol-ks-identic-kv-currency-nu-ahom-sd-usny-tz-adalv-va-posix"}, // root is canonicalized to the root locale (ICU-20273) {"OK", "root"},