diff options
| author | Almaz Mingaleev <mingaleev@google.com> | 2024-01-16 11:40:09 +0000 |
|---|---|---|
| committer | Almaz Mingaleev <mingaleev@google.com> | 2024-01-29 14:30:23 +0000 |
| commit | 51dc01d96da42b90a48a1509754ccf8156033295 (patch) | |
| tree | 7c0ffa6b3c1e58ff760234c1f3a6d54e734ffd5d | |
| parent | 55e9d168c69272c2245489d9b14e945586f2be19 (diff) | |
| download | cldr-51dc01d96da42b90a48a1509754ccf8156033295.tar.gz | |
Update Android CLDR data from 2023a to 2023d.
CLDR-17295 tz2023d commit was cherry-picked partially:
* Translations removals in common/main were skipped.
CLDR-16450 and CLDR-14453 are also cherry-picked partially:
* Only timezone.xml and .dtd changes are taken.
Changes in metazones are delayed follow-up with deprecations done in
previous TZDB releases:
* Europe/Uzhgorod and Europe/Zaporozhye are aliases of Europe/Kyiv
* Pacific/Johnston is an alias to Pacific/Honolulu
* America/Santa_Isabel is an alias to America/Tijuana
* America/Yellowknife is an alias to America/Edmonton
* America/Rainy_River is an alias to America/Winnipeg
* America/Montreal, America/Nipigon, America/Pangnirtung,
America/Thunder_Bay, and Australia/Currie were also deprecated
Bug: 318333787
Test: see system/timezone
CLDR-17295 tz2023d updates and deprecated zone/metazone cleanup
(cherry picked from commit 2bbdb3de2a0985261ec31d0864f08ab82eaa9617)
CLDR-16386 Update windowsZones.xml for 2022g Mexican time zones
(cherry picked from commit e9121e36502f79497af46c6a8a73cf3bae141ff1)
CLDR-16489 Fix Montreal time zone
(cherry picked from commit 2d96a5a49600acc852460310c9a4e34e1a06a15f)
CLDR-16450 bcp47: Add missing since= attributes, update currency descriptions
(cherry picked from commit e352192259ccbacf309b935e0f70ba53f081a02d)
CLDR-14453 Adding IANA zone.tab mapping in timezone.xml
(cherry picked from commit c25cebc09b0372e8a31bfc6c7d10221e4faaed78)
Change-Id: I7b4e7118c3b9ca8c9d88b126b9addc51a263df3a
Merged-In: I7b4e7118c3b9ca8c9d88b126b9addc51a263df3a
19 files changed, 605 insertions, 272 deletions
diff --git a/common/bcp47/timezone.xml b/common/bcp47/timezone.xml index eeeed2cc..14bd417b 100644 --- a/common/bcp47/timezone.xml +++ b/common/bcp47/timezone.xml @@ -30,13 +30,13 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="aqsyw" description="Syowa Station, East Ongul Island" alias="Antarctica/Syowa"/> <type name="aqtrl" description="Troll Station, Queen Maud Land" alias="Antarctica/Troll" since="26"/> <type name="aqvos" description="Vostok Station, Lake Vostok" alias="Antarctica/Vostok"/> - <type name="arbue" description="Buenos Aires, Argentina" alias="America/Buenos_Aires America/Argentina/Buenos_Aires"/> - <type name="arcor" description="Córdoba, Argentina" alias="America/Cordoba America/Argentina/Cordoba America/Rosario"/> - <type name="arctc" description="Catamarca, Argentina" alias="America/Catamarca America/Argentina/Catamarca America/Argentina/ComodRivadavia"/> + <type name="arbue" description="Buenos Aires, Argentina" alias="America/Buenos_Aires America/Argentina/Buenos_Aires" iana="America/Argentina/Buenos_Aires"/> + <type name="arcor" description="Córdoba, Argentina" alias="America/Cordoba America/Argentina/Cordoba America/Rosario" iana="America/Argentina/Cordoba"/> + <type name="arctc" description="Catamarca, Argentina" alias="America/Catamarca America/Argentina/Catamarca America/Argentina/ComodRivadavia" iana="America/Argentina/Catamarca"/> <type name="arirj" description="La Rioja, Argentina" alias="America/Argentina/La_Rioja"/> - <type name="arjuj" description="Jujuy, Argentina" alias="America/Jujuy America/Argentina/Jujuy"/> + <type name="arjuj" description="Jujuy, Argentina" alias="America/Jujuy America/Argentina/Jujuy" iana="America/Argentina/Jujuy"/> <type name="arluq" description="San Luis, Argentina" alias="America/Argentina/San_Luis"/> - <type name="armdz" description="Mendoza, Argentina" alias="America/Mendoza America/Argentina/Mendoza"/> + <type name="armdz" description="Mendoza, Argentina" alias="America/Mendoza America/Argentina/Mendoza" iana="America/Argentina/Mendoza"/> <type name="arrgl" description="Río Gallegos, Argentina" alias="America/Argentina/Rio_Gallegos"/> <type name="arsla" description="Salta, Argentina" alias="America/Argentina/Salta"/> <type name="artuc" description="Tucumán, Argentina" alias="America/Argentina/Tucuman"/> @@ -49,8 +49,8 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="aubne" description="Brisbane, Australia" alias="Australia/Brisbane Australia/Queensland"/> <type name="audrw" description="Darwin, Australia" alias="Australia/Darwin Australia/North"/> <type name="aueuc" description="Eucla, Australia" alias="Australia/Eucla"/> - <type name="auhba" description="Hobart, Australia" alias="Australia/Hobart Australia/Tasmania"/> - <type name="aukns" description="Currie, Australia" alias="Australia/Currie"/> + <type name="auhba" description="Hobart, Australia" alias="Australia/Hobart Australia/Tasmania Australia/Currie"/> + <type name="aukns" description="Currie, Australia" deprecated="true" preferred="auhba"/> <type name="auldc" description="Lindeman Island, Australia" alias="Australia/Lindeman"/> <type name="auldh" description="Lord Howe Island, Australia" alias="Australia/Lord_Howe Australia/LHI"/> <type name="aumel" description="Melbourne, Australia" alias="Australia/Melbourne Australia/Victoria"/> @@ -94,24 +94,24 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="bymsq" description="Minsk, Belarus" alias="Europe/Minsk"/> <type name="bzbze" description="Belize" alias="America/Belize"/> <type name="cacfq" description="Creston, Canada" alias="America/Creston" since="21.0.1"/> - <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain"/> - <type name="caffs" description="Rainy River, Canada" alias="America/Rainy_River"/> - <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson"/> + <type name="caedm" description="Edmonton, Canada" alias="America/Edmonton Canada/Mountain America/Yellowknife"/> + <type name="caffs" description="Rainy River, Canada" deprecated="true" preferred="cawnp"/> + <type name="cafne" description="Fort Nelson, Canada" alias="America/Fort_Nelson" since="29"/> <type name="caglb" description="Glace Bay, Canada" alias="America/Glace_Bay"/> <type name="cagoo" description="Goose Bay, Canada" alias="America/Goose_Bay"/> <type name="cahal" description="Halifax, Canada" alias="America/Halifax Canada/Atlantic"/> - <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit"/> + <type name="caiql" description="Iqaluit, Canada" alias="America/Iqaluit America/Pangnirtung"/> <type name="camon" description="Moncton, Canada" alias="America/Moncton"/> - <type name="camtr" description="Montreal, Canada" deprecated="true" alias="America/Montreal"/> - <type name="capnt" description="Pangnirtung, Canada" alias="America/Pangnirtung"/> + <type name="camtr" description="Montreal, Canada" deprecated="true" preferred="cator"/> + <type name="capnt" description="Pangnirtung, Canada" deprecated="true" preferred="caiql"/> <type name="careb" description="Resolute, Canada" alias="America/Resolute"/> <type name="careg" description="Regina, Canada" alias="America/Regina Canada/East-Saskatchewan Canada/Saskatchewan"/> <type name="casjf" description="St. John's, Canada" alias="America/St_Johns Canada/Newfoundland"/> - <type name="canpg" description="Nipigon, Canada" alias="America/Nipigon"/> - <type name="cathu" description="Thunder Bay, Canada" alias="America/Thunder_Bay"/> - <type name="cator" description="Toronto, Canada" alias="America/Toronto Canada/Eastern"/> + <type name="canpg" description="Nipigon, Canada" deprecated="true" preferred="cator"/> + <type name="cathu" description="Thunder Bay, Canada" deprecated="true" preferred="cator"/> + <type name="cator" description="Toronto, Canada" alias="America/Toronto America/Montreal Canada/Eastern America/Nipigon America/Thunder_Bay"/> <type name="cavan" description="Vancouver, Canada" alias="America/Vancouver Canada/Pacific"/> - <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central"/> + <type name="cawnp" description="Winnipeg, Canada" alias="America/Winnipeg Canada/Central America/Rainy_River"/> <type name="caybx" description="Blanc-Sablon, Canada" alias="America/Blanc-Sablon"/> <type name="caycb" description="Cambridge Bay, Canada" alias="America/Cambridge_Bay"/> <type name="cayda" description="Dawson, Canada" alias="America/Dawson"/> @@ -120,8 +120,8 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="cayev" description="Inuvik, Canada" alias="America/Inuvik"/> <type name="cayxy" description="Whitehorse, Canada" alias="America/Whitehorse Canada/Yukon"/> <type name="cayyn" description="Swift Current, Canada" alias="America/Swift_Current"/> - <type name="cayzf" description="Yellowknife, Canada" alias="America/Yellowknife"/> - <type name="cayzs" description="Atikokan, Canada" alias="America/Coral_Harbour America/Atikokan"/> + <type name="cayzf" description="Yellowknife, Canada" deprecated="true" preferred="caedm"/> + <type name="cayzs" description="Atikokan, Canada" alias="America/Coral_Harbour America/Atikokan" iana="America/Atikokan"/> <type name="cccck" description="Cocos (Keeling) Islands" alias="Indian/Cocos"/> <type name="cdfbm" description="Lubumbashi, Democratic Republic of the Congo" alias="Africa/Lubumbashi"/> <type name="cdfih" description="Kinshasa, Democratic Republic of the Congo" alias="Africa/Kinshasa"/> @@ -160,7 +160,7 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="eetll" description="Tallinn, Estonia" alias="Europe/Tallinn"/> <type name="egcai" description="Cairo, Egypt" alias="Africa/Cairo Egypt"/> <type name="eheai" description="El Aaiún, Western Sahara" alias="Africa/El_Aaiun"/> - <type name="erasm" description="Asmara, Eritrea" alias="Africa/Asmera Africa/Asmara"/> + <type name="erasm" description="Asmara, Eritrea" alias="Africa/Asmera Africa/Asmara" iana="Africa/Asmara"/> <type name="esceu" description="Ceuta, Spain" alias="Africa/Ceuta"/> <type name="eslpa" description="Canary Islands, Spain" alias="Atlantic/Canary"/> <type name="esmad" description="Madrid, Spain" alias="Europe/Madrid"/> @@ -171,13 +171,13 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="fjsuv" description="Fiji" alias="Pacific/Fiji"/> <type name="fkpsy" description="Stanley, Falkland Islands" alias="Atlantic/Stanley"/> <type name="fmksa" description="Kosrae, Micronesia" alias="Pacific/Kosrae"/> - <type name="fmpni" description="Pohnpei, Micronesia" alias="Pacific/Ponape Pacific/Pohnpei"/> - <type name="fmtkk" description="Chuuk, Micronesia" alias="Pacific/Truk Pacific/Chuuk Pacific/Yap"/> - <type name="fotho" description="Faroe Islands" alias="Atlantic/Faeroe Atlantic/Faroe"/> + <type name="fmpni" description="Pohnpei, Micronesia" alias="Pacific/Ponape Pacific/Pohnpei" iana="Pacific/Pohnpei"/> + <type name="fmtkk" description="Chuuk, Micronesia" alias="Pacific/Truk Pacific/Chuuk Pacific/Yap" iana="Pacific/Chuuk"/> + <type name="fotho" description="Faroe Islands" alias="Atlantic/Faeroe Atlantic/Faroe" iana="Atlantic/Faroe"/> <type name="frpar" description="Paris, France" alias="Europe/Paris"/> <type name="galbv" description="Libreville, Gabon" alias="Africa/Libreville"/> <type name="gaza" description="Gaza Strip, Palestinian Territories" deprecated="true" preferred="gazastrp"/> - <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza"/> + <type name="gazastrp" description="Gaza Strip, Palestinian Territories" alias="Asia/Gaza" since="40"/> <type name="gblon" description="London, United Kingdom" alias="Europe/London Europe/Belfast GB GB-Eire"/> <type name="gdgnd" description="Grenada" alias="America/Grenada"/> <type name="getbs" description="Tbilisi, Georgia" alias="Asia/Tbilisi"/> @@ -186,11 +186,11 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="ghacc" description="Accra, Ghana" alias="Africa/Accra"/> <type name="gigib" description="Gibraltar" alias="Europe/Gibraltar"/> <type name="gldkshvn" description="Danmarkshavn, Greenland" alias="America/Danmarkshavn"/> - <type name="glgoh" description="Nuuk (Godthåb), Greenland" alias="America/Godthab America/Nuuk"/> + <type name="glgoh" description="Nuuk (Godthåb), Greenland" alias="America/Godthab America/Nuuk" iana="America/Nuuk"/> <type name="globy" description="Ittoqqortoormiit (Scoresbysund), Greenland" alias="America/Scoresbysund"/> <type name="glthu" description="Qaanaaq (Thule), Greenland" alias="America/Thule"/> <type name="gmbjl" description="Banjul, Gambia" alias="Africa/Banjul"/> - <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich"/> + <type name="gmt" description="Greenwich Mean Time" alias="Etc/GMT Etc/GMT+0 Etc/GMT-0 Etc/GMT0 Etc/Greenwich GMT GMT+0 GMT-0 GMT0 Greenwich" since="31"/> <type name="gncky" description="Conakry, Guinea" alias="Africa/Conakry"/> <type name="gpbbr" description="Guadeloupe" alias="America/Guadeloupe"/> <type name="gpmsb" description="Marigot, Saint Martin" alias="America/Marigot"/> @@ -214,7 +214,7 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="idpnk" description="Pontianak, Indonesia" alias="Asia/Pontianak"/> <type name="iedub" description="Dublin, Ireland" alias="Europe/Dublin Eire"/> <type name="imdgs" description="Isle of Man" alias="Europe/Isle_of_Man"/> - <type name="inccu" description="Kolkata, India" alias="Asia/Calcutta Asia/Kolkata"/> + <type name="inccu" description="Kolkata, India" alias="Asia/Calcutta Asia/Kolkata" iana="Asia/Kolkata"/> <type name="iodga" description="Chagos Archipelago" alias="Indian/Chagos"/> <type name="iqbgw" description="Baghdad, Iraq" alias="Asia/Baghdad"/> <type name="irthr" description="Tehran, Iran" alias="Asia/Tehran Iran"/> @@ -229,7 +229,7 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="kgfru" description="Bishkek, Kyrgyzstan" alias="Asia/Bishkek"/> <type name="khpnh" description="Phnom Penh, Cambodia" alias="Asia/Phnom_Penh"/> <type name="kicxi" description="Kiritimati, Kiribati" alias="Pacific/Kiritimati"/> - <type name="kipho" description="Enderbury Island, Kiribati" alias="Pacific/Enderbury Pacific/Kanton"/> + <type name="kipho" description="Enderbury Island, Kiribati" alias="Pacific/Enderbury Pacific/Kanton" iana="Pacific/Kanton"/> <type name="kitrw" description="Tarawa, Kiribati" alias="Pacific/Tarawa"/> <type name="kmyva" description="Comoros" alias="Indian/Comoro"/> <type name="knbas" description="Saint Kitts" alias="America/St_Kitts"/> @@ -264,7 +264,7 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="mhmaj" description="Majuro, Marshall Islands" alias="Pacific/Majuro"/> <type name="mkskp" description="Skopje, Macedonia" alias="Europe/Skopje"/> <type name="mlbko" description="Bamako, Mali" alias="Africa/Bamako Africa/Timbuktu"/> - <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon Asia/Yangon"/> + <type name="mmrgn" description="Yangon (Rangoon), Burma" alias="Asia/Rangoon Asia/Yangon" iana="Asia/Yangon"/> <type name="mncoq" description="Choibalsan, Mongolia" alias="Asia/Choibalsan"/> <type name="mnhvd" description="Khovd (Hovd), Mongolia" alias="Asia/Hovd"/> <type name="mnuln" description="Ulaanbaatar (Ulan Bator), Mongolia" alias="Asia/Ulaanbaatar Asia/Ulan_Bator"/> @@ -289,8 +289,8 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="mxmzt" description="Mazatlán, Mexico" alias="America/Mazatlan Mexico/BajaSur"/> <type name="mxoji" description="Ojinaga, Mexico" alias="America/Ojinaga"/> <type name="mxpvr" description="Bahía de Banderas, Mexico" alias="America/Bahia_Banderas" since="1.9"/> - <type name="mxstis" description="Santa Isabel (Baja California), Mexico" alias="America/Santa_Isabel"/> - <type name="mxtij" description="Tijuana, Mexico" alias="America/Tijuana America/Ensenada Mexico/BajaNorte"/> + <type name="mxstis" description="Santa Isabel (Baja California), Mexico" deprecated="true" preferred="mxtij"/> + <type name="mxtij" description="Tijuana, Mexico" alias="America/Tijuana America/Ensenada Mexico/BajaNorte America/Santa_Isabel"/> <type name="mykch" description="Kuching, Malaysia" alias="Asia/Kuching"/> <type name="mykul" description="Kuala Lumpur, Malaysia" alias="Asia/Kuala_Lumpur"/> <type name="mzmpm" description="Maputo, Mozambique" alias="Africa/Maputo"/> @@ -302,7 +302,7 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="nimga" description="Managua, Nicaragua" alias="America/Managua"/> <type name="nlams" description="Amsterdam, Netherlands" alias="Europe/Amsterdam"/> <type name="noosl" description="Oslo, Norway" alias="Europe/Oslo"/> - <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu"/> + <type name="npktm" description="Kathmandu, Nepal" alias="Asia/Katmandu Asia/Kathmandu" iana="Asia/Kathmandu"/> <type name="nrinu" description="Nauru" alias="Pacific/Nauru"/> <type name="nuiue" description="Niue" alias="Pacific/Niue"/> <type name="nzakl" description="Auckland, New Zealand" alias="Pacific/Auckland Antarctica/South_Pole NZ"/> @@ -395,13 +395,13 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="tvfun" description="Funafuti, Tuvalu" alias="Pacific/Funafuti"/> <type name="twtpe" description="Taipei, Taiwan" alias="Asia/Taipei ROC"/> <type name="tzdar" description="Dar es Salaam, Tanzania" alias="Africa/Dar_es_Salaam"/> - <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv"/> - <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" alias="Europe/Zaporozhye"/> + <type name="uaiev" description="Kyiv, Ukraine" alias="Europe/Kiev Europe/Kyiv Europe/Zaporozhye Europe/Uzhgorod" iana="Europe/Kyiv"/> + <type name="uaozh" description="Zaporizhia (Zaporozhye), Ukraine" deprecated="true" preferred="uaiev"/> <type name="uasip" description="Simferopol, Ukraine" alias="Europe/Simferopol"/> - <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" alias="Europe/Uzhgorod"/> + <type name="uauzh" description="Uzhhorod (Uzhgorod), Ukraine" deprecated="true" preferred="uaiev"/> <type name="ugkla" description="Kampala, Uganda" alias="Africa/Kampala"/> <type name="umawk" description="Wake Island, U.S. Minor Outlying Islands" alias="Pacific/Wake"/> - <type name="umjon" description="Johnston Atoll, U.S. Minor Outlying Islands" alias="Pacific/Johnston"/> + <type name="umjon" description="Johnston Atoll, U.S. Minor Outlying Islands" deprecated="true" preferred="ushnl"/> <type name="ummdy" description="Midway Islands, U.S. Minor Outlying Islands" alias="Pacific/Midway"/> <type name="unk" description="Unknown time zone" alias="Etc/Unknown"/> <type name="usadk" description="Adak (Alaska), United States" alias="America/Adak America/Atka US/Aleutian"/> @@ -411,13 +411,13 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="uschi" description="Chicago, United States" alias="America/Chicago US/Central"/> <type name="usden" description="Denver, United States" alias="America/Denver America/Shiprock Navajo US/Mountain"/> <type name="usdet" description="Detroit, United States" alias="America/Detroit US/Michigan"/> - <type name="ushnl" description="Honolulu, United States" alias="Pacific/Honolulu US/Hawaii"/> - <type name="usind" description="Indianapolis, United States" alias="America/Indianapolis America/Fort_Wayne America/Indiana/Indianapolis US/East-Indiana"/> + <type name="ushnl" description="Honolulu, United States" alias="Pacific/Honolulu US/Hawaii Pacific/Johnston"/> + <type name="usind" description="Indianapolis, United States" alias="America/Indianapolis America/Fort_Wayne America/Indiana/Indianapolis US/East-Indiana" iana="America/Indiana/Indianapolis"/> <type name="usinvev" description="Vevay (Indiana), United States" alias="America/Indiana/Vevay"/> <type name="usjnu" description="Juneau (Alaska), United States" alias="America/Juneau"/> <type name="usknx" description="Knox (Indiana), United States" alias="America/Indiana/Knox America/Knox_IN US/Indiana-Starke"/> <type name="uslax" description="Los Angeles, United States" alias="America/Los_Angeles US/Pacific US/Pacific-New"/> - <type name="uslui" description="Louisville (Kentucky), United States" alias="America/Louisville America/Kentucky/Louisville"/> + <type name="uslui" description="Louisville (Kentucky), United States" alias="America/Louisville America/Kentucky/Louisville" iana="America/Kentucky/Louisville"/> <type name="usmnm" description="Menominee (Michigan), United States" alias="America/Menominee"/> <type name="usmtm" description="Metlakatla (Alaska), United States" alias="America/Metlakatla" since="1.9.1"/> <type name="usmoc" description="Monticello (Kentucky), United States" alias="America/Kentucky/Monticello"/> @@ -469,7 +469,7 @@ For terms of use, see http://www.unicode.org/copyright.html <type name="veccs" description="Caracas, Venezuela" alias="America/Caracas"/> <type name="vgtov" description="Tortola, British Virgin Islands" alias="America/Tortola"/> <type name="vistt" description="Saint Thomas, U.S. Virgin Islands" alias="America/St_Thomas America/Virgin"/> - <type name="vnsgn" description="Ho Chi Minh City, Vietnam" alias="Asia/Saigon Asia/Ho_Chi_Minh"/> + <type name="vnsgn" description="Ho Chi Minh City, Vietnam" alias="Asia/Saigon Asia/Ho_Chi_Minh" iana="Asia/Ho_Chi_Minh"/> <type name="vuvli" description="Efate, Vanuatu" alias="Pacific/Efate"/> <type name="wfmau" description="Wallis Islands, Wallis and Futuna" alias="Pacific/Wallis"/> <type name="wsapw" description="Apia, Samoa" alias="Pacific/Apia"/> diff --git a/common/dtd/ldmlBCP47.dtd b/common/dtd/ldmlBCP47.dtd index b82183c1..5eaeff75 100644 --- a/common/dtd/ldmlBCP47.dtd +++ b/common/dtd/ldmlBCP47.dtd @@ -69,6 +69,9 @@ CLDR data files are interpreted according to the LDML specification (http://unic <!ATTLIST type since CDATA #IMPLIED > <!--@MATCH:version--> <!--@METADATA--> +<!ATTLIST type iana CDATA #IMPLIED > + <!--@MATCH:regex/^[A-Za-z]+(/[A-Za-z_\-]+)+$ --> + <!--@VALUE--> <!ELEMENT attribute EMPTY > <!ATTLIST attribute name NMTOKEN #REQUIRED > diff --git a/common/supplemental/metaZones.xml b/common/supplemental/metaZones.xml index 30c198b5..f95a6b71 100644 --- a/common/supplemental/metaZones.xml +++ b/common/supplemental/metaZones.xml @@ -402,7 +402,8 @@ For terms of use, see http://www.unicode.org/copyright.html <usesMetazone mzone="Atlantic"/> </timezone> <timezone type="America/Godthab"> - <usesMetazone mzone="Greenland_Western"/> + <usesMetazone to="2024-03-26 01:00" mzone="Greenland_Western"/> + <usesMetazone from="2024-03-26 01:00" mzone="Greenland"/> </timezone> <timezone type="America/Goose_Bay"> <usesMetazone to="1988-04-03 04:01" mzone="Atlantic"/> @@ -596,9 +597,6 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="America/New_York"> <usesMetazone mzone="America_Eastern"/> </timezone> - <timezone type="America/Nipigon"> - <usesMetazone mzone="America_Eastern"/> - </timezone> <timezone type="America/Nome"> <usesMetazone to="1983-10-30 12:00" mzone="Bering"/> <usesMetazone from="1983-11-30 09:00" mzone="Alaska"/> @@ -626,11 +624,6 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="America/Panama"> <usesMetazone mzone="America_Eastern"/> </timezone> - <timezone type="America/Pangnirtung"> - <usesMetazone to="1999-10-31 06:00" mzone="America_Eastern"/> - <usesMetazone to="2000-10-29 07:00" from="1999-10-31 06:00" mzone="America_Central"/> - <usesMetazone from="2000-10-29 07:00" mzone="America_Eastern"/> - </timezone> <timezone type="America/Paramaribo"> <usesMetazone to="1975-11-20 03:30" mzone="Dutch_Guiana"/> <usesMetazone from="1975-11-20 03:30" mzone="Suriname"/> @@ -653,9 +646,6 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="America/Punta_Arenas"> <usesMetazone to="2016-12-03 23:00" mzone="Chile"/> </timezone> - <timezone type="America/Rainy_River"> - <usesMetazone mzone="America_Central"/> - </timezone> <timezone type="America/Rankin_Inlet"> <usesMetazone to="2000-10-29 07:00" mzone="America_Central"/> <usesMetazone to="2001-04-01 08:00" from="2000-10-29 07:00" mzone="America_Eastern"/> @@ -679,9 +669,6 @@ For terms of use, see http://www.unicode.org/copyright.html <usesMetazone to="2013-11-10 04:00" from="2008-06-24 05:00" mzone="Amazon"/> <usesMetazone from="2013-11-10 04:00" mzone="Acre"/> </timezone> - <timezone type="America/Santa_Isabel"> - <usesMetazone mzone="Mexico_Northwest"/> - </timezone> <timezone type="America/Santarem"> <usesMetazone to="2008-06-24 04:00" mzone="Amazon"/> <usesMetazone from="2008-06-24 04:00" mzone="Brasilia"/> @@ -700,7 +687,8 @@ For terms of use, see http://www.unicode.org/copyright.html </timezone> <timezone type="America/Scoresbysund"> <usesMetazone to="1981-03-29 02:00" mzone="Greenland_Central"/> - <usesMetazone from="1981-03-29 02:00" mzone="Greenland_Eastern"/> + <usesMetazone to="2024-03-31 01:00" from="1981-03-29 02:00" mzone="Greenland_Eastern"/> + <usesMetazone from="2024-03-31 01:00" mzone="Greenland"/> </timezone> <timezone type="America/Sitka"> <usesMetazone to="1983-10-30 09:00" mzone="America_Pacific"/> @@ -734,9 +722,6 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="America/Thule"> <usesMetazone mzone="Atlantic"/> </timezone> - <timezone type="America/Thunder_Bay"> - <usesMetazone mzone="America_Eastern"/> - </timezone> <timezone type="America/Tijuana"> <usesMetazone mzone="America_Pacific"/> </timezone> @@ -759,9 +744,6 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="America/Yakutat"> <usesMetazone from="1983-11-30 09:00" mzone="Alaska"/> </timezone> - <timezone type="America/Yellowknife"> - <usesMetazone mzone="America_Mountain"/> - </timezone> <timezone type="Antarctica/Casey"> <usesMetazone to="2009-10-17 18:00" mzone="Australia_Western"/> <usesMetazone to="2010-03-04 15:00" from="2009-10-17 18:00" mzone="Casey"/> @@ -774,7 +756,12 @@ For terms of use, see http://www.unicode.org/copyright.html <usesMetazone to="2019-10-03 19:00" from="2019-03-16 16:00" mzone="Australia_Western"/> <usesMetazone to="2020-03-07 16:00" from="2019-10-03 19:00" mzone="Casey"/> <usesMetazone to="2020-10-03 16:01" from="2020-03-07 16:00" mzone="Australia_Western"/> - <usesMetazone from="2020-10-03 16:01" mzone="Casey"/> + <usesMetazone to="2021-03-13 13:00" from="2020-10-03 16:01" mzone="Casey"/> + <usesMetazone to="2021-10-02 16:01" from="2021-03-13 13:00" mzone="Australia_Western"/> + <usesMetazone to="2022-03-12 13:00" from="2021-10-02 16:01" mzone="Casey"/> + <usesMetazone to="2022-10-01 16:01" from="2022-03-12 13:00" mzone="Australia_Western"/> + <usesMetazone to="2023-03-08 16:00" from="2022-10-01 16:01" mzone="Casey"/> + <usesMetazone from="2023-03-08 16:00" mzone="Australia_Western"/> </timezone> <timezone type="Antarctica/Davis"> <usesMetazone mzone="Davis"/> @@ -1158,9 +1145,6 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="Australia/Broken_Hill"> <usesMetazone mzone="Australia_Central"/> </timezone> - <timezone type="Australia/Currie"> - <usesMetazone mzone="Australia_Eastern"/> - </timezone> <timezone type="Australia/Darwin"> <usesMetazone mzone="Australia_Central"/> </timezone> @@ -1372,10 +1356,6 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="Europe/Ulyanovsk"> <usesMetazone to="2016-03-26 23:00" from="1992-01-19 00:00" mzone="Moscow"/> </timezone> - <timezone type="Europe/Uzhgorod"> - <usesMetazone to="1990-06-30 22:00" mzone="Moscow"/> - <usesMetazone from="1990-06-30 22:00" mzone="Europe_Eastern"/> - </timezone> <timezone type="Europe/Vaduz"> <usesMetazone mzone="Europe_Central"/> </timezone> @@ -1400,10 +1380,6 @@ For terms of use, see http://www.unicode.org/copyright.html <timezone type="Europe/Zagreb"> <usesMetazone mzone="Europe_Central"/> </timezone> - <timezone type="Europe/Zaporozhye"> - <usesMetazone to="1990-06-30 22:00" mzone="Moscow"/> - <usesMetazone from="1990-06-30 22:00" mzone="Europe_Eastern"/> - </timezone> <timezone type="Europe/Zurich"> <usesMetazone mzone="Europe_Central"/> </timezone> @@ -1491,10 +1467,6 @@ For terms of use, see http://www.unicode.org/copyright.html <usesMetazone to="1983-10-30 11:00" mzone="Alaska_Hawaii"/> <usesMetazone from="1983-10-30 11:00" mzone="Hawaii_Aleutian"/> </timezone> - <timezone type="Pacific/Johnston"> - <usesMetazone to="1983-10-30 11:00" mzone="Alaska_Hawaii"/> - <usesMetazone from="1983-10-30 11:00" mzone="Hawaii_Aleutian"/> - </timezone> <timezone type="Pacific/Kiritimati"> <usesMetazone mzone="Line_Islands"/> </timezone> @@ -1778,6 +1750,7 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="GMT" territory="SN" type="Africa/Dakar"/> <mapZone other="GMT" territory="TG" type="Africa/Lome"/> <mapZone other="Goose_Bay" territory="001" type="America/Goose_Bay"/> + <mapZone other="Greenland" territory="001" type="America/Godthab"/> <mapZone other="Greenland_Central" territory="001" type="America/Scoresbysund"/> <mapZone other="Greenland_Eastern" territory="001" type="America/Scoresbysund"/> <mapZone other="Greenland_Western" territory="001" type="America/Godthab"/> @@ -1827,7 +1800,6 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="Marshall_Islands" territory="001" type="Pacific/Majuro"/> <mapZone other="Mauritius" territory="001" type="Indian/Mauritius"/> <mapZone other="Mawson" territory="001" type="Antarctica/Mawson"/> - <mapZone other="Mexico_Northwest" territory="001" type="America/Santa_Isabel"/> <mapZone other="Mexico_Pacific" territory="001" type="America/Mazatlan"/> <mapZone other="Mongolia" territory="001" type="Asia/Ulaanbaatar"/> <mapZone other="Moscow" territory="001" type="Europe/Moscow"/> @@ -1964,6 +1936,7 @@ For terms of use, see http://www.unicode.org/copyright.html <metazoneId shortId="giis" longId="Gilbert_Islands" /> <metazoneId shortId="mgmt" longId="GMT" /> <metazoneId shortId="grea" longId="Greenland_Eastern" /> + <metazoneId shortId="gree" longId="Greenland" /> <metazoneId shortId="grwe" longId="Greenland_Western" /> <metazoneId shortId="guam" longId="Guam" /> <metazoneId shortId="gulf" longId="Gulf" /> @@ -2000,7 +1973,6 @@ For terms of use, see http://www.unicode.org/copyright.html <metazoneId shortId="mais" longId="Marshall_Islands" /> <metazoneId shortId="maur" longId="Mauritius" /> <metazoneId shortId="maws" longId="Mawson" /> - <metazoneId shortId="meno" longId="Mexico_Northwest" /> <metazoneId shortId="mepa" longId="Mexico_Pacific" /> <metazoneId shortId="mong" longId="Mongolia" /> <metazoneId shortId="mosc" longId="Moscow" /> diff --git a/common/supplemental/supplementalMetadata.xml b/common/supplemental/supplementalMetadata.xml index 43827a8a..a35bee6e 100644 --- a/common/supplemental/supplementalMetadata.xml +++ b/common/supplemental/supplementalMetadata.xml @@ -1797,6 +1797,16 @@ For terms of use, see http://www.unicode.org/copyright.html <zoneAlias type="Asia/Chongqing" replacement="Asia/Shanghai" reason="deprecated"/> <zoneAlias type="Asia/Harbin" replacement="Asia/Shanghai" reason="deprecated"/> <zoneAlias type="Asia/Kashgar" replacement="Asia/Urumqi" reason="deprecated"/> + <zoneAlias type="America/Nipigon" replacement="America/Toronto" reason="deprecated"/> + <zoneAlias type="America/Pangnirtung" replacement="America/Iqaluit" reason="deprecated"/> + <zoneAlias type="America/Rainy_River" replacement="America/Winnipeg" reason="deprecated"/> + <zoneAlias type="America/Santa_Isabel" replacement="America/Tijuana" reason="deprecated"/> + <zoneAlias type="America/Thunder_Bay" replacement="America/Toronto" reason="deprecated"/> + <zoneAlias type="America/Yellowknife" replacement="America/Edmonton" reason="deprecated"/> + <zoneAlias type="Australia/Currie" replacement="Australia/Hobart" reason="deprecated"/> + <zoneAlias type="Europe/Uzhgorod" replacement="Europe/Kiev" reason="deprecated"/> + <zoneAlias type="Europe/Zaporozhye" replacement="Europe/Kiev" reason="deprecated"/> + <zoneAlias type="Pacific/Johnston" replacement="Pacific/Honolulu" reason="deprecated"/> </alias> <defaultContent locales=" aa_ET ab_GE af_ZA agq_CM ak_GH am_ET an_ES ann_NG ar_001 arn_CL as_IN asa_TZ diff --git a/common/supplemental/windowsZones.xml b/common/supplemental/windowsZones.xml index 75b7dff7..2fae6c3c 100644 --- a/common/supplemental/windowsZones.xml +++ b/common/supplemental/windowsZones.xml @@ -30,7 +30,6 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="Hawaiian Standard Time" territory="001" type="Pacific/Honolulu"/> <mapZone other="Hawaiian Standard Time" territory="CK" type="Pacific/Rarotonga"/> <mapZone other="Hawaiian Standard Time" territory="PF" type="Pacific/Tahiti"/> - <mapZone other="Hawaiian Standard Time" territory="UM" type="Pacific/Johnston"/> <mapZone other="Hawaiian Standard Time" territory="US" type="Pacific/Honolulu"/> <mapZone other="Hawaiian Standard Time" territory="ZZ" type="Etc/GMT+10"/> @@ -49,7 +48,7 @@ For terms of use, see http://www.unicode.org/copyright.html <!-- (UTC-08:00) Baja California --> <mapZone other="Pacific Standard Time (Mexico)" territory="001" type="America/Tijuana"/> - <mapZone other="Pacific Standard Time (Mexico)" territory="MX" type="America/Tijuana America/Santa_Isabel"/> + <mapZone other="Pacific Standard Time (Mexico)" territory="MX" type="America/Tijuana"/> <!-- (UTC-08:00) Coordinated Universal Time-08 --> <mapZone other="UTC-08" territory="001" type="Etc/GMT+8"/> @@ -70,13 +69,13 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="US Mountain Standard Time" territory="ZZ" type="Etc/GMT+7"/> <!-- (UTC-07:00) Chihuahua, La Paz, Mazatlan --> - <mapZone other="Mountain Standard Time (Mexico)" territory="001" type="America/Chihuahua"/> - <mapZone other="Mountain Standard Time (Mexico)" territory="MX" type="America/Chihuahua America/Mazatlan"/> + <mapZone other="Mountain Standard Time (Mexico)" territory="001" type="America/Mazatlan"/> + <mapZone other="Mountain Standard Time (Mexico)" territory="MX" type="America/Mazatlan"/> <!-- (UTC-07:00) Mountain Time (US & Canada) --> <mapZone other="Mountain Standard Time" territory="001" type="America/Denver"/> - <mapZone other="Mountain Standard Time" territory="CA" type="America/Edmonton America/Cambridge_Bay America/Inuvik America/Yellowknife"/> - <mapZone other="Mountain Standard Time" territory="MX" type="America/Ojinaga"/> + <mapZone other="Mountain Standard Time" territory="CA" type="America/Edmonton America/Cambridge_Bay America/Inuvik"/> + <mapZone other="Mountain Standard Time" territory="MX" type="America/Ciudad_Juarez"/> <mapZone other="Mountain Standard Time" territory="US" type="America/Denver America/Boise"/> <mapZone other="Mountain Standard Time" territory="ZZ" type="MST7MDT"/> @@ -97,8 +96,8 @@ For terms of use, see http://www.unicode.org/copyright.html <!-- (UTC-06:00) Central Time (US & Canada) --> <mapZone other="Central Standard Time" territory="001" type="America/Chicago"/> - <mapZone other="Central Standard Time" territory="CA" type="America/Winnipeg America/Rainy_River America/Rankin_Inlet America/Resolute"/> - <mapZone other="Central Standard Time" territory="MX" type="America/Matamoros"/> + <mapZone other="Central Standard Time" territory="CA" type="America/Winnipeg America/Rankin_Inlet America/Resolute"/> + <mapZone other="Central Standard Time" territory="MX" type="America/Matamoros America/Ojinaga"/> <mapZone other="Central Standard Time" territory="US" type="America/Chicago America/Indiana/Knox America/Indiana/Tell_City America/Menominee America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem"/> <mapZone other="Central Standard Time" territory="ZZ" type="CST6CDT"/> @@ -108,7 +107,7 @@ For terms of use, see http://www.unicode.org/copyright.html <!-- (UTC-06:00) Guadalajara, Mexico City, Monterrey --> <mapZone other="Central Standard Time (Mexico)" territory="001" type="America/Mexico_City"/> - <mapZone other="Central Standard Time (Mexico)" territory="MX" type="America/Mexico_City America/Bahia_Banderas America/Merida America/Monterrey"/> + <mapZone other="Central Standard Time (Mexico)" territory="MX" type="America/Mexico_City America/Bahia_Banderas America/Merida America/Monterrey America/Chihuahua "/> <!-- (UTC-06:00) Saskatchewan --> <mapZone other="Canada Central Standard Time" territory="001" type="America/Regina"/> @@ -133,7 +132,7 @@ For terms of use, see http://www.unicode.org/copyright.html <!-- (UTC-05:00) Eastern Time (US & Canada) --> <mapZone other="Eastern Standard Time" territory="001" type="America/New_York"/> <mapZone other="Eastern Standard Time" territory="BS" type="America/Nassau"/> - <mapZone other="Eastern Standard Time" territory="CA" type="America/Toronto America/Iqaluit America/Montreal America/Nipigon America/Pangnirtung America/Thunder_Bay"/> + <mapZone other="Eastern Standard Time" territory="CA" type="America/Toronto America/Iqaluit"/> <mapZone other="Eastern Standard Time" territory="US" type="America/New_York America/Detroit America/Indiana/Petersburg America/Indiana/Vincennes America/Indiana/Winamac America/Kentucky/Monticello America/Louisville"/> <mapZone other="Eastern Standard Time" territory="ZZ" type="EST5EDT"/> @@ -421,7 +420,7 @@ For terms of use, see http://www.unicode.org/copyright.html <mapZone other="FLE Standard Time" territory="FI" type="Europe/Helsinki"/> <mapZone other="FLE Standard Time" territory="LT" type="Europe/Vilnius"/> <mapZone other="FLE Standard Time" territory="LV" type="Europe/Riga"/> - <mapZone other="FLE Standard Time" territory="UA" type="Europe/Kiev Europe/Uzhgorod Europe/Zaporozhye"/> + <mapZone other="FLE Standard Time" territory="UA" type="Europe/Kiev"/> <!-- (UTC+02:00) Jerusalem --> <mapZone other="Israel Standard Time" territory="001" type="Asia/Jerusalem"/> @@ -710,7 +709,7 @@ For terms of use, see http://www.unicode.org/copyright.html <!-- (UTC+10:00) Hobart --> <mapZone other="Tasmania Standard Time" territory="001" type="Australia/Hobart"/> - <mapZone other="Tasmania Standard Time" territory="AU" type="Australia/Hobart Australia/Currie Antarctica/Macquarie"/> + <mapZone other="Tasmania Standard Time" territory="AU" type="Australia/Hobart Antarctica/Macquarie"/> <!-- (UTC+10:00) Vladivostok --> <mapZone other="Vladivostok Standard Time" territory="001" type="Asia/Vladivostok"/> diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/test/XPathToMenu.java b/tools/cldr-code/src/main/java/org/unicode/cldr/test/XPathToMenu.java index 594b844b..362529b7 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/test/XPathToMenu.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/test/XPathToMenu.java @@ -313,6 +313,7 @@ final class XPathToMenu { "Amazon", "America", "Long_Shu", "Asia", "Samara", "Europe", + "Greenland", "America", }; private XPathToMenu() {} diff --git a/tools/cldr-code/src/main/java/org/unicode/cldr/util/LogicalGrouping.java b/tools/cldr-code/src/main/java/org/unicode/cldr/util/LogicalGrouping.java index e2302cfe..e7e7a47d 100644 --- a/tools/cldr-code/src/main/java/org/unicode/cldr/util/LogicalGrouping.java +++ b/tools/cldr-code/src/main/java/org/unicode/cldr/util/LogicalGrouping.java @@ -28,21 +28,96 @@ public class LogicalGrouping { static final SupplementalDataInfo supplementalData = CLDRConfig.getInstance().getSupplementalDataInfo(); - public static final ImmutableSet<String> metazonesDSTSet = ImmutableSet.of( - "Acre", "Africa_Western", "Alaska", "Almaty", "Amazon", - "America_Central", "America_Eastern", "America_Mountain", "America_Pacific", "Anadyr", "Apia", - "Aqtau", "Aqtobe", "Arabian", "Argentina", "Argentina_Western", "Armenia", - "Atlantic", "Australia_Central", "Australia_CentralWestern", "Australia_Eastern", "Australia_Western", - "Azerbaijan", "Azores", "Bangladesh", "Brasilia", "Cape_Verde", - "Chatham", "Chile", "China", "Choibalsan", "Colombia", "Cook", "Cuba", "Easter", - "Europe_Central", "Europe_Eastern", "Europe_Western", "Falkland", "Fiji", "Georgia", - "Greenland_Eastern", "Greenland_Western", "Hawaii_Aleutian", "Hong_Kong", "Hovd", - "Iran", "Irkutsk", "Israel", "Japan", "Kamchatka", "Korea", "Krasnoyarsk", - "Lord_Howe", "Macau", "Magadan", "Mauritius", "Mexico_Northwest", "Mexico_Pacific", "Mongolia", "Moscow", "New_Caledonia", - "New_Zealand", "Newfoundland", "Norfolk", "Noronha", "Novosibirsk", "Omsk", "Pakistan", "Paraguay", "Peru", "Philippines", - "Pierre_Miquelon", "Qyzylorda", "Sakhalin", "Samara", "Samoa", - "Taipei", "Tonga", "Turkmenistan", "Uruguay", "Uzbekistan", - "Vanuatu", "Vladivostok", "Volgograd", "Yakutsk", "Yekaterinburg"); + public static final ImmutableSet<String> metazonesDSTSet = + ImmutableSet.of( + "Acre", + "Africa_Western", + "Alaska", + "Almaty", + "Amazon", + "America_Central", + "America_Eastern", + "America_Mountain", + "America_Pacific", + "Anadyr", + "Apia", + "Aqtau", + "Aqtobe", + "Arabian", + "Argentina", + "Argentina_Western", + "Armenia", + "Atlantic", + "Australia_Central", + "Australia_CentralWestern", + "Australia_Eastern", + "Australia_Western", + "Azerbaijan", + "Azores", + "Bangladesh", + "Brasilia", + "Cape_Verde", + "Chatham", + "Chile", + "China", + "Choibalsan", + "Colombia", + "Cook", + "Cuba", + "Easter", + "Europe_Central", + "Europe_Eastern", + "Europe_Western", + "Falkland", + "Fiji", + "Georgia", + "Greenland", + "Greenland_Eastern", + "Greenland_Western", + "Hawaii_Aleutian", + "Hong_Kong", + "Hovd", + "Iran", + "Irkutsk", + "Israel", + "Japan", + "Kamchatka", + "Korea", + "Krasnoyarsk", + "Lord_Howe", + "Macau", + "Magadan", + "Mauritius", + "Mexico_Northwest", + "Mexico_Pacific", + "Mongolia", + "Moscow", + "New_Caledonia", + "New_Zealand", + "Newfoundland", + "Norfolk", + "Noronha", + "Novosibirsk", + "Omsk", + "Pakistan", + "Paraguay", + "Peru", + "Philippines", + "Pierre_Miquelon", + "Qyzylorda", + "Sakhalin", + "Samara", + "Samoa", + "Taipei", + "Tonga", + "Turkmenistan", + "Uruguay", + "Uzbekistan", + "Vanuatu", + "Vladivostok", + "Volgograd", + "Yakutsk", + "Yekaterinburg"); public static final ImmutableList<String> days = ImmutableList.of("sun", "mon", "tue", "wed", "thu", "fri", "sat"); diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/africa b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/africa index 37442e61..cbab624b 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/africa +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/africa @@ -285,13 +285,6 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # reproduced by other (more accessible) sites[, e.g.,]... # http://elgornal.net/news/news.aspx?id=4699258 -# From Paul Eggert (2014-06-04): -# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says -# the change is because of blackouts in Cairo, even though Ahram Online (cited -# above) says DST had no affect on electricity consumption. There is -# no information about when DST will end this fall. See: -# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833 - # From Steffen Thorsen (2015-04-08): # Egypt will start DST on midnight after Thursday, April 30, 2015. # This is based on a law (no 35) from May 15, 2014 saying it starts the last @@ -321,6 +314,14 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - # From Mina Samuel (2016-07-04): # Egyptian government took the decision to cancel the DST, +# From Ahmad ElDardiry (2023-03-01): +# Egypt officially announced today that daylight savings will be +# applied from last Friday of April to last Thursday of October. +# From Paul Eggert (2023-03-01): +# Assume transitions are at 00:00 and 24:00 respectively. +# From Amir Adib (2023-03-07): +# https://www.facebook.com/EgyptianCabinet/posts/638829614954129/ + Rule Egypt 2008 only - Aug lastThu 24:00 0 - Rule Egypt 2009 only - Aug 20 24:00 0 - Rule Egypt 2010 only - Aug 10 24:00 0 - @@ -330,6 +331,8 @@ Rule Egypt 2014 only - May 15 24:00 1:00 S Rule Egypt 2014 only - Jun 26 24:00 0 - Rule Egypt 2014 only - Jul 31 24:00 1:00 S Rule Egypt 2014 only - Sep lastThu 24:00 0 - +Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S +Rule Egypt 2023 max - Oct lastThu 24:00 0 - # Zone NAME STDOFF RULES FORMAT [UNTIL] #STDOFF 2:05:08.9 @@ -429,7 +432,7 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May # President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. # Monrovia: Executive Mansion. # -# Use the abbreviation "MMT" before 1972, as the more-accurate numeric +# Use the abbreviation "MMT" before 1972, as the more accurate numeric # abbreviation "-004430" would be one byte over the POSIX limit. # # Zone NAME STDOFF RULES FORMAT [UNTIL] @@ -566,8 +569,8 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920 # DST the coming summer... # # Some sources, in French: -# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB -# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints- +# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-«-L%E2%80%99heure-d%E2%80%99été-ne-sera-pas-appliquée-cette-année-» +# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-économie-d-énergie-de-l-heure-d-été-ont-été-atteints- # # Our wrap-up: # https://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html @@ -698,7 +701,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # More articles in the press # https://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html # http://www.lematin.ma/Actualite/Express/Article.asp?id=148923 -# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim +# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT+1-a-partir-de-dim # From Petr Machata (2011-03-30): # They have it written in English here: @@ -713,7 +716,7 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # According to Infomédiaire web site from Morocco (infomediaire.ma), # on March 9, 2012, (in French) Heure légale: # Le Maroc adopte officiellement l'heure d'été -# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9 +# http://www.infomediaire.ma/news/maroc/heure-légale-le-maroc-adopte-officiellement-lheure-dété # Governing Council adopted draft decree, that Morocco DST starts on # the last Sunday of March (March 25, 2012) and ends on # last Sunday of September (September 30, 2012) @@ -837,19 +840,28 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # Friday or Saturday (and so the 2 days off are on a weekend), the next time # shift will be the next weekend. # -# From Paul Eggert (2020-05-31): +# From Milamber (2021-03-31, 2022-03-10): +# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 +# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ +# +# From Milamber (2023-03-14, 2023-03-15): +# The return to legal GMT time will take place this Sunday, March 19 at 3 a.m. +# ... the return to GMT+1 will be made on Sunday April 23, 2023 at 2 a.m. +# https://www.mmsp.gov.ma/fr/actualites/passage-à-l%E2%80%99heure-gmt-à-partir-du-dimanche-19-mars-2023 +# +# From Paul Eggert (2023-03-14): # For now, guess that in the future Morocco will fall back at 03:00 # the last Sunday before Ramadan, and spring forward at 02:00 the -# first Sunday after two days after Ramadan. To implement this, +# first Sunday after one day after Ramadan. To implement this, # transition dates and times for 2019 through 2087 were determined by -# running the following program under GNU Emacs 26.3. (This algorithm +# running the following program under GNU Emacs 28.2. (This algorithm # also produces the correct transition dates for 2016 through 2018, # though the times differ due to Morocco's time zone change in 2018.) # (let ((islamic-year 1440)) # (require 'cal-islam) # (while (< islamic-year 1511) # (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) -# (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) # (sunday 0)) # (while (/= sunday (mod (setq a (1- a)) 7))) # (while (/= sunday (mod b 7)) @@ -863,10 +875,6 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis # (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) # (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) # (setq islamic-year (+ 1 islamic-year)))) -# -# From Milamber (2021-03-31, 2022-03-10), confirming these predictions: -# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076 -# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/ # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Morocco 1939 only - Sep 12 0:00 1:00 - @@ -919,7 +927,7 @@ Rule Morocco 2021 only - May 16 2:00 1:00 - Rule Morocco 2022 only - Mar 27 3:00 0 - Rule Morocco 2022 only - May 8 2:00 1:00 - Rule Morocco 2023 only - Mar 19 3:00 0 - -Rule Morocco 2023 only - Apr 30 2:00 1:00 - +Rule Morocco 2023 only - Apr 23 2:00 1:00 - Rule Morocco 2024 only - Mar 10 3:00 0 - Rule Morocco 2024 only - Apr 14 2:00 1:00 - Rule Morocco 2025 only - Feb 23 3:00 0 - @@ -935,7 +943,7 @@ Rule Morocco 2029 only - Feb 18 2:00 1:00 - Rule Morocco 2029 only - Dec 30 3:00 0 - Rule Morocco 2030 only - Feb 10 2:00 1:00 - Rule Morocco 2030 only - Dec 22 3:00 0 - -Rule Morocco 2031 only - Feb 2 2:00 1:00 - +Rule Morocco 2031 only - Jan 26 2:00 1:00 - Rule Morocco 2031 only - Dec 14 3:00 0 - Rule Morocco 2032 only - Jan 18 2:00 1:00 - Rule Morocco 2032 only - Nov 28 3:00 0 - @@ -951,7 +959,7 @@ Rule Morocco 2036 only - Nov 23 2:00 1:00 - Rule Morocco 2037 only - Oct 4 3:00 0 - Rule Morocco 2037 only - Nov 15 2:00 1:00 - Rule Morocco 2038 only - Sep 26 3:00 0 - -Rule Morocco 2038 only - Nov 7 2:00 1:00 - +Rule Morocco 2038 only - Oct 31 2:00 1:00 - Rule Morocco 2039 only - Sep 18 3:00 0 - Rule Morocco 2039 only - Oct 23 2:00 1:00 - Rule Morocco 2040 only - Sep 2 3:00 0 - @@ -967,7 +975,7 @@ Rule Morocco 2044 only - Aug 28 2:00 1:00 - Rule Morocco 2045 only - Jul 9 3:00 0 - Rule Morocco 2045 only - Aug 20 2:00 1:00 - Rule Morocco 2046 only - Jul 1 3:00 0 - -Rule Morocco 2046 only - Aug 12 2:00 1:00 - +Rule Morocco 2046 only - Aug 5 2:00 1:00 - Rule Morocco 2047 only - Jun 23 3:00 0 - Rule Morocco 2047 only - Jul 28 2:00 1:00 - Rule Morocco 2048 only - Jun 7 3:00 0 - @@ -983,7 +991,7 @@ Rule Morocco 2052 only - Jun 2 2:00 1:00 - Rule Morocco 2053 only - Apr 13 3:00 0 - Rule Morocco 2053 only - May 25 2:00 1:00 - Rule Morocco 2054 only - Apr 5 3:00 0 - -Rule Morocco 2054 only - May 17 2:00 1:00 - +Rule Morocco 2054 only - May 10 2:00 1:00 - Rule Morocco 2055 only - Mar 28 3:00 0 - Rule Morocco 2055 only - May 2 2:00 1:00 - Rule Morocco 2056 only - Mar 12 3:00 0 - @@ -999,7 +1007,7 @@ Rule Morocco 2060 only - Mar 7 2:00 1:00 - Rule Morocco 2061 only - Jan 16 3:00 0 - Rule Morocco 2061 only - Feb 27 2:00 1:00 - Rule Morocco 2062 only - Jan 8 3:00 0 - -Rule Morocco 2062 only - Feb 19 2:00 1:00 - +Rule Morocco 2062 only - Feb 12 2:00 1:00 - Rule Morocco 2062 only - Dec 31 3:00 0 - Rule Morocco 2063 only - Feb 4 2:00 1:00 - Rule Morocco 2063 only - Dec 16 3:00 0 - @@ -1015,7 +1023,7 @@ Rule Morocco 2067 only - Dec 11 2:00 1:00 - Rule Morocco 2068 only - Oct 21 3:00 0 - Rule Morocco 2068 only - Dec 2 2:00 1:00 - Rule Morocco 2069 only - Oct 13 3:00 0 - -Rule Morocco 2069 only - Nov 24 2:00 1:00 - +Rule Morocco 2069 only - Nov 17 2:00 1:00 - Rule Morocco 2070 only - Oct 5 3:00 0 - Rule Morocco 2070 only - Nov 9 2:00 1:00 - Rule Morocco 2071 only - Sep 20 3:00 0 - @@ -1031,7 +1039,7 @@ Rule Morocco 2075 only - Sep 15 2:00 1:00 - Rule Morocco 2076 only - Jul 26 3:00 0 - Rule Morocco 2076 only - Sep 6 2:00 1:00 - Rule Morocco 2077 only - Jul 18 3:00 0 - -Rule Morocco 2077 only - Aug 29 2:00 1:00 - +Rule Morocco 2077 only - Aug 22 2:00 1:00 - Rule Morocco 2078 only - Jul 10 3:00 0 - Rule Morocco 2078 only - Aug 14 2:00 1:00 - Rule Morocco 2079 only - Jun 25 3:00 0 - @@ -1041,13 +1049,13 @@ Rule Morocco 2080 only - Jul 21 2:00 1:00 - Rule Morocco 2081 only - Jun 1 3:00 0 - Rule Morocco 2081 only - Jul 13 2:00 1:00 - Rule Morocco 2082 only - May 24 3:00 0 - -Rule Morocco 2082 only - Jul 5 2:00 1:00 - +Rule Morocco 2082 only - Jun 28 2:00 1:00 - Rule Morocco 2083 only - May 16 3:00 0 - Rule Morocco 2083 only - Jun 20 2:00 1:00 - Rule Morocco 2084 only - Apr 30 3:00 0 - Rule Morocco 2084 only - Jun 11 2:00 1:00 - Rule Morocco 2085 only - Apr 22 3:00 0 - -Rule Morocco 2085 only - Jun 3 2:00 1:00 - +Rule Morocco 2085 only - May 27 2:00 1:00 - Rule Morocco 2086 only - Apr 14 3:00 0 - Rule Morocco 2086 only - May 19 2:00 1:00 - Rule Morocco 2087 only - Mar 30 3:00 0 - @@ -1190,15 +1198,15 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # From P Chan (2020-12-03): # GMT was adopted as the standard time of Lagos on 1905-07-01. # Lagos Weekly Record, 1905-06-24, p 3 -# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446%2C5221%2C1931%2C1235 +# http://ddsnext.crl.edu/titles/31558#?c=0&m=668&s=0&cv=2&r=0&xywh=1446,5221,1931,1235 # says "It is officially notified that on and after the 1st of July 1905 -# Greenwich Mean Solar Time will be adopted thought the Colony and +# Greenwich Mean Solar Time will be adopted throughout the Colony and # Protectorate, and that it will be necessary to put all clocks 13 minutes and # 35 seconds back, recording local mean time." # # It seemed that Lagos returned to LMT on 1908-07-01. # [The Lagos Standard], 1908-07-01, p 5 -# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92%2C3590%2C3944%2C2523 +# http://ddsnext.crl.edu/titles/31556#?c=0&m=78&s=0&cv=4&r=0&xywh=-92,3590,3944,2523 # says "Scarcely have the people become accustomed to this new time, when # another official notice has now appeared announcing that from and after the # 1st July next, return will be made to local mean time." @@ -1210,7 +1218,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # https://libsysdigi.library.illinois.edu/ilharvest/Africana/Books2011-05/3064634/3064634_1914/3064634_1914_opt.pdf#page=27 # "On January 1st [1914], a universal standard time for Nigeria was adopted, # viz., half an hour fast on Greenwich mean time, corresponding to the meridian -# 7 [degrees] 30' E. long." +# 7° 30' E. long." # Lloyd's Register of Shipping (1915) says "Hitherto the time observed in Lagos # was the local mean time. On 1st January, 1914, standard time for the whole of # Nigeria was introduced ... Lagos time has been advanced about 16 minutes @@ -1228,7 +1236,7 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8 # The Lagos Weekly Record, 1919-09-20, p 3 details discussion on the first # reading of this Bill by the Legislative Council of the Colony of Nigeria on # Thursday 1919-08-28: -# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261%2C3408%2C2994%2C1915 +# http://ddsnext.crl.edu/titles/31558?terms&item_id=303484#?m=1118&c=1&s=0&cv=2&r=0&xywh=1261,3408,2994,1915 # "The proposal is that the Globe should be divided into twelve zones East and # West of Greenwich, of one hour each, Nigeria falling into the zone with a # standard of one hour fast on Greenwich Mean Time. Nigeria standard time is diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/antarctica b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/antarctica index f02755ae..763c2725 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/antarctica +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/antarctica @@ -80,6 +80,11 @@ # - 2018 Oct 7 4:00 - 2019 Mar 17 3:00 - 2019 Oct 4 3:00 - 2020 Mar 8 3:00 # and now - 2020 Oct 4 0:01 +# From Paul Eggert (2023-12-20): +# Transitions from 2021 on are taken from: +# https://www.timeanddate.com/time/zone/antarctica/casey +# retrieved at various dates. + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Antarctica/Casey 0 - -00 1969 8:00 - +08 2009 Oct 18 2:00 @@ -93,7 +98,12 @@ Zone Antarctica/Casey 0 - -00 1969 8:00 - +08 2019 Oct 4 3:00 11:00 - +11 2020 Mar 8 3:00 8:00 - +08 2020 Oct 4 0:01 - 11:00 - +11 + 11:00 - +11 2021 Mar 14 0:00 + 8:00 - +08 2021 Oct 3 0:01 + 11:00 - +11 2022 Mar 13 0:00 + 8:00 - +08 2022 Oct 2 0:01 + 11:00 - +11 2023 Mar 9 3:00 + 8:00 - +08 Zone Antarctica/Davis 0 - -00 1957 Jan 13 7:00 - +07 1964 Nov 0 - -00 1969 Feb @@ -240,7 +250,50 @@ Zone Antarctica/Troll 0 - -00 2005 Feb 12 # year-round from 1960/61 to 1992 # Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11 -# See Asia/Urumqi. +# From Craig Mundell (1994-12-15): +# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP +# Vostok, which is one of the Russian stations, is set on the same +# time as Moscow, Russia. +# +# From Lee Hotz (2001-03-08): +# I queried the folks at Columbia who spent the summer at Vostok and this is +# what they had to say about time there: +# "in the US Camp (East Camp) we have been on New Zealand (McMurdo) +# time, which is 12 hours ahead of GMT. The Russian Station Vostok was +# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead +# of GMT). This is a time zone I think two hours east of Moscow. The +# natural time zone is in between the two: 8 hours ahead of GMT." +# +# From Paul Eggert (2001-05-04): +# This seems to be hopelessly confusing, so I asked Lee Hotz about it +# in person. He said that some Antarctic locations set their local +# time so that noon is the warmest part of the day, and that this +# changes during the year and does not necessarily correspond to mean +# solar noon. So the Vostok time might have been whatever the clocks +# happened to be during their visit. So we still don't really know what time +# it is at Vostok. +# +# From Zakhary V. Akulov (2023-12-17 22:00:48 +0700): +# ... from December, 18, 2023 00:00 by my decision the local time of +# the Antarctic research base Vostok will correspond to UTC+5. +# (2023-12-19): We constantly interact with Progress base, with company who +# builds new wintering station, with sledge convoys, with aviation - they all +# use UTC+5. Besides, difference between Moscow time is just 2 hours now, not 4. +# (2023-12-19, in response to the question "Has local time at Vostok +# been UTC+6 ever since 1957, or has it changed before?"): No. At least +# since my antarctic career start, 10 years ago, Vostok base has UTC+7. +# (In response to a 2023-12-18 question "from 02:00 to 00:00 today"): This. +# +# From Paul Eggert (2023-12-18): +# For lack of better info, guess Vostok was at +07 from founding through today, +# except when closed. + +# Zone NAME STDOFF RULES FORMAT [UNTIL] +Zone Antarctica/Vostok 0 - -00 1957 Dec 16 + 7:00 - +07 1994 Feb + 0 - -00 1994 Nov + 7:00 - +07 2023 Dec 18 2:00 + 5:00 - +05 # S Africa - year-round bases # Marion Island, -4653+03752 @@ -292,7 +345,7 @@ Zone Antarctica/Rothera 0 - -00 1976 Dec 1 # but that he found it more convenient to keep GMT+12 # as supplies for the station were coming from McMurdo Sound, # which was on GMT+12 because New Zealand was on GMT+12 all year -# at that time (1957). (Source: Siple's book 90 Degrees South.) +# at that time (1957). (Source: Siple's book 90° South.) # # From Susan Smith # http://www.cybertours.com/whs/pole10.html diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/asia b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/asia index 59bcdfd2..e0960ead 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/asia +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/asia @@ -655,7 +655,6 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901 8:00 PRC C%sT # Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi # / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.) -# Vostok base in Antarctica matches this since 1970. Zone Asia/Urumqi 5:50:20 - LMT 1928 6:00 - +06 @@ -2691,6 +2690,40 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1 # Lebanon +# +# From Saadallah Itani (2023-03-23): +# Lebanon ... announced today delay of Spring forward from March 25 to April 20. +# +# From Paul Eggert (2023-03-27): +# This announcement was by the Lebanese caretaker prime minister Najib Mikati. +# https://www.mtv.com.lb/en/News/Local/1352516/lebanon-postpones-daylight-saving-time-adoption +# A video was later leaked to the media of parliament speaker Nabih Berri +# asking Mikati to postpone DST to aid observance of Ramadan, Mikati objecting +# that this would cause problems such as scheduling airline flights, to which +# Berri interjected, "What flights?" +# +# The change was controversial and led to a partly-sectarian divide. +# Many Lebanese institutions, including the education ministry, the Maronite +# church, and two news channels LCBI and MTV, ignored the announcement and +# went ahead with the long-scheduled spring-forward on March 25/26, some +# arguing that the prime minister had not followed the law because the change +# had not been approved by the cabinet. Google went with the announcement; +# Apple ignored it. At least one bank followed the announcement for its doors, +# but ignored the announcement in internal computer systems. +# Beirut international airport listed two times for each departure. +# Dan Azzi wrote "My view is that this whole thing is a Dumb and Dumber movie." +# Eventually the prime minister backed down, said the cabinet had decided to +# stick with its 1998 decision, and that DST would begin midnight March 29/30. +# https://www.nna-leb.gov.lb/en/miscellaneous/604093/lebanon-has-two-times-of-day-amid-daylight-savings +# https://www.cnbc.com/2023/03/27/lebanon-in-two-different-time-zones-as-government-disagrees-on-daylight-savings.html +# +# Although we could model the chaos with two Zones, that would likely cause +# more trouble than it would cure. Since so many manual clocks and +# computer-based timestamps ignored the announcement, stick with official +# cabinet resolutions in the data while recording the prime minister's +# announcement as a comment. This is how we treated a similar situation in +# Rio de Janeiro in spring 1993. +# # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Lebanon 1920 only - Mar 28 0:00 1:00 S Rule Lebanon 1920 only - Oct 25 0:00 0 - @@ -2716,6 +2749,10 @@ Rule Lebanon 1992 only - Oct 4 0:00 0 - Rule Lebanon 1993 max - Mar lastSun 0:00 1:00 S Rule Lebanon 1993 1998 - Sep lastSun 0:00 0 - Rule Lebanon 1999 max - Oct lastSun 0:00 0 - +# This one-time rule, announced by the prime minister first for April 21 +# then for March 30, is commented out for reasons described above. +#Rule Lebanon 2023 only - Mar 30 0:00 1:00 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Beirut 2:22:00 - LMT 1880 2:00 Lebanon EE%sT @@ -2954,7 +2991,7 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920 # 9pm and moving clocks forward by one hour for the next three months. ...." # # http://www.worldtimezone.com/dst_news/dst_news_pakistan01.html -# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4 +# http://www.dailytimes.com.pk/default.asp?page=2008\05\15\story_15-5-2008_pg1_4 # From Arthur David Olson (2008-05-19): # XXX--midnight transitions is a guess; 2008 only is a guess. @@ -3277,7 +3314,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # Some of many sources in Arabic: # http://www.samanews.com/index.php?act=Show&id=122638 # -# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html +# http://safa.ps/details/news/74352/بدء-التوقيت-الصيفي-بالضفة-وغزة-ليلة-الجمعة.html # # Our brief summary: # https://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html @@ -3287,7 +3324,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # time from midnight on Friday, March 29, 2013" (translated). # [These are in Arabic and are for Gaza and for Ramallah, respectively.] # http://www.samanews.com/index.php?act=Show&id=154120 -# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html +# http://safa.ps/details/news/99844/رام-الله-بدء-التوقيت-الصيفي-29-الجاري.html # From Steffen Thorsen (2013-09-24): # The Gaza and West Bank are ending DST Thursday at midnight @@ -3385,9 +3422,44 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 # (2022-08-31): ... the Saturday before the last Sunday in March and October # at 2:00 AM ,for the years from 2023 to 2026. # (2022-09-05): https://mtit.pna.ps/Site/New/1453 -# -# From Paul Eggert (2022-08-31): -# For now, assume that this rule will also be used after 2026. + +# From Heba Hamad (2023-03-22): +# ... summer time will begin in Palestine from Saturday 04-29-2023, +# 02:00 AM by 60 minutes forward. +# From Heba Hemad (2023-10-09): +# ... winter time will begin in Palestine from Saturday 10-28-2023, +# 02:00 AM by 60 minutes back. +# +# From Paul Eggert (2023-03-22): +# For now, guess that spring and fall transitions will normally +# continue to use 2022's rules, that during DST Palestine will switch +# to standard time at 02:00 the last Saturday before Ramadan and back +# to DST at 02:00 the first Saturday after Ramadan, and that +# if the normal spring-forward or fall-back transition occurs during +# Ramadan the former is delayed and the latter advanced. +# To implement this, I predicted Ramadan-oriented transition dates for +# 2023 through 2086 by running the following program under GNU Emacs 28.2, +# with the results integrated by hand into the table below. +# Predictions after 2086 are approximated without Ramadan. +# +# (let ((islamic-year 1444)) +# (require 'cal-islam) +# (while (< islamic-year 1510) +# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) +# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) +# (saturday 6)) +# (while (/= saturday (mod (setq a (1- a)) 7))) +# (while (/= saturday (mod b 7)) +# (setq b (1+ b))) +# (setq a (calendar-gregorian-from-absolute a)) +# (setq b (calendar-gregorian-from-absolute b)) +# (insert +# (format +# (concat "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t0\t-\n" +# "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t1:00\tS\n") +# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) +# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) +# (setq islamic-year (+ 1 islamic-year)))) # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule EgyptAsia 1957 only - May 10 0:00 1:00 S @@ -3427,8 +3499,86 @@ Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S Rule Palestine 2020 only - Oct 24 1:00 0 - Rule Palestine 2021 only - Oct 29 1:00 0 - Rule Palestine 2022 only - Mar 27 0:00 1:00 S -Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - -Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - +Rule Palestine 2023 only - Apr 29 2:00 1:00 S +Rule Palestine 2024 only - Apr 13 2:00 1:00 S +Rule Palestine 2025 only - Apr 5 2:00 1:00 S +Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2036 only - Oct 18 2:00 0 - +Rule Palestine 2037 only - Oct 10 2:00 0 - +Rule Palestine 2038 only - Sep 25 2:00 0 - +Rule Palestine 2039 only - Sep 17 2:00 0 - +Rule Palestine 2039 only - Oct 22 2:00 1:00 S +Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - +Rule Palestine 2040 only - Sep 1 2:00 0 - +Rule Palestine 2040 only - Oct 13 2:00 1:00 S +Rule Palestine 2041 only - Aug 24 2:00 0 - +Rule Palestine 2041 only - Sep 28 2:00 1:00 S +Rule Palestine 2042 only - Aug 16 2:00 0 - +Rule Palestine 2042 only - Sep 20 2:00 1:00 S +Rule Palestine 2043 only - Aug 1 2:00 0 - +Rule Palestine 2043 only - Sep 12 2:00 1:00 S +Rule Palestine 2044 only - Jul 23 2:00 0 - +Rule Palestine 2044 only - Aug 27 2:00 1:00 S +Rule Palestine 2045 only - Jul 15 2:00 0 - +Rule Palestine 2045 only - Aug 19 2:00 1:00 S +Rule Palestine 2046 only - Jun 30 2:00 0 - +Rule Palestine 2046 only - Aug 11 2:00 1:00 S +Rule Palestine 2047 only - Jun 22 2:00 0 - +Rule Palestine 2047 only - Jul 27 2:00 1:00 S +Rule Palestine 2048 only - Jun 6 2:00 0 - +Rule Palestine 2048 only - Jul 18 2:00 1:00 S +Rule Palestine 2049 only - May 29 2:00 0 - +Rule Palestine 2049 only - Jul 3 2:00 1:00 S +Rule Palestine 2050 only - May 21 2:00 0 - +Rule Palestine 2050 only - Jun 25 2:00 1:00 S +Rule Palestine 2051 only - May 6 2:00 0 - +Rule Palestine 2051 only - Jun 17 2:00 1:00 S +Rule Palestine 2052 only - Apr 27 2:00 0 - +Rule Palestine 2052 only - Jun 1 2:00 1:00 S +Rule Palestine 2053 only - Apr 12 2:00 0 - +Rule Palestine 2053 only - May 24 2:00 1:00 S +Rule Palestine 2054 only - Apr 4 2:00 0 - +Rule Palestine 2054 only - May 16 2:00 1:00 S +Rule Palestine 2055 only - May 1 2:00 1:00 S +Rule Palestine 2056 only - Apr 22 2:00 1:00 S +Rule Palestine 2057 only - Apr 7 2:00 1:00 S +Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S +Rule Palestine 2068 only - Oct 20 2:00 0 - +Rule Palestine 2069 only - Oct 12 2:00 0 - +Rule Palestine 2070 only - Oct 4 2:00 0 - +Rule Palestine 2071 only - Sep 19 2:00 0 - +Rule Palestine 2072 only - Sep 10 2:00 0 - +Rule Palestine 2072 only - Oct 15 2:00 1:00 S +Rule Palestine 2072 max - Oct Sat<=30 2:00 0 - +Rule Palestine 2073 only - Sep 2 2:00 0 - +Rule Palestine 2073 only - Oct 7 2:00 1:00 S +Rule Palestine 2074 only - Aug 18 2:00 0 - +Rule Palestine 2074 only - Sep 29 2:00 1:00 S +Rule Palestine 2075 only - Aug 10 2:00 0 - +Rule Palestine 2075 only - Sep 14 2:00 1:00 S +Rule Palestine 2076 only - Jul 25 2:00 0 - +Rule Palestine 2076 only - Sep 5 2:00 1:00 S +Rule Palestine 2077 only - Jul 17 2:00 0 - +Rule Palestine 2077 only - Aug 28 2:00 1:00 S +Rule Palestine 2078 only - Jul 9 2:00 0 - +Rule Palestine 2078 only - Aug 13 2:00 1:00 S +Rule Palestine 2079 only - Jun 24 2:00 0 - +Rule Palestine 2079 only - Aug 5 2:00 1:00 S +Rule Palestine 2080 only - Jun 15 2:00 0 - +Rule Palestine 2080 only - Jul 20 2:00 1:00 S +Rule Palestine 2081 only - Jun 7 2:00 0 - +Rule Palestine 2081 only - Jul 12 2:00 1:00 S +Rule Palestine 2082 only - May 23 2:00 0 - +Rule Palestine 2082 only - Jul 4 2:00 1:00 S +Rule Palestine 2083 only - May 15 2:00 0 - +Rule Palestine 2083 only - Jun 19 2:00 1:00 S +Rule Palestine 2084 only - Apr 29 2:00 0 - +Rule Palestine 2084 only - Jun 10 2:00 1:00 S +Rule Palestine 2085 only - Apr 21 2:00 0 - +Rule Palestine 2085 only - Jun 2 2:00 1:00 S +Rule Palestine 2086 only - Apr 13 2:00 0 - +Rule Palestine 2086 only - May 18 2:00 1:00 S # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Asia/Gaza 2:17:52 - LMT 1900 Oct @@ -3632,7 +3782,7 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1 # standard time is SLST. # # From Paul Eggert (2016-10-18): -# "SLST" seems to be reasonably recent and rarely-used outside time +# "SLST" seems to be reasonably recent and rarely used outside time # zone nerd sources. I searched Google News and found three uses of # it in the International Business Times of India in February and # March of this year when discussing cricket match times, but nothing diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/australasia b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/australasia index af0410ab..dc98c1e2 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/australasia +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/australasia @@ -323,7 +323,7 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov # From Steffen Thorsen (2013-01-10): # Fiji will end DST on 2014-01-19 02:00: -# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx +# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-(1).aspx # From Ken Rylander (2014-10-20): # DST will start Nov. 2 this year. @@ -391,8 +391,14 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov # Please note that there will not be any daylight savings time change # in Fiji for 2022-2023.... # https://www.facebook.com/FijianGovernment/posts/pfbid0mmWVTYmTibn66ybpFda75pDcf34SSpoSaskJW5gXwaKo5Sgc7273Q4fXWc6kQV6Hl + +# From Almaz Mingaleev (2023-10-06): +# Cabinet approved the suspension of Daylight Saving and appropriate +# legislative changes will be considered including the repeal of the +# Daylight Saving Act 1998 +# https://www.fiji.gov.fj/Media-Centre/Speeches/English/CABINET-DECISIONS-3-OCTOBER-2023 # -# From Paul Eggert (2022-10-27): +# From Paul Eggert (2023-10-06): # For now, assume DST is suspended indefinitely. # Rule NAME FROM TO - IN ON AT SAVE LETTER/S @@ -723,7 +729,7 @@ Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5 # # Samoa's Daylight Saving Time Act 2009 is available here, but does not # contain any dates: -# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf +# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20(English)%20-%20Final%207-7-091.pdf # From Laupue Raymond Hughes (2010-10-07): # Please see @@ -1808,7 +1814,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # period. It would probably be reasonable to assume Guam use GMT+9 during # that period of time like the surrounding area. -# From Paul Eggert (2018-11-18): +# From Paul Eggert (2023-01-23): # Howse writes (p 153) "The Spaniards, on the other hand, reached the # Philippines and the Ladrones from America," and implies that the Ladrones # (now called the Marianas) kept American date for quite some time. @@ -1821,7 +1827,7 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # they did as that avoids the need for a separate zone due to our 1970 cutoff. # # US Public Law 106-564 (2000-12-23) made UT +10 the official standard time, -# under the name "Chamorro Standard Time". There is no official abbreviation, +# under the name "Chamorro standard time". There is no official abbreviation, # but Congressman Robert A. Underwood, author of the bill that became law, # wrote in a press release (2000-12-27) that he will seek the use of "ChST". @@ -2199,24 +2205,18 @@ Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila # an international standard, there are some places on the high seas where the # correct date is ambiguous. -# From Wikipedia <https://en.wikipedia.org/wiki/Time_zone> (2005-08-31): -# Before 1920, all ships kept local apparent time on the high seas by setting -# their clocks at night or at the morning sight so that, given the ship's -# speed and direction, it would be 12 o'clock when the Sun crossed the ship's -# meridian (12 o'clock = local apparent noon). During 1917, at the -# Anglo-French Conference on Time-keeping at Sea, it was recommended that all -# ships, both military and civilian, should adopt hourly standard time zones -# on the high seas. Whenever a ship was within the territorial waters of any -# nation it would use that nation's standard time. The captain was permitted -# to change his ship's clocks at a time of his choice following his ship's -# entry into another zone time - he often chose midnight. These zones were -# adopted by all major fleets between 1920 and 1925 but not by many -# independent merchant ships until World War II. - -# From Paul Eggert, using references suggested by Oscar van Vlijmen -# (2005-03-20): -# -# The American Practical Navigator (2002) -# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187 -# talks only about the 180-degree meridian with respect to ships in -# international waters; it ignores the international date line. +# From Wikipedia <https://en.wikipedia.org/wiki/Nautical_time> (2023-01-23): +# The nautical time zone system is analogous to the terrestrial time zone +# system for use on high seas. Under the system time changes are required for +# changes of longitude in one-hour steps. The one-hour step corresponds to a +# time zone width of 15° longitude. The 15° gore that is offset from GMT or +# UT1 (not UTC) by twelve hours is bisected by the nautical date line into two +# 7°30' gores that differ from GMT by ±12 hours. A nautical date line is +# implied but not explicitly drawn on time zone maps. It follows the 180th +# meridian except where it is interrupted by territorial waters adjacent to +# land, forming gaps: it is a pole-to-pole dashed line. + +# From Paul Eggert (2023-01-23): +# The American Practical Navigator <https://msi.nga.mil/Publications/APN>, +# 2019 edition, merely says that the International Date Line +# "coincides with the 180th meridian over most of its length." diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/backward b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/backward index 0ae5d741..65c711b3 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/backward +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/backward @@ -205,7 +205,6 @@ Link America/Puerto_Rico America/Tortola Link Pacific/Port_Moresby Antarctica/DumontDUrville Link Pacific/Auckland Antarctica/McMurdo Link Asia/Riyadh Antarctica/Syowa -Link Asia/Urumqi Antarctica/Vostok Link Europe/Berlin Arctic/Longyearbyen Link Asia/Riyadh Asia/Aden Link Asia/Qatar Asia/Bahrain @@ -274,6 +273,7 @@ Link America/Argentina/Cordoba America/Rosario Link America/Tijuana America/Santa_Isabel Link America/Denver America/Shiprock Link America/Toronto America/Thunder_Bay +Link America/Edmonton America/Yellowknife Link Pacific/Auckland Antarctica/South_Pole Link Asia/Shanghai Asia/Chongqing Link Asia/Shanghai Asia/Harbin diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/europe b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/europe index be94281a..5533d65f 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/europe +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/europe @@ -517,9 +517,7 @@ Zone Europe/London -0:01:15 - LMT 1847 Dec 1 # other form with a traditional approximation for Irish timestamps # after 1971-10-31 02:00 UTC; although this approximation has tm_isdst # flags that are reversed, its UTC offsets are correct and this often -# suffices. This source file currently uses only nonnegative SAVE -# values, but this is intended to change and downstream code should -# not rely on it. +# suffices.... # # The following is like GB-Eire and EU, except with standard time in # summer and negative daylight saving time in winter. It is for when @@ -1113,19 +1111,35 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn # # From Jürgen Appel (2022-11-25): # https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022 -# If I understand this correctly, from the next planned switch to -# summer time, Greenland will permanently stay at that time, i.e. no -# switch back to winter time in 2023 will occur. -# -# From Paul Eggert (2022-11-28): -# The official document in Danish -# https://naalakkersuisut.gl/-/media/naalakkersuisut/filer/kundgoerelser/2022/11/2511/31_da_inatsisartutlov-om-tidens-bestemmelse.pdf?la=da&hash=A33597D8A38CC7038465241119EF34F3 -# says standard time for Greenland is -02, that Naalakkersuisut can lay down -# rules for DST and can require some areas to use a different time zone, -# and that this all takes effect 2023-03-25 22:00. The abovementioned -# "bekymringer" URL says the intent is no transition March 25, that -# Greenland will not go back to winter time in fall 2023, and that -# only America/Nuuk is affected (though further changes may occur). +# +# From Thomas M. Steenholdt (2022-12-02): +# - The bill to move America/Nuuk from UTC-03 to UTC-02 passed. +# - The bill to stop observing DST did not (Greenland will stop observing DST +# when EU does). +# Details on the implementation are here (section 6): +# https://ina.gl/dvd/EM%202022/pdf/media/2553529/pkt17_em2022_tidens_bestemmelse_bem_da.pdf +# This is how the change will be implemented: +# 1. The shift *to* DST in 2023 happens as normal. +# 2. The shift *from* DST in 2023 happens as normal, but coincides with the +# shift to UTC-02 normaltime (people will not change their clocks here). +# 3. After this, DST is still observed, but as -02/-01 instead of -03/-02. +# +# From Múte Bourup Egede via Jógvan Svabo Samuelsen (2023-03-15): +# Greenland will not switch to Daylight Saving Time this year, 2023, +# because the standard time for Greenland will change from UTC -3 to UTC -2. +# However, Greenland will change to Daylight Saving Time again in 2024 +# and onwards. + +# From a contributor who wishes to remain anonymous for now (2023-10-29): +# https://www.dr.dk/nyheder/seneste/i-nat-skal-uret-stilles-en-time-tilbage-men-foerste-gang-sker-det-ikke-i-groenland +# with a link to that page: +# https://naalakkersuisut.gl/Nyheder/2023/10/2710_sommertid +# ... Ittoqqortoormiit joins the time of Nuuk at March 2024. +# What would mean that America/Scoresbysund would either be in -01 year round +# or in -02/-01 like America/Nuuk, but no longer in -01/+00. +# +# From Paul Eggert (2023-10-29): +# For now, assume it will be like America/Nuuk. # Rule NAME FROM TO - IN ON AT SAVE LETTER/S Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D @@ -1146,11 +1160,13 @@ Zone America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28 Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit -2:00 - -02 1980 Apr 6 2:00 -2:00 C-Eur -02/-01 1981 Mar 29 - -1:00 EU -01/+00 + -1:00 EU -01/+00 2024 Mar 31 + -2:00 EU -02/-01 Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb -3:00 - -03 1980 Apr 6 2:00 - -3:00 EU -03/-02 2023 Mar 25 22:00 - -2:00 - -02 + -3:00 EU -03/-02 2023 Mar 26 1:00u + -2:00 - -02 2023 Oct 29 1:00u + -2:00 EU -02/-01 Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik -4:00 Thule A%sT @@ -1486,9 +1502,9 @@ Zone Europe/Paris 0:09:21 - LMT 1891 Mar 16 Rule Germany 1946 only - Apr 14 2:00s 1:00 S Rule Germany 1946 only - Oct 7 2:00s 0 - Rule Germany 1947 1949 - Oct Sun>=1 2:00s 0 - -# http://www.ptb.de/de/org/4/44/441/salt.htm says the following transition -# occurred at 3:00 MEZ, not the 2:00 MEZ given in Shanks & Pottenger. -# Go with the PTB. +# https://www.ptb.de/cms/en/ptb/fachabteilungen/abt4/fb-44/ag-441/realisation-of-legal-time-in-germany/dst-and-midsummer-dst-in-germany-until-1979.html +# says the following transition occurred at 3:00 MEZ, not the 2:00 MEZ +# given in Shanks & Pottenger. Go with the PTB. Rule Germany 1947 only - Apr 6 3:00s 1:00 S Rule Germany 1947 only - May 11 2:00s 2:00 M Rule Germany 1947 only - Jun 29 3:00 1:00 S @@ -2249,7 +2265,7 @@ Zone Europe/Bucharest 1:44:24 - LMT 1891 Oct # the State Duma has approved ... the draft bill on returning to # winter time standard and return Russia 11 time zones. The new # regulations will come into effect on October 26, 2014 at 02:00 ... -# http://asozd2.duma.gov.ru/main.nsf/%28Spravka%29?OpenAgent&RN=431985-6&02 +# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=431985-6&02 # Here is a link where we put together table (based on approved Bill N # 431985-6) with proposed 11 Russian time zones and corresponding # areas/cities/administrative centers in the Russian Federation (in English): @@ -2659,13 +2675,13 @@ Zone Europe/Volgograd 2:57:40 - LMT 1920 Jan 3 3:00 - +03 1930 Jun 21 4:00 - +04 1961 Nov 11 4:00 Russia +04/+05 1988 Mar 27 2:00s - 3:00 Russia +03/+04 1991 Mar 31 2:00s + 3:00 Russia MSK/MSD 1991 Mar 31 2:00s 4:00 - +04 1992 Mar 29 2:00s - 3:00 Russia +03/+04 2011 Mar 27 2:00s - 4:00 - +04 2014 Oct 26 2:00s - 3:00 - +03 2018 Oct 28 2:00s + 3:00 Russia MSK/MSD 2011 Mar 27 2:00s + 4:00 - MSK 2014 Oct 26 2:00s + 3:00 - MSK 2018 Oct 28 2:00s 4:00 - +04 2020 Dec 27 2:00s - 3:00 - +03 + 3:00 - MSK # From Paul Eggert (2016-11-11): # Europe/Saratov covers: @@ -2696,11 +2712,11 @@ Zone Europe/Saratov 3:04:18 - LMT 1919 Jul 1 0:00u Zone Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0:00u 3:00 - +03 1930 Jun 21 4:00 Russia +04/+05 1989 Mar 26 2:00s - 3:00 Russia +03/+04 1991 Mar 31 2:00s + 3:00 Russia MSK/MSD 1991 Mar 31 2:00s 4:00 - +04 1992 Mar 29 2:00s - 3:00 Russia +03/+04 2011 Mar 27 2:00s - 4:00 - +04 2014 Oct 26 2:00s - 3:00 - +03 + 3:00 Russia MSK/MSD 2011 Mar 27 2:00s + 4:00 - MSK 2014 Oct 26 2:00s + 3:00 - MSK # From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25): # Europe/Samara covers... @@ -3714,11 +3730,7 @@ Zone Europe/Istanbul 1:55:52 - LMT 1880 # and not at 3:00 as would have been under EU rules. # This is why I have set the change to EU rules into May 1996, # so that the change in March is stil covered by the Ukraine rule. -# The next change in October 1996 happened under EU rules.... -# TZ database holds three other zones for Ukraine.... I have not yet -# worked out the consequences for these three zones, as we (me and my -# US colleague David Cochrane) are still trying to get more -# information upon these local deviations from Kiev rules. +# The next change in October 1996 happened under EU rules. # # From Paul Eggert (2022-08-27): # For now, assume that Ukraine's zones all followed the same rules, diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/leapseconds b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/leapseconds index 6826ac4a..8938c763 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/leapseconds +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/leapseconds @@ -72,11 +72,11 @@ Leap 2016 Dec 31 23:59:60 + S # Any additional leap seconds will come after this. # This Expires line is commented out for now, # so that pre-2020a zic implementations do not reject this file. -#Expires 2023 Jun 28 00:00:00 +#Expires 2024 Jun 28 00:00:00 # POSIX timestamps for the data in this file: #updated 1467936000 (2016-07-08 00:00:00 UTC) -#expires 1687910400 (2023-06-28 00:00:00 UTC) +#expires 1719532800 (2024-06-28 00:00:00 UTC) -# Updated through IERS Bulletin C64 -# File expires on: 28 June 2023 +# Updated through IERS Bulletin C66 +# File expires on: 28 June 2024 diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/northamerica b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/northamerica index d50581d0..8ac106ab 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/northamerica +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/northamerica @@ -276,9 +276,10 @@ Zone PST8PDT -8:00 US P%sT # -10 Standard Alaska Time (AST) Alaska-Hawaii standard time (AHST) # -11 (unofficial) Nome (NST) Bering standard time (BST) # -# From Paul Eggert (2000-01-08), following a heads-up from Rives McDow: -# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time" +# From Paul Eggert (2023-01-23), from a 2001-01-08 heads-up from Rives McDow: +# Public law 106-564 (2000-12-23) introduced "Chamorro standard time" # for time in Guam and the Northern Marianas. See the file "australasia". +# Also see 15 U.S.C. §263 <https://www.law.cornell.edu/uscode/text/15/263>. # # From Paul Eggert (2015-04-17): # HST and HDT are standardized abbreviations for Hawaii-Aleutian @@ -595,7 +596,7 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u # local times of other Alaskan locations so that they change simultaneously. # From Paul Eggert (2014-07-18): -# One opinion of the early-1980s turmoil in Alaska over time zones and +# One opinion of the early 1980s turmoil in Alaska over time zones and # daylight saving time appeared as graffiti on a Juneau airport wall: # "Welcome to Juneau. Please turn your watch back to the 19th century." # See: Turner W. Alaska's four time zones now two. NY Times 1983-11-01. @@ -667,6 +668,10 @@ Zone America/Los_Angeles -7:52:58 - LMT 1883 Nov 18 20:00u # So they won't be waiting for Alaska to join them on 2019-03-10, but will # rather change their clocks twice in seven weeks. +# From Paul Eggert (2023-01-23): +# America/Adak is for the Aleutian Islands that are part of Alaska +# and are west of 169.5° W. + # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone America/Juneau 15:02:19 - LMT 1867 Oct 19 15:33:32 -8:57:41 - LMT 1900 Aug 20 12:00 @@ -1448,7 +1453,7 @@ Rule StJohns 1989 2006 - Apr Sun>=1 0:01 1:00 D Rule StJohns 2007 2011 - Mar Sun>=8 0:01 1:00 D Rule StJohns 2007 2010 - Nov Sun>=1 0:01 0 S # -# St John's has an apostrophe, but Posix file names can't have apostrophes. +# St John's has an apostrophe, but POSIX file names can't have apostrophes. # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone America/St_Johns -3:30:52 - LMT 1884 -3:30:52 StJohns N%sT 1918 @@ -2125,10 +2130,6 @@ Zone America/Fort_Nelson -8:10:47 - LMT 1884 # Nunavut ... moved ... to incorporate the whole territory into one time zone. # Nunavut moves to single time zone Oct. 31 # http://www.nunatsiaq.com/nunavut/nvt90903_13.html -# -# From Antoine Leca (1999-09-06): -# We then need to create a new timezone for the Kitikmeot region of Nunavut -# to differentiate it from the Yellowknife region. # From Paul Eggert (1999-09-20): # Basic Facts: The New Territory @@ -2322,9 +2323,6 @@ Zone America/Cambridge_Bay 0 - -00 1920 # trading post est.? -5:00 - EST 2000 Nov 5 0:00 -6:00 - CST 2001 Apr 1 3:00 -7:00 Canada M%sT -Zone America/Yellowknife 0 - -00 1935 # Yellowknife founded? - -7:00 NT_YK M%sT 1980 - -7:00 Canada M%sT Zone America/Inuvik 0 - -00 1953 # Inuvik founded -8:00 NT_YK P%sT 1979 Apr lastSun 2:00 -7:00 NT_YK M%sT 1980 @@ -2561,7 +2559,7 @@ Zone America/Dawson -9:17:40 - LMT 1900 Aug 20 # and in addition changes all of Chihuahua to -06 with no DST. # From Heitor David Pinto (2022-11-28): -# Now the northern municipalities want to have the same time zone as the +# Now the northern [municipios] want to have the same time zone as the # respective neighboring cities in the US, for example Juárez in UTC-7 with # DST, matching El Paso, and Ojinaga in UTC-6 with DST, matching Presidio.... # the president authorized the publication of the decree for November 29, @@ -2598,7 +2596,7 @@ Zone America/Merida -5:58:28 - LMT 1922 Jan 1 6:00u -5:00 - EST 1982 Dec 2 -6:00 Mexico C%sT # Coahuila, Nuevo León, Tamaulipas (near US border) -# This includes the following municipalities: +# This includes the following municipios: # in Coahuila: Acuña, Allende, Guerrero, Hidalgo, Jiménez, Morelos, Nava, # Ocampo, Piedras Negras, Villa Unión, Zaragoza # in Nuevo León: Anáhuac @@ -2624,8 +2622,8 @@ Zone America/Mexico_City -6:36:36 - LMT 1922 Jan 1 7:00u -6:00 - CST 2002 Feb 20 -6:00 Mexico C%sT # Chihuahua (near US border - western side) -# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe, -# and Práxedis G Guerrero. +# This includes the municipios of Janos, Ascensión, Juárez, Guadalupe, and +# Práxedis G Guerrero. # http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u -7:00 - MST 1927 Jun 10 23:00 @@ -2639,7 +2637,8 @@ Zone America/Ciudad_Juarez -7:05:56 - LMT 1922 Jan 1 7:00u -6:00 - CST 2022 Nov 30 0:00 -7:00 US M%sT # Chihuahua (near US border - eastern side) -# The municipalities of Coyame del Sotol, Ojinaga, and Manuel Benavides. +# This includes the municipios of Coyame del Sotol, Ojinaga, and Manuel +# Benavides. # http://gaceta.diputados.gob.mx/PDF/65/2a022/nov/20221124-VII.pdf Zone America/Ojinaga -6:57:40 - LMT 1922 Jan 1 7:00u -7:00 - MST 1927 Jun 10 23:00 @@ -3060,7 +3059,7 @@ Zone America/Costa_Rica -5:36:13 - LMT 1890 # San José # # He supplied these references: # -# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES +# http://www.prensalatina.com.mx/article.asp?ID={4CC32C1B-A9F7-42FB-8A07-8631AFC923AF}&language=ES # http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm # # From Alex Krivenyshev (2007-10-25): diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/southamerica b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/southamerica index 87b71d5f..19c7e456 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/southamerica +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/southamerica @@ -208,7 +208,7 @@ Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 - # Hora de verano para la República Argentina # http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html # says that standard time in Argentina from 1894-10-31 -# to 1920-05-01 was -4:16:48.25. Go with this more-precise value +# to 1920-05-01 was -4:16:48.25. Go with this more precise value # over Shanks & Pottenger. It is upward compatible with Milne, who # says Córdoba time was -4:16:48.2. @@ -1697,6 +1697,12 @@ Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - # From Carlos Raúl Perasso (2014-02-28): # Decree 1264 can be found at: # http://www.presidencia.gov.py/archivos/documentos/DECRETO1264_ey9r8zai.pdf +# +# From Paul Eggert (2023-07-26): +# Transition dates are now set by Law No. 7115, not by presidential decree. +# https://www.abc.com.py/politica/2023/07/12/promulgacion-el-cambio-de-hora-sera-por-ley/ +# From Carlos Raúl Perasso (2023-07-27): +# http://silpy.congreso.gov.py/descarga/ley-144138 Rule Para 2013 max - Mar Sun>=22 0:00 0 - # Zone NAME STDOFF RULES FORMAT [UNTIL] diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/tzdb-version.txt b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/tzdb-version.txt index b74fa117..cd9c3f6d 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/tzdb-version.txt +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/tzdb-version.txt @@ -1 +1 @@ -2022g +2023d diff --git a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/zone.tab b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/zone.tab index 6e5adb9f..3fa9306a 100644 --- a/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/zone.tab +++ b/tools/cldr-code/src/main/resources/org/unicode/cldr/util/data/zone.tab @@ -48,7 +48,7 @@ AR -3124-06411 America/Argentina/Cordoba Argentina (most areas: CB, CC, CN, ER, AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucuman (TM) -AR -2828-06547 America/Argentina/Catamarca Catamarca (CT); Chubut (CH) +AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH) AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR) AR -3132-06831 America/Argentina/San_Juan San Juan (SJ) AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ) @@ -87,7 +87,7 @@ BN +0456+11455 Asia/Brunei BO -1630-06809 America/La_Paz BQ +120903-0681636 America/Kralendijk BR -0351-03225 America/Noronha Atlantic islands -BR -0127-04829 America/Belem Para (east); Amapa +BR -0127-04829 America/Belem Para (east), Amapa BR -0343-03830 America/Fortaleza Brazil (northeast: MA, PI, CE, RN, PB) BR -0803-03454 America/Recife Pernambuco BR -0712-04812 America/Araguaina Tocantins @@ -107,23 +107,22 @@ BT +2728+08939 Asia/Thimphu BW -2439+02555 Africa/Gaborone BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland; Labrador (southeast) -CA +4439-06336 America/Halifax Atlantic - NS (most areas); PE +CA +4734-05243 America/St_Johns Newfoundland, Labrador (SE) +CA +4439-06336 America/Halifax Atlantic - NS (most areas), PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) CA +5125-05707 America/Blanc-Sablon AST - QC (Lower North Shore) -CA +4339-07923 America/Toronto Eastern - ON, QC (most areas) +CA +4339-07923 America/Toronto Eastern - ON & QC (most areas) CA +6344-06828 America/Iqaluit Eastern - NU (most areas) -CA +484531-0913718 America/Atikokan EST - ON (Atikokan); NU (Coral H) -CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba +CA +484531-0913718 America/Atikokan EST - ON (Atikokan), NU (Coral H) +CA +4953-09709 America/Winnipeg Central - ON (west), Manitoba CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) -CA +5333-11328 America/Edmonton Mountain - AB; BC (E); SK (W) +CA +5333-11328 America/Edmonton Mountain - AB, BC(E), NT(E), SK(W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) -CA +6227-11421 America/Yellowknife Mountain - NT (central) CA +682059-1334300 America/Inuvik Mountain - NT (west) CA +4906-11631 America/Creston MST - BC (Creston) CA +5546-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) @@ -139,7 +138,7 @@ CG -0416+01517 Africa/Brazzaville CH +4723+00832 Europe/Zurich CI +0519-00402 Africa/Abidjan CK -2114-15946 Pacific/Rarotonga -CL -3327-07040 America/Santiago Chile (most areas) +CL -3327-07040 America/Santiago most of Chile CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island CM +0403+00942 Africa/Douala @@ -151,10 +150,10 @@ CU +2308-08222 America/Havana CV +1455-02331 Atlantic/Cape_Verde CW +1211-06900 America/Curacao CX -1025+10543 Indian/Christmas -CY +3510+03322 Asia/Nicosia Cyprus (most areas) +CY +3510+03322 Asia/Nicosia most of Cyprus CY +3507+03357 Asia/Famagusta Northern Cyprus CZ +5005+01426 Europe/Prague -DE +5230+01322 Europe/Berlin Germany (most areas) +DE +5230+01322 Europe/Berlin most of Germany DE +4742+00841 Europe/Busingen Busingen DJ +1136+04309 Africa/Djibouti DK +5540+01235 Europe/Copenhagen @@ -187,7 +186,7 @@ GF +0456-05220 America/Cayenne GG +492717-0023210 Europe/Guernsey GH +0533-00013 Africa/Accra GI +3608-00521 Europe/Gibraltar -GL +6411-05144 America/Nuuk Greenland (most areas) +GL +6411-05144 America/Nuuk most of Greenland GL +7646-01840 America/Danmarkshavn National Park (east coast) GL +7029-02158 America/Scoresbysund Scoresbysund/Ittoqqortoormiit GL +7634-06847 America/Thule Thule/Pituffik @@ -208,8 +207,8 @@ HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest ID -0610+10648 Asia/Jakarta Java, Sumatra ID -0002+10920 Asia/Pontianak Borneo (west, central) -ID -0507+11924 Asia/Makassar Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west) -ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya); Malukus/Moluccas +ID -0507+11924 Asia/Makassar Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west) +ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya), Malukus/Moluccas IE +5320-00615 Europe/Dublin IL +314650+0351326 Asia/Jerusalem IM +5409-00428 Europe/Isle_of_Man @@ -235,7 +234,7 @@ KP +3901+12545 Asia/Pyongyang KR +3733+12658 Asia/Seoul KW +2920+04759 Asia/Kuwait KY +1918-08123 America/Cayman -KZ +4315+07657 Asia/Almaty Kazakhstan (most areas) +KZ +4315+07657 Asia/Almaty most of Kazakhstan KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay KZ +5017+05710 Asia/Aqtobe Aqtobe/Aktobe @@ -259,12 +258,12 @@ MD +4700+02850 Europe/Chisinau ME +4226+01916 Europe/Podgorica MF +1804-06305 America/Marigot MG -1855+04731 Indian/Antananarivo -MH +0709+17112 Pacific/Majuro Marshall Islands (most areas) +MH +0709+17112 Pacific/Majuro most of Marshall Islands MH +0905+16720 Pacific/Kwajalein Kwajalein MK +4159+02126 Europe/Skopje ML +1239-00800 Africa/Bamako MM +1647+09610 Asia/Yangon -MN +4755+10653 Asia/Ulaanbaatar Mongolia (most areas) +MN +4755+10653 Asia/Ulaanbaatar most of Mongolia MN +4801+09139 Asia/Hovd Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan MN +4804+11430 Asia/Choibalsan Dornod, Sukhbaatar MO +221150+1133230 Asia/Macau @@ -302,7 +301,7 @@ NO +5955+01045 Europe/Oslo NP +2743+08519 Asia/Kathmandu NR -0031+16655 Pacific/Nauru NU -1901-16955 Pacific/Niue -NZ -3652+17446 Pacific/Auckland New Zealand (most areas) +NZ -3652+17446 Pacific/Auckland most of New Zealand NZ -4357-17633 Pacific/Chatham Chatham Islands OM +2336+05835 Asia/Muscat PA +0858-07932 America/Panama @@ -310,7 +309,7 @@ PE -1203-07703 America/Lima PF -1732-14934 Pacific/Tahiti Society Islands PF -0900-13930 Pacific/Marquesas Marquesas Islands PF -2308-13457 Pacific/Gambier Gambier Islands -PG -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas) +PG -0930+14710 Pacific/Port_Moresby most of Papua New Guinea PG -0613+15534 Pacific/Bougainville Bougainville PH +1435+12100 Asia/Manila PK +2452+06703 Asia/Karachi @@ -356,7 +355,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+08 - Magadan RU +4658+14242 Asia/Sakhalin MSK+08 - Sakhalin Island -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); North Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E), N Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea RW -0157+03004 Africa/Kigali @@ -397,7 +396,7 @@ TT +1039-06131 America/Port_of_Spain TV -0831+17913 Pacific/Funafuti TW +2503+12130 Asia/Taipei TZ -0648+03917 Africa/Dar_es_Salaam -UA +5026+03031 Europe/Kyiv Ukraine (most areas) +UA +5026+03031 Europe/Kyiv most of Ukraine UG +0019+03225 Africa/Kampala UM +2813-17722 Pacific/Midway Midway Islands UM +1917+16637 Pacific/Wake Wake Island @@ -419,8 +418,8 @@ US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) -US +433649-1161209 America/Boise Mountain - ID (south); OR (east) -US +332654-1120424 America/Phoenix MST - Arizona (except Navajo) +US +433649-1161209 America/Boise Mountain - ID (south), OR (east) +US +332654-1120424 America/Phoenix MST - AZ (except Navajo) US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) US +581807-1342511 America/Juneau Alaska - Juneau area @@ -428,7 +427,7 @@ US +571035-1351807 America/Sitka Alaska - Sitka area US +550737-1313435 America/Metlakatla Alaska - Annette Island US +593249-1394338 America/Yakutat Alaska - Yakutat US +643004-1652423 America/Nome Alaska (west) -US +515248-1763929 America/Adak Aleutian Islands +US +515248-1763929 America/Adak Alaska - western Aleutians US +211825-1575130 Pacific/Honolulu Hawaii UY -345433-0561245 America/Montevideo UZ +3940+06648 Asia/Samarkand Uzbekistan (west) diff --git a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCoverageLevel.java b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCoverageLevel.java index 699d2bca..492e62ac 100644 --- a/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCoverageLevel.java +++ b/tools/cldr-code/src/test/java/org/unicode/cldr/unittest/TestCoverageLevel.java @@ -376,11 +376,57 @@ public class TestCoverageLevel extends TestFmwkPlus { * We filter out the things we know about and have determined are OK to be in comprehensive. * If we add a path that doesn't get its coverage set, this test should complain about it. */ - final ImmutableSet<String> inactiveMetazones = ImmutableSet.of("Bering", "Dominican", "Shevchenko", "Alaska_Hawaii", "Yerevan", - "Africa_FarWestern", "British", "Sverdlovsk", "Karachi", "Malaya", "Oral", "Frunze", "Dutch_Guiana", "Irish", "Uralsk", "Tashkent", "Kwajalein", - "Ashkhabad", "Kizilorda", "Kuybyshev", "Baku", "Dushanbe", "Goose_Bay", "Liberia", "Samarkand", "Tbilisi", "Borneo", "Greenland_Central", - "Dacca", "Aktyubinsk", "Turkey", "Urumqi", "Acre", "Almaty", "Anadyr", "Aqtau", "Aqtobe", "Kamchatka", "Macau", "Qyzylorda", "Samara", - "Casey", "Guam", "Lanka", "North_Mariana"); + final ImmutableSet<String> inactiveMetazones = + ImmutableSet.of( + "Greenland", // TODO: New metazone added for tz2023d update, + // In CLDR 45, we don't want to include this one in modern coverage because + // we don't open ST for translating display names for this metazone. + // After 45, we will include "Greenland" in modern coverage. + "Bering", + "Dominican", + "Shevchenko", + "Alaska_Hawaii", + "Yerevan", + "Africa_FarWestern", + "British", + "Sverdlovsk", + "Karachi", + "Malaya", + "Oral", + "Frunze", + "Dutch_Guiana", + "Irish", + "Uralsk", + "Tashkent", + "Kwajalein", + "Ashkhabad", + "Kizilorda", + "Kuybyshev", + "Baku", + "Dushanbe", + "Goose_Bay", + "Liberia", + "Samarkand", + "Tbilisi", + "Borneo", + "Greenland_Central", + "Dacca", + "Aktyubinsk", + "Turkey", + "Urumqi", + "Acre", + "Almaty", + "Anadyr", + "Aqtau", + "Aqtobe", + "Kamchatka", + "Macau", + "Qyzylorda", + "Samara", + "Casey", + "Guam", + "Lanka", + "North_Mariana"); final Pattern calendar100 = PatternCache.get("(coptic|ethiopic-amete-alem|islamic-(rgsa|tbla|umalqura))"); |