From ce4b90e4843ebaaa7a6982f1685f235b2c44bfbe Mon Sep 17 00:00:00 2001 From: DraganBesevic Date: Tue, 17 Sep 2024 13:56:09 -0700 Subject: [PATCH] ICU-22723 Integrate CLDR 46 release beta1, part 3, source files --- icu4c/source/test/intltest/caltest.cpp | 8 ++++---- icu4c/source/test/intltest/dtifmtts.cpp | 8 ++++---- icu4c/source/test/intltest/dtptngts.cpp | 2 +- .../com/ibm/icu/dev/test/calendar/IBMCalendarTest.java | 6 +++--- .../ibm/icu/dev/test/format/DateIntervalFormatTest.java | 8 ++++---- .../ibm/icu/dev/test/format/DateTimeGeneratorTest.java | 2 +- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/icu4c/source/test/intltest/caltest.cpp b/icu4c/source/test/intltest/caltest.cpp index 3491d6d6d706..6d019086e53e 100644 --- a/icu4c/source/test/intltest/caltest.cpp +++ b/icu4c/source/test/intltest/caltest.cpp @@ -5605,7 +5605,7 @@ void CalendarTest::TestFirstDayOfWeek() { // Test -u-rg- value verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-mvzzzz-sd-usca", UCAL_FRIDAY); - verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-aezzzz-sd-usca", UCAL_SATURDAY); + verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-aezzzz-sd-usca", UCAL_MONDAY); verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-uszzzz-sd-usca", UCAL_SUNDAY); verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-gbzzzz-sd-usca", UCAL_MONDAY); @@ -5616,13 +5616,13 @@ void CalendarTest::TestFirstDayOfWeek() { // Test Region Tags only verifyFirstDayOfWeek("en-MV", UCAL_FRIDAY); - verifyFirstDayOfWeek("en-AE", UCAL_SATURDAY); + verifyFirstDayOfWeek("en-AE", UCAL_MONDAY); verifyFirstDayOfWeek("en-US", UCAL_SUNDAY); verifyFirstDayOfWeek("dv-GB", UCAL_MONDAY); // Test -u-sd- verifyFirstDayOfWeek("en-u-sd-mv00", UCAL_FRIDAY); - verifyFirstDayOfWeek("en-u-sd-aeaj", UCAL_SATURDAY); + verifyFirstDayOfWeek("en-u-sd-aeaj", UCAL_MONDAY); verifyFirstDayOfWeek("en-u-sd-usca", UCAL_SUNDAY); verifyFirstDayOfWeek("dv-u-sd-gbsct", UCAL_MONDAY); @@ -5633,7 +5633,7 @@ void CalendarTest::TestFirstDayOfWeek() { verifyFirstDayOfWeek("und-Thaa", UCAL_FRIDAY); // ssh => ssh_Arab_AE => Saturday - verifyFirstDayOfWeek("ssh", UCAL_SATURDAY); + verifyFirstDayOfWeek("ssh", UCAL_MONDAY); // en => en_Latn_US => Sunday verifyFirstDayOfWeek("en", UCAL_SUNDAY); diff --git a/icu4c/source/test/intltest/dtifmtts.cpp b/icu4c/source/test/intltest/dtifmtts.cpp index 294f1696e4d3..8f08d4e72781 100644 --- a/icu4c/source/test/intltest/dtifmtts.cpp +++ b/icu4c/source/test/intltest/dtifmtts.cpp @@ -421,7 +421,7 @@ void DateIntervalFormatTest::testFormat() { const char* DATA[] = { "GGGGG y MM dd HH:mm:ss", // pattern for from_data/to_data // test root - "root", "CE 2007 11 10 10:10:10", "CE 2007 12 10 10:10:10", "yM", "2007-11 \\u2013 2007-12", + "root", "CE 2007 11 10 10:10:10", "CE 2007 12 10 10:10:10", "yM", "2007-11\\u2009\\u2013\\u20092007-12", // test 'H' and 'h', using availableFormat in fallback "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 15:10:10", "Hms", "10:10:10\\u2009\\u2013\\u200915:10:10", @@ -1174,8 +1174,8 @@ void DateIntervalFormatTest::testHourMetacharacters() { "zh_HK", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hB", "\\u51CC\\u666812\\u20131\\u6642", "zh_HK", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CC", "\\u4E0A\\u534810\\u6642\\u81F3\\u4E0B\\u53481\\u6642", "zh_HK", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "CC", "\\u4E0A\\u534812\\u6642\\u81F31\\u6642", - "hi_IN", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jj", "10 am \\u2013 1 pm", - "hi_IN", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "12\\u20131 am", + "hi_IN", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jj", "10\\u202Fam\\u2009\\u2013\\u20091\\u202Fpm", + "hi_IN", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "12\\u20131\\u202Fam", "hi_IN", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "hB", "\\u0938\\u0941\\u092C\\u0939 10 \\u2013 \\u0926\\u094B\\u092A\\u0939\\u0930 1", "hi_IN", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hB", "\\u0930\\u093E\\u0924 12\\u20131", "hi_IN", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CC", "\\u0938\\u0941\\u092C\\u0939 10 \\u2013 \\u0926\\u094B\\u092A\\u0939\\u0930 1", @@ -2144,7 +2144,7 @@ void DateIntervalFormatTest::testTicket20707() { {u"12\u202FAM", u"00", u"00", u"12\u202FAM", u"12\u202FAM", u"0 (hour: 12)", u"12\u202FAM"}, {u"12\u202FAM", u"00", u"00", u"12\u202FAM", u"12\u202FAM", u"0 (hour: 12)", u"12\u202FAM"}, // Hour-cycle: K - {u"0 am", u"00", u"00", u"0 am", u"0 am", u"0 (\u0918\u0902\u091F\u093E: 00)", u"\u0930\u093E\u0924 0"} + {u"0\u202Fam", u"00", u"00", u"0\u202Fam", u"0\u202Fam", u"0 (\u0918\u0902\u091F\u093E: 00)", u"\u0930\u093E\u0924 0"} }; int32_t i = 0; diff --git a/icu4c/source/test/intltest/dtptngts.cpp b/icu4c/source/test/intltest/dtptngts.cpp index c743d8159ba5..21a20ccc8d6c 100644 --- a/icu4c/source/test/intltest/dtptngts.cpp +++ b/icu4c/source/test/intltest/dtptngts.cpp @@ -1433,7 +1433,7 @@ void IntlTestDateTimePatternGeneratorAPI::test20640_HourCyclArsEnNH() { } cases[] = { // ars is interesting because it does not have a region, but it aliases // to ar_SA, which has a region. - {"ars", u"h a", u"h:mm a", UDAT_HOUR_CYCLE_12}, + {"ars", u"h\u202Fa", u"h:mm a", UDAT_HOUR_CYCLE_12}, // en_NH is interesting because NH is a deprecated region code; // formerly New Hebrides, now Vanuatu => VU => h. {"en_NH", u"h\u202Fa", u"h:mm\u202Fa", UDAT_HOUR_CYCLE_12}, diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java index 476ccc183c92..17c8fe073720 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/calendar/IBMCalendarTest.java @@ -239,7 +239,7 @@ public void TestFirstDayOfWeek() { // Test -u-rg- value verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-mvzzzz-sd-usca", Calendar.FRIDAY); - verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-aezzzz-sd-usca", Calendar.SATURDAY); + verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-aezzzz-sd-usca", Calendar.MONDAY); verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-uszzzz-sd-usca", Calendar.SUNDAY); verifyFirstDayOfWeek("en-MV-u-ca-iso8601-rg-gbzzzz-sd-usca", Calendar.MONDAY); @@ -250,7 +250,7 @@ public void TestFirstDayOfWeek() { // Test Region Tags only verifyFirstDayOfWeek("en-MV", Calendar.FRIDAY); - verifyFirstDayOfWeek("en-AE", Calendar.SATURDAY); + verifyFirstDayOfWeek("en-AE", Calendar.MONDAY); verifyFirstDayOfWeek("en-US", Calendar.SUNDAY); verifyFirstDayOfWeek("dv-GB", Calendar.MONDAY); @@ -267,7 +267,7 @@ public void TestFirstDayOfWeek() { verifyFirstDayOfWeek("und-Thaa", Calendar.FRIDAY); // ssh => ssh_Arab_AE => Saturday - verifyFirstDayOfWeek("ssh", Calendar.SATURDAY); + verifyFirstDayOfWeek("ssh", Calendar.MONDAY); // wbl_Arab => wbl_Arab_AF => Saturday if (!logKnownIssue("CLDR-17907", "wbl-Arab returns wrong first day of the week, probably caused by wrong Likely Subtag algo")) { verifyFirstDayOfWeek("wbl-Arab", Calendar.SATURDAY); diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java index cef9855ebc1e..1a0ad786498b 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateIntervalFormatTest.java @@ -72,7 +72,7 @@ public void TestFormat() { String[] DATA = { "GGGGG y MM dd HH:mm:ss", // pattern for from_data/to_data // test root - "root", "CE 2007 11 10 10:10:10", "CE 2007 12 10 10:10:10", "yM", "2007-11 \\u2013 2007-12", + "root", "CE 2007 11 10 10:10:10", "CE 2007 12 10 10:10:10", "yM", "2007-11\\u2009\\u2013\\u20092007-12", // test 'H' and 'h', using availableFormat in fallback "en", "CE 2007 11 10 10:10:10", "CE 2007 11 10 15:10:10", "Hms", "10:10:10\\u2009\\u2013\\u200915:10:10", @@ -819,8 +819,8 @@ public void TestHourMetacharacters() { "zh_HK", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hB", "\\u51CC\\u666812\\u20131\\u6642", "zh_HK", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CC", "\\u4E0A\\u534810\\u6642\\u81F3\\u4E0B\\u53481\\u6642", "zh_HK", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "CC", "\\u4E0A\\u534812\\u6642\\u81F31\\u6642", - "hi_IN", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jj", "10 am \\u2013 1 pm", - "hi_IN", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "12\\u20131 am", + "hi_IN", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "jj", "10\\u202Fam\\u2009\\u2013\\u20091\\u202Fpm", + "hi_IN", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "jj", "12\\u20131\\u202Fam", "hi_IN", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "hB", "\\u0938\\u0941\\u092C\\u0939 10 \\u2013 \\u0926\\u094B\\u092A\\u0939\\u0930 1", "hi_IN", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hB", "\\u0930\\u093E\\u0924 12\\u20131", "hi_IN", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "CC", "\\u0938\\u0941\\u092C\\u0939 10 \\u2013 \\u0926\\u094B\\u092A\\u0939\\u0930 1", @@ -2265,7 +2265,7 @@ public void testTicket20707() { {"0\u202FAM", "00", "00", "0\u202FAM", "0\u202FAM", "0 (hour: 00)", "0\u202FAM"}, {"12\u202FAM", "00", "00", "12\u202FAM", "12\u202FAM", "0 (hour: 12)", "12\u202FAM"}, {"12\u202FAM", "00", "00", "12\u202FAM", "12\u202FAM", "0 (hour: 12)", "12\u202FAM"}, - {"0 am", "00", "00", "0 am", "0 am", "0 (\u0918\u0902\u091F\u093E: 00)", "\u0930\u093E\u0924 0"} + {"0\u202Fam", "00", "00", "0\u202Fam", "0\u202Fam", "0 (\u0918\u0902\u091F\u093E: 00)", "\u0930\u093E\u0924 0"} }; int i = 0; diff --git a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java index 6dc627a08365..dd51e3e7e8d4 100644 --- a/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java +++ b/icu4j/main/core/src/test/java/com/ibm/icu/dev/test/format/DateTimeGeneratorTest.java @@ -1743,7 +1743,7 @@ public void test20640_HourCyclArsEnNH() { String[][] cases = new String[][]{ // ars is interesting because it does not have a region, but it aliases // to ar_SA, which has a region. - {"ars", "h a", "h:mm a", "HOUR_CYCLE_12"}, + {"ars", "h\u202Fa", "h:mm a", "HOUR_CYCLE_12"}, // en_NH is interesting because NH is a depregated region code. {"en_NH", "h\u202Fa", "h:mm\u202Fa", "HOUR_CYCLE_12"}, // ch_ZH is a typo (should be zh_CN), but we should fail gracefully.