8000 ICU-22923 Integrate CLDR 47 release beta2, part 3, source and test files · unicode-org/icu@19dd858 · GitHub
[go: up one dir, main page]
Skip to content

Commit 19dd858

Browse files
DraganBesevicDraganBesevic
committed
ICU-22923 Integrate CLDR 47 release beta2, part 3, source and test files
1 parent 7931e6f commit 19dd858

File tree

11 files changed

+330
-314
lines changed

11 files changed

+330
-314
lines changed

‎icu4c/source/test/intltest/dtfmttst.cpp

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5189,85 +5189,85 @@ void DateFormatTest::TestFlexibleDayPeriod() {
51895189
sdf.applyPattern(UnicodeString("hh:mm:ss BBB"));
51905190

51915191
// assertEquals("hh:mm:ss BBB | 00:00:00", "12:00:00 midnight", sdf.format(k000000, out.remove()));
5192-
assertEquals("hh:mm:ss BBB | 00:00:00", "12:00:00 at night", sdf.format(k000000, out.remove()));
5193-
assertEquals("hh:mm:ss BBB | 00:00:30", "12:00:30 at night", sdf.format(k000030, out.remove()));
5194-
assertEquals("hh:mm:ss BBB | 00:30:00", "12:30:00 at night", sdf.format(k003000, out.remove()));
5192+
assertEquals("hh:mm:ss BBB | 00:00:00", "12:00:00 in the morning", sdf.format(k000000, out.remove()));
5193+
assertEquals("hh:mm:ss BBB | 00:00:30", "12:00:30 in the morning", sdf.format(k000030, out.remove()));
5194+
assertEquals("hh:mm:ss BBB | 00:30:00", "12:30:00 in the morning", sdf.format(k003000, out.remove()));
51955195
assertEquals("hh:mm:ss BBB | 06:00:00", "06:00:00 in the morning", sdf.format(k060000, out.remove()));
51965196
assertEquals("hh:mm:ss BBB | 12:00:00", "12:00:00 noon", sdf.format(k120000, out.remove()));
51975197
assertEquals("hh:mm:ss BBB | 18:00:00", "06:00:00 in the evening", sdf.format(k180000, out.remove()));
51985198

51995199
sdf.applyPattern(UnicodeString("hh:mm BBB"));
52005200

52015201
// assertEquals("hh:mm BBB | 00:00:00", "12:00 midnight", sdf.format(k000000, out.remove()));
5202-
assertEquals("hh:mm BBB | 00:00:00", "12:00 at night", sdf.format(k000000, out.remove()));
5202+
assertEquals("hh:mm BBB | 00:00:00", "12:00 in the morning", sdf.format(k000000, out.remove()));
52035203
// assertEquals("hh:mm BBB | 00:00:30", "12:00 midnight", sdf.format(k000030, out.remove()));
5204-
assertEquals("hh:mm BBB | 00:00:00", "12:00 at night", sdf.format(k000000, out.remove()));
5205-
assertEquals("hh:mm BBB | 00:30:00", "12:30 at night", sdf.format(k003000, out.remove()));
5204+
assertEquals("hh:mm BBB | 00:00:00", "12:00 in the morning", sdf.format(k000000, out.remove()));
5205+
assertEquals("hh:mm BBB | 00:30:00", "12:30 in the morning", sdf.format(k003000, out.remove()));
52065206

52075207
sdf.applyPattern(UnicodeString("hh BBB"));
52085208

52095209
// assertEquals("hh BBB | 00:00:00", "12 midnight", sdf.format(k000000, out.remove()));
5210-
assertEquals("hh BBB | 00:00:30", "12 at night", sdf.format(k000030, out.remove()));
5210+
assertEquals("hh BBB | 00:00:30", "12 in the morning", sdf.format(k000030, out.remove()));
52115211
// assertEquals("hh BBB | 00:00:30", "12 midnight", sdf.format(k000030, out.remove()));
5212-
assertEquals("hh BBB | 00:00:30", "12 at night", sdf.format(k000030, out.remove()));
5212+
assertEquals("hh BBB | 00:00:30", "12 in the morning", sdf.format(k000030, out.remove()));
52135213
// assertEquals("hh BBB | 00:30:00", "12 midnight", sdf.format(k003000, out.remove()));
5214-
assertEquals("hh BBB | 00:30:00", "12 at night", sdf.format(k003000, out.remove()));
5214+
assertEquals("hh BBB | 00:30:00", "12 in the morning", sdf.format(k003000, out.remove()));
52155215

52165216
// Wide.
52175217
sdf.applyPattern(UnicodeString("hh:mm:ss BBBB"));
52185218

52195219
// assertEquals("hh:mm:ss BBBB | 00:00:00", "12:00:00 midnight", sdf.format(k000000, out.remove()));
5220-
assertEquals("hh:mm:ss BBBB | 00:00:00", "12:00:00 at night", sdf.format(k000000, out.remove()));
5221-
assertEquals("hh:mm:ss BBBB | 00:00:30", "12:00:30 at night", sdf.format(k000030, out.remove()));
5222-
assertEquals("hh:mm:ss BBBB | 00:30:00", "12:30:00 at night", sdf.format(k003000, out.remove()));
5220+
assertEquals("hh:mm:ss BBBB | 00:00:00", "12:00:00 in the morning", sdf.format(k000000, out.remove()));
5221+
assertEquals("hh:mm:ss BBBB | 00:00:30", "12:00:30 in the morning", sdf.format(k000030, out.remove()));
5222+
assertEquals("hh:mm:ss BBBB | 00:30:00", "12:30:00 in the morning", sdf.format(k003000, out.remove()));
52235223
assertEquals("hh:mm:ss BBBB | 06:00:00", "06:00:00 in the morning", sdf.format(k060000, out.remove()));
52245224
assertEquals("hh:mm:ss BBBB | 12:00:00", "12:00:00 noon", sdf.format(k120000, out.remove()));
52255225
assertEquals("hh:mm:ss BBBB | 18:00:00", "06:00:00 in the evening", sdf.format(k180000, out.remove()));
52265226

52275227
sdf.applyPattern(UnicodeString("hh:mm BBBB"));
52285228

52295229
// assertEquals("hh:mm BBBB | 00:00:00", "12:00 midnight", sdf.format(k000000, out.remove()));
5230-
assertEquals("hh:mm BBBB | 00:00:00", "12:00 at night", sdf.format(k000000, out.remove()));
5230+
assertEquals("hh:mm BBBB | 00:00:00", "12:00 in the morning", sdf.format(k000000, out.remove()));
52315231
// assertEquals("hh:mm BBBB | 00:00:30", "12:00 midnight", sdf.format(k000030, out.remove()));
5232-
assertEquals("hh:mm BBBB | 00:00:30", "12:00 at night", sdf.format(k000030, out.remove()));
5233-
assertEquals("hh:mm BBBB | 00:30:00", "12:30 at night", sdf.format(k003000, out.remove()));
5232+
assertEquals("hh:mm BBBB | 00:00:30", "12:00 in the morning", sdf.format(k000030, out.remove()));
5233+
assertEquals("hh:mm BBBB | 00:30:00", "12:30 in the morning", sdf.format(k003000, out.remove()));
52345234

52355235
sdf.applyPattern(UnicodeString("hh BBBB"));
52365236

52375237
// assertEquals("hh BBBB | 00:00:00", "12 midnight", sdf.format(k000000, out.remove()));
5238-
assertEquals("hh BBBB | 00:00:00", "12 at night", sdf.format(k000000, out.remove()));
5238+
assertEquals("hh BBBB | 00:00:00", "12 in the morning", sdf.format(k000000, out.remove()));
52395239
// assertEquals("hh BBBB | 00:00:30", "12 midnight", sdf.format(k000030, out.remove()));
5240-
assertEquals("hh BBBB | 00:00:00", "12 at night", sdf.format(k000000, out.remove()));
5240+
assertEquals("hh BBBB | 00:00:00", "12 in the morning", sdf.format(k000000, out.remove()));
52415241
// assertEquals("hh BBBB | 00:80:00", "12 midnight", sdf.format(k003000, out.remove()));
5242-
assertEquals("hh BBBB | 00:00:00", "12 at night", sdf.format(k000000, out.remove()));
5242+
assertEquals("hh BBBB | 00:00:00", "12 in the morning", sdf.format(k000000, out.remove()));
52435243

52445244
// Narrow.
52455245
sdf.applyPattern(UnicodeString("hh:mm:ss BBBBB"));
52465246

52475247
// assertEquals("hh:mm:ss BBBBB | 00:00:00", "12:00:00 mi", sdf.format(k000000, out.remove()));
5248-
assertEquals("hh:mm:ss BBBBB | 00:00:00", "12:00:00 at night", sdf.format(k000000, out.remove()));
5249-
assertEquals("hh:mm:ss BBBBB | 00:00:30", "12:00:30 at night", sdf.format(k000030, out.remove()));
5250-
assertEquals("hh:mm:ss BBBBB | 00:30:00", "12:30:00 at night", sdf.format(k003000, out.remove()));
5248+
assertEquals("hh:mm:ss BBBBB | 00:00:00", "12:00:00 in the morning", sdf.format(k000000, out.remove()));
5249+
assertEquals("hh:mm:ss BBBBB | 00:00:30", "12:00:30 in the morning", sdf.format(k000030, out.remove()));
5250+
assertEquals("hh:mm:ss BBBBB | 00:30:00", "12:30:00 in the morning", sdf.format(k003000, out.remove()));
52515251
assertEquals("hh:mm:ss BBBBB | 06:00:00", "06:00:00 in the morning", sdf.format(k060000, out.remove()));
52525252
assertEquals("hh:mm:ss BBBBB | 12:00:00", "12:00:00 n", sdf.format(k120000, out.remove()));
52535253
assertEquals("hh:mm:ss BBBBB | 18:00:00", "06:00:00 in the evening", sdf.format(k180000, out.remove()));
52545254

52555255
sdf.applyPattern(UnicodeString("hh:mm BBBBB"));
52565256

52575257
// assertEquals("hh:mm BBBBB | 00:00:00", "12:00 mi", sdf.format(k000000, out.remove()));
5258-
assertEquals("hh:mm BBBBB | 00:00:00", "12:00 at night", sdf.format(k000000, out.remove()));
5258+
assertEquals("hh:mm BBBBB | 00:00:00", "12:00 in the morning", sdf.format(k000000, out.remove()));
52595259
// assertEquals("hh:mm BBBBB | 00:00:30", "12:00 mi", sdf.format(k000030, out.remove()));
5260-
assertEquals("hh:mm BBBBB | 00:00:30", "12:00 at night", sdf.format(k000030, out.remove()));
5261-
assertEquals("hh:mm BBBBB | 00:30:00", "12:30 at night", sdf.format(k003000, out.remove()));
5260+
assertEquals("hh:mm BBBBB | 00:00:30", "12:00 in the morning", sdf.format(k000030, out.remove()));
5261+
assertEquals("hh:mm BBBBB | 00:30:00", "12:30 in the morning", sdf.format(k003000, out.remove()));
52625262

52635263
sdf.applyPattern(UnicodeString("hh BBBBB"));
52645264

52655265
// assertEquals("hh BBBBB | 00:00:00", "12 mi", sdf.format(k000000, out.remove()));
5266-
assertEquals("hh BBBBB | 00:00:00", "12 at night", sdf.format(k000000, out.remove()));
5266+
assertEquals("hh BBBBB | 00:00:00", "12 in the morning", sdf.format(k000000, out.remove()));
52675267
// assertEquals("hh BBBBB | 00:00:30", "12 mi", sdf.format(k000030, out.remove()));
5268-
assertEquals("hh BBBBB | 00:00:30", "12 at night", sdf.format(k000030, out.remove()));
5268+
assertEquals("hh BBBBB | 00:00:30", "12 in the morning", sdf.format(k000030, out.remove()));
52695269
// assertEquals("hh BBBBB | 00:30:00", "12 mi", sdf.format(k003000, out.remove()));
5270-
assertEquals("hh BBBBB | 00:30:00", "12 at night", sdf.format(k003000, out.remove()));
5270+
assertEquals("hh BBBBB | 00:30:00", "12 in the morning", sdf.format(k003000, out.remove()));
52715271
}
52725272

52735273
void DateFormatTest::TestDayPeriodWithLocales() {
@@ -5344,9 +5344,9 @@ void DateFormatTest::TestDayPeriodWithLocales() {
53445344

53455345
// assertEquals("hh:mm:ss BBBB | 00:00:00 | en_US", "12:00:00 midnight",
53465346
// sdf.format(k000000, out.remove()));
5347-
assertEquals("hh:mm:ss BBBB | 00:00:00 | en_US", "12:00:00 at night",
5347+
assertEquals("hh:mm:ss BBBB | 00:00:00 | en_US", "12:00:00 in the morning",
53485348
sdf.format(k000000, out.remove()));
5349-
assertEquals("hh:mm:ss BBBB | 01:00:00 | en_US", "01:00:00 at night",
5349+
assertEquals("hh:mm:ss BBBB | 01:00:00 | en_US", "01:00:00 in the morning",
53505350
sdf.format(k010000, out.remove()));
53515351
assertEquals("hh:mm:ss BBBB | 12:00:00 | en_US", "12:00:00 noon",
53525352
sdf.format(k120000, out.remove()));
@@ -5374,7 +5374,7 @@ void DateFormatTest::TestDayPeriodWithLocales() {
53745374
sdf.setTimeZone(*tz);
53755375

53765376
sdf.applyPattern(UnicodeString("hh:mm:ss BBBB"));
5377-
assertEquals("hh:mm:ss BBBB | 01:00:00 | en@calendar=buddhist", "01:00:00 at night",
5377+
assertEquals("hh:mm:ss BBBB | 01:00:00 | en@calendar=buddhist", "01:00:00 in the morning",
53785378
sdf.format(k010000, out.remove()));
53795379
}
53805380

@@ -5414,7 +5414,7 @@ void DateFormatTest::TestMinuteSecondFieldsInOddPlaces() {
54145414

54155415
// assertEquals("hh:mm 'ss' BBBB | 00:00:30", "12:00 ss midnight",
54165416
// sdf.format(k000030, out.remove()));
5417-
assertEquals("hh:mm 'ss' BBBB | 00:00:30", "12:00 ss at night",
5417+
assertEquals("hh:mm 'ss' BBBB | 00:00:30", "12:00 ss in the morning",
54185418
sdf.format(k000030, out.remove()));
54195419
assertEquals("hh:mm 'ss' BBBB | 06:00:30", "06:00 ss in the morning",
54205420
sdf.format(k060030, out.remove()));
@@ -5433,7 +5433,7 @@ void DateFormatTest::TestMinuteSecondFieldsInOddPlaces() {
54335433

54345434
// assertEquals("hh 'mm ss' BBBB | 00:30:00", "12 mm ss midnight",
54355435
// sdf.format(k003000, out.remove()));
5436-
assertEquals("hh 'mm ss' BBBB | 00:30:00", "12 mm ss at night",
5436+
assertEquals("hh 'mm ss' BBBB | 00:30:00", "12 mm ss in the morning",
54375437
sdf.format(k003000, out.remove()));
54385438
assertEquals("hh 'mm ss' BBBB | 06:30:00", "06 mm ss in the morning",
54395439
sdf.format(k063000, out.remove()));
@@ -5454,28 +5454,28 @@ void DateFormatTest::TestMinuteSecondFieldsInOddPlaces() {
54545454

54555455
// assertEquals("BBBB hh:mm:ss | 00:00:00", "midnight 12:00:00",
54565456
// sdf.format(k000000, out.remove()));
5457-
assertEquals("BBBB hh:mm:ss | 00:00:00", "at night 12:00:00",
5457+
assertEquals("BBBB hh:mm:ss | 00:00:00", "in the morning 12:00:00",
54585458
sdf.format(k000000, out.remove()));
5459-
assertEquals("BBBB hh:mm:ss | 00:00:30", "at night 12:00:30",
5459+
assertEquals("BBBB hh:mm:ss | 00:00:30", "in the morning 12:00:30",
54605460
sdf.format(k000030, out.remove()));
5461-
assertEquals("BBBB hh:mm:ss | 00:30:00", "at night 12:30:00",
5461+
assertEquals("BBBB hh:mm:ss | 00:30:00", "in the morning 12:30:00",
54625462
sdf.format(k003000, out.remove()));
54635463

54645464
// Confirm applyPattern() reparses the pattern string.
54655465
sdf.applyPattern(UnicodeString("BBBB hh"));
54665466
// assertEquals("BBBB hh | 00:00:30", "midnight 12",
54675467
// sdf.format(k000030, out.remove()));
5468-
assertEquals("BBBB hh | 00:00:30", "at night 12",
5468+
assertEquals("BBBB hh | 00:00:30", "in the morning 12",
54695469
sdf.format(k000030, out.remove()));
54705470

54715471
sdf.applyPattern(UnicodeString("BBBB hh:mm:'ss'"));
54725472
// assertEquals("BBBB hh:mm:'ss' | 00:00:30", "midnight 12:00:ss",
54735473
// sdf.format(k000030, out.remove()));
5474-
assertEquals F438 ("BBBB hh | 00:00:30", "at night 12:00:ss",
5474+
assertEquals("BBBB hh | 00:00:30", "in the morning 12:00:ss",
54755475
sdf.format(k000030, out.remove()));
54765476

54775477
sdf.applyPattern(UnicodeString("BBBB hh:mm:ss"));
5478-
assertEquals("BBBB hh:mm:ss | 00:00:30", "at night 12:00:30",
5478+
assertEquals("BBBB hh:mm:ss | 00:00:30", "in the morning 12:00:30",
54795479
sdf.format(k000030, out.remove()));
54805480
}
54815481

@@ -5495,6 +5495,7 @@ void DateFormatTest::TestDayPeriodParsing() {
54955495
UDate k193000 = 1447443000000.0;
54965496
UDate k200000 = 1447444800000.0;
54975497
UDate k210000 = 1447448400000.0;
5498+
UDate k223000 = 1447453800000.0;
54985499

54995500
UErrorCode errorCode = U_ZERO_ERROR;
55005501
SimpleDateFormat sdf(UnicodeString(), errorCode);
@@ -5518,16 +5519,16 @@ void DateFormatTest::TestDayPeriodParsing() {
55185519
assertEquals("yyyy-MM-dd B | 2015-11-13 in the evening",
55195520
k193000, sdf.parse(UnicodeString("2015-11-13 in the evening"), errorCode));
55205521
assertEquals("yyyy-MM-dd B | 2015-11-13 at night",
5521-
k013000, sdf.parse(UnicodeString("2015-11-13 at night"), errorCode));
5522+
k223000, sdf.parse(UnicodeString("2015-11-13 at night"), errorCode));
55225523

55235524
// If time and day period are consistent with each other then time is parsed accordingly.
55245525
sdf.applyPattern(UnicodeString("yyyy-MM-dd hh:mm B"));
55255526
assertEquals("yyyy-MM-dd hh:mm B | 2015-11-13 12:00 midnight",
55265527
k000000, sdf.parse(UnicodeString("2015-11-13 12:00 midnight"), errorCode));
55275528
assertEquals("yyyy-MM-dd hh:mm B | 2015-11-13 12:00 noon",
55285529
k120000, sdf.parse(UnicodeString("2015-11-13 12:00 noon"), errorCode));
5529-
assertEquals("yyyy-MM-dd hh:mm B | 2015-11-13 01:00 at night",
5530-
k010000, sdf.parse(UnicodeString("2015-11-13 01:00 at night"), errorCode));
5530+
assertEquals("yyyy-MM-dd hh:mm B | 2015-11-13 01:00 in the morning",
5531+
k010000, sdf.parse(UnicodeString("2015-11-13 01:00 in the morning"), errorCode));
55315532
assertEquals("yyyy-MM-dd hh:mm B | 2015-11-13 01:00 in the afternoon",
55325533
k130000, sdf.parse(UnicodeString("2015-11-13 01:00 in the afternoon"), errorCode));
55335534
assertEquals("yyyy-MM-dd hh:mm B | 2015-11-13 09:00 in the morning",
@@ -5581,8 +5582,8 @@ void DateFormatTest::TestDayPeriodParsing() {
55815582
k000000, sdf.parse(UnicodeString("2015-11-13 12:00 midnight"), errorCode));
55825583
assertEquals("yyyy-MM-dd HH:mm B | 2015-11-13 12:00 noon",
55835584
k120000, sdf.parse(UnicodeString("2015-11-13 12:00 noon"), errorCode));
5584-
assertEquals("yyyy-MM-dd HH:mm B | 2015-11-13 01:00 at night",
5585-
k010000, sdf.parse(UnicodeString("2015-11-13 01:00 at night"), errorCode));
5585+
assertEquals("yyyy-MM-dd HH:mm B | 2015-11-13 01:00 in the morning",
5586+
k010000, sdf.parse(UnicodeString("2015-11-13 01:00 in the morning"), errorCode));
55865587
assertEquals("yyyy-MM-dd HH:mm B | 2015-11-13 01:00 in the afternoon",
55875588
k130000, sdf.parse(UnicodeString("2015-11-13 01:00 in the afternoon"), errorCode));
55885589
assertEquals("yyyy-MM-dd HH:mm B | 2015-11-13 09:00 in the morning",

‎icu4c/source/test/intltest/dtifmtts.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@ void DateIntervalFormatTest::testHourMetacharacters() {
11491149
"en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 12:00:00", "hbbbbb", "10\\u202Fa\\u2009\\u2013\\u200912\\u202Fn",
11501150
"en", "CE 2010 09 27 13:00:00", "CE 2010 09 27 14:00:00", "hb", "1\\u2009\\u2013\\u20092\\u202FPM",
11511151
"en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "hB", "10 in the morning\\u2009\\u2013\\u20091 in the afternoon",
1152-
"en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hB", "12\\u2009\\u2013\\u20091 at night",
1152+
"en", "CE 2010 09 27 00:00:00", "CE 2010 09 27 01:00:00", "hB", "12\\u2009\\u2013\\u20091 in the morning",
11531153

11541154
// J
11551155
"en", "CE 2010 09 27 10:00:00", "CE 2010 09 27 13:00:00", "J", "10\\u2009\\u2013\\u20091",

‎icu4c/source/test/testdata/cldr/localeIdentifiers/likelySubtags.txt

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -235,16 +235,19 @@ en-CK ; en-Latn-CK ; en-CK ;
235235
en-CM ; en-Latn-CM ; en-CM ;
236236
en-CX ; en-Latn-CX ; en-CX ;
237237
en-CY ; en-Latn-CY ; en-CY ;
238+
en-CZ ; en-Latn-CZ ; en-CZ ;
238239
en-DE ; en-Latn-DE ; en-DE ;
239240
en-DG ; en-Latn-DG ; en-DG ;
240241
en-DK ; en-Latn-DK ; en-DK ;
241242
en-DM ; en-Latn-DM ; en-DM ;
242243
en-ER ; en-Latn-ER ; en-ER ;
244+
en-ES ; en-Latn-ES ; en-ES ;
243245
en-Egyp ; en-Egyp-US ; en-Egyp ;
244246
en-FI ; en-Latn-FI ; en-FI ;
245247
en-FJ ; en-Latn-FJ ; en-FJ ;
246248
en-FK ; en-Latn-FK ; en-FK ;
247249
en-FM ; en-Latn-FM ; en-FM ;
250+
en-FR ; en-Latn-FR ; en-FR ;
248251
en-GB ; en-Latn-GB ; en-GB ;
249252
en-GD ; en-Latn-GD ; en-GD ;
250253
en-GG ; en-Latn-GG ; en-GG ;
@@ -255,12 +258,14 @@ en-GS ; en-Latn-GS ; en-GS ;
255258
en-GU ; en-Latn-GU ; en-GU ;
256259
en-GY ; en-Latn-GY ; en-GY ;
257260
en-HK ; en-Latn-HK ; en-HK ;
261+
en-HU ; en-Latn-HU ; en-HU ;
258262
en-ID ; en-Latn-ID ; en-ID ;
259263
en-IE ; en-Latn-IE ; en-IE ;
260264
en-IL ; en-Latn-IL ; en-IL ;
261265
en-IM ; en-Latn-IM ; en-IM ;
262266
en-IN ; en-Latn-IN ; en-IN ;
263267
en-IO ; en-Latn-IO ; en-IO ;
268+
en-IT ; en-Latn-IT ; en-IT ;
264269
en-JE ; en-Latn-JE ; en-JE ;
265270
en-JM ; en-Latn-JM ; en-JM ;
266271
en-KE ; en-Latn-KE ; en-KE ;
@@ -285,15 +290,19 @@ en-NA ; en-Latn-NA ; en-NA ;
285290
en-NF ; en-Latn-NF ; en-NF ;
286291
en-NG ; en-Latn-NG ; en-NG ;
287292
en-NL ; en-Latn-NL ; en-NL ;
293+
en-NO ; en-Latn-NO ; en-NO ;
288294
en-NR ; en-Latn-NR ; en-NR ;
289295
en-NU ; en-Latn-NU ; en-NU ;
290296
en-NZ ; en-Latn-NZ ; en-NZ ;
291297
en-PG ; en-Latn-PG ; en-PG ;
292298
en-PH ; en-Latn-PH ; en-PH ;
293299
en-PK ; en-Latn-PK ; en-PK ;
300+
en-PL ; en-Latn-PL ; en-PL ;
294301
en-PN ; en-Latn-PN ; en-PN ;
295302
en-PR ; en-Latn-PR ; en-PR ;
303+
en-PT ; en-Latn-PT ; en-PT ;
296304
en-PW ; en-Latn-PW ; en-PW ;
305+
en-RO ; en-Latn-RO ; en-RO ;
297306
en-RW ; en-Latn-RW ; en-RW ;
298307
en-SB ; en-Latn-SB ; en-SB ;
299308
en-SC ; en-Latn-SC ; en-SC ;
@@ -302,6 +311,7 @@ en-SE ; en-Latn-SE ; en-SE ;
302311
en-SG ; en-Latn-SG ; en-SG ;
303312
en-SH ; en-Latn-SH ; en-SH ;
304313
en-SI ; en-Latn-SI ; en-SI ;
314+
en-SK ; en-Latn-SK ; en-SK ;
305315
en-SL ; en-Latn-SL ; en-SL ;
306316
en-SS ; en-Latn-SS ; en-SS ;
307317
en-SX ; en-Latn-SX ; en-SX ;
@@ -802,11 +812,6 @@ pl-AQ ; pl-Latn-AQ ; pl-AQ ;
802812
pl-Egyp ; pl-Egyp-PL ; pl-Egyp ;
803813
pl-Latn ; pl-Latn-PL ; pl ;
804814
pl-PL ; pl-Latn-PL ; pl ;
805-
prg ; prg-Latn-PL ; prg ;
806-
prg-AQ ; prg-Latn-AQ ; prg-AQ ;
807-
prg-Egyp ; prg-Egyp-PL ; prg-Egyp ;
808-
prg-Latn ; prg-Latn-PL ; prg ;
809-
prg-PL ; prg-Latn-PL ; prg ;
810815
ps ; ps-Arab-AF ; ps ;
811816
ps-AF ; ps-Arab-AF ; ps ;
812817
ps-AQ ; ps-Arab-AQ ; ps-AQ ;
@@ -1575,9 +1580,9 @@ und-NP ; ne-Deva-NP ; ne ;
15751580
und-NR ; en-Latn-NR ; en-NR ;
15761581
und-NU ; en-Latn-NU ; en-NU ;
15771582
und-NZ ; en-Latn-NZ ; en-NZ ;
1578-
und-Nkoo ; man-Nkoo-GN ; man-Nkoo ; man-GN
1583+
und-Nkoo ; man-Nkoo-GN ; man-Nkoo ;
15791584
und-Nkoo-AQ ; man-Nkoo-AQ ; ;
1580-
und-Nkoo-GN ; man-Nkoo-GN ; man-Nkoo ; man-GN
1585+
und-Nkoo-GN ; man-Nkoo-GN ; man-Nkoo ;
15811586
und-OM ; ar-Arab-OM ; ar-OM ;
15821587
und-Olck ; sat-Olck-IN ; sat ;
15831588
und-Olck-AQ ; sat-Olck-AQ ; sat-AQ ;

‎icu4c/source/test/testdata/cldr/localeIdentifiers/localeCanonicalization.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# DO NOT EDIT THIS FILE, instead regenerate it using GenerateLocaleIDTestData.java
12
# Test data for locale identifier canonicalization
23
# Copyright © 1991-2025 Unicode, Inc.
34
# For terms of use, see http://www.unicode.org/copyright.html

0 commit comments

Comments
 (0)
0