From: yumaoka Date: Thu, 15 Sep 2022 22:42:50 +0000 (-0400) Subject: ICU-22151 Update timezone-region supplementation mapping data for Jan Mayen and some... X-Git-Tag: release-72-rc~16 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17435c4533c173b228d60e47413f35c1c6a9d748;p=icu ICU-22151 Update timezone-region supplementation mapping data for Jan Mayen and some others --- diff --git a/icu4c/source/data/misc/zoneinfo64.txt b/icu4c/source/data/misc/zoneinfo64.txt index bb7acc0012c..a91dd11a0d0 100644 --- a/icu4c/source/data/misc/zoneinfo64.txt +++ b/icu4c/source/data/misc/zoneinfo64.txt @@ -3,7 +3,7 @@ // License & terms of use: http://www.unicode.org/copyright.html //--------------------------------------------------------- // Build tool: tz2icu -// Build date: Thu Aug 18 04:47:36 2022 +// Build date: Thu Sep 15 17:54:12 2022 // tz database: ftp://ftp.iana.org/tz/ // tz version: 2022b // ICU version: 72.0.1 @@ -3036,7 +3036,7 @@ zoneinfo64:table(nofallback) { "BF", //Z#52 Africa/Ouagadougou "BJ", //Z#53 Africa/Porto-Novo "ST", //Z#54 Africa/Sao_Tome - "CI", //Z#55 Africa/Timbuktu + "ML", //Z#55 Africa/Timbuktu "LY", //Z#56 Africa/Tripoli "TN", //Z#57 Africa/Tunis "NA", //Z#58 Africa/Windhoek @@ -3215,7 +3215,7 @@ zoneinfo64:table(nofallback) { "AQ", //Z#231 Antarctica/McMurdo "AQ", //Z#232 Antarctica/Palmer "AQ", //Z#233 Antarctica/Rothera - "NZ", //Z#234 Antarctica/South_Pole + "AQ", //Z#234 Antarctica/South_Pole "AQ", //Z#235 Antarctica/Syowa "AQ", //Z#236 Antarctica/Troll "AQ", //Z#237 Antarctica/Vostok @@ -3325,7 +3325,7 @@ zoneinfo64:table(nofallback) { "CV", //Z#341 Atlantic/Cape_Verde "FO", //Z#342 Atlantic/Faeroe "FO", //Z#343 Atlantic/Faroe - "DE", //Z#344 Atlantic/Jan_Mayen + "SJ", //Z#344 Atlantic/Jan_Mayen "PT", //Z#345 Atlantic/Madeira "IS", //Z#346 Atlantic/Reykjavik "GS", //Z#347 Atlantic/South_Georgia @@ -3566,7 +3566,7 @@ zoneinfo64:table(nofallback) { "PW", //Z#582 Pacific/Palau "PN", //Z#583 Pacific/Pitcairn "FM", //Z#584 Pacific/Pohnpei - "SB", //Z#585 Pacific/Ponape + "FM", //Z#585 Pacific/Ponape "PG", //Z#586 Pacific/Port_Moresby "CK", //Z#587 Pacific/Rarotonga "MP", //Z#588 Pacific/Saipan @@ -3574,10 +3574,10 @@ zoneinfo64:table(nofallback) { "PF", //Z#590 Pacific/Tahiti "KI", //Z#591 Pacific/Tarawa "TO", //Z#592 Pacific/Tongatapu - "PG", //Z#593 Pacific/Truk + "FM", //Z#593 Pacific/Truk "UM", //Z#594 Pacific/Wake "WF", //Z#595 Pacific/Wallis - "PG", //Z#596 Pacific/Yap + "FM", //Z#596 Pacific/Yap "PL", //Z#597 Poland "PT", //Z#598 Portugal "TW", //Z#599 ROC diff --git a/icu4c/source/test/intltest/tztest.cpp b/icu4c/source/test/intltest/tztest.cpp index b3b5d305529..8a7d3dd8c40 100644 --- a/icu4c/source/test/intltest/tztest.cpp +++ b/icu4c/source/test/intltest/tztest.cpp @@ -2423,6 +2423,8 @@ void TimeZoneTest::TestGetRegion() {"Asia/Riyadh", "SA"}, // tz file solar87 was removed from tzdata2013i // {"Asia/Riyadh87", "001"}, // this should be "SA" actually, but not in zone.tab + {"Atlantic/Jan_Mayen", "SJ"}, + {"Pacific/Truk", "FM"}, {"Etc/Unknown", 0}, // CLDR canonical, but not a sysmte zone ID {"bogus", 0}, // bogus {"GMT+08:00", 0}, // a custom ID, not a system zone ID diff --git a/icu4c/source/tools/tzcode/icuregions b/icu4c/source/tools/tzcode/icuregions index c3c138a1228..ed9dfe534cc 100644 --- a/icu4c/source/tools/tzcode/icuregions +++ b/icu4c/source/tools/tzcode/icuregions @@ -10,9 +10,15 @@ # # Africa/Asmera ER +Africa/Timbuktu ML America/Coral_Harbour CA America/Montreal CA America/Virgin VI +Antarctica/South_Pole AQ +Atlantic/Jan_Mayen SJ Europe/Simferopol UA Pacific/Johnston UM +Pacific/Ponape FM +Pacific/Truk FM +Pacific/Yap FM diff --git a/icu4j/main/shared/data/icutzdata.jar b/icu4j/main/shared/data/icutzdata.jar index 918a18922d1..292c31eb2c1 100644 --- a/icu4j/main/shared/data/icutzdata.jar +++ b/icu4j/main/shared/data/icutzdata.jar @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5a14ed048e544ba57e9ff3d2a7424ce978ef45da895c4c75568e2809c5133403 -size 93663 +oid sha256:43439de857605f4c5b84d73891bb2d0ede88866bf93db98bdf1e7638e3849bbf +size 93667 diff --git a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java index 9d6df9e4454..c216c202a1c 100644 --- a/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java +++ b/icu4j/main/tests/core/src/com/ibm/icu/dev/test/timezone/TimeZoneTest.java @@ -1899,6 +1899,8 @@ public class TimeZoneTest extends TestFmwk {"Asia/Riyadh", "SA"}, // tz file solar87 was removed from tzdata2013i // {"Asia/Riyadh87", "001"}, // this should be "SA" actually, but not in zone.tab + {"Atlantic/Jan_Mayen", "SJ"}, + {"Pacific/Truk", "FM"}, {"Etc/Unknown", null}, // CLDR canonical, but not a sysmte zone ID {"bogus", null}, // bogus {"GMT+08:00", null}, // a custom ID, not a system zone ID