Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CLDR-17111 Deprecate old style zone IDs (e.g. EST5EDT) and make them … #3736

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions common/bcp47/timezone.xml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="cnurc" description="Ürümqi, China" alias="Asia/Urumqi Asia/Kashgar"/>
<type name="cobog" description="Bogotá, Colombia" alias="America/Bogota"/>
<type name="crsjo" description="Costa Rica" alias="America/Costa_Rica"/>
<type name="cst6cdt" description="POSIX style time zone for US Central Time" alias="CST6CDT" since="1.8"/>
<type name="cst6cdt" description="POSIX style time zone for US Central Time" deprecated="true" preferred="uschi"/>
<type name="cuhav" description="Havana, Cuba" alias="America/Havana Cuba"/>
<type name="cvrai" description="Cape Verde" alias="Atlantic/Cape_Verde"/>
<type name="cxxch" description="Christmas Island" alias="Indian/Christmas"/>
Expand All @@ -162,9 +162,9 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="eheai" description="El Aaiún, Western Sahara" alias="Africa/El_Aaiun"/>
<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="eslpa" description="Canary Islands, Spain" alias="Atlantic/Canary WET"/>
<type name="esmad" description="Madrid, Spain" alias="Europe/Madrid"/>
<type name="est5edt" description="POSIX style time zone for US Eastern Time" alias="EST5EDT" since="1.8"/>
<type name="est5edt" description="POSIX style time zone for US Eastern Time" deprecated="true" preferred="usnyc"/>
<type name="etadd" description="Addis Ababa, Ethiopia" alias="Africa/Addis_Ababa"/>
<type name="fihel" description="Helsinki, Finland" alias="Europe/Helsinki"/>
<type name="fimhq" description="Mariehamn, Åland, Finland" alias="Europe/Mariehamn"/>
Expand All @@ -174,7 +174,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<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="frpar" description="Paris, France" alias="Europe/Paris CET MET"/>
<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" since="40"/>
Expand Down Expand Up @@ -273,7 +273,7 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="mqfdf" description="Martinique" alias="America/Martinique"/>
<type name="mrnkc" description="Nouakchott, Mauritania" alias="Africa/Nouakchott"/>
<type name="msmni" description="Montserrat" alias="America/Montserrat"/>
<type name="mst7mdt" description="POSIX style time zone for US Mountain Time" alias="MST7MDT" since="1.8"/>
<type name="mst7mdt" description="POSIX style time zone for US Mountain Time" deprecated="true" preferred="usden"/>
<type name="mtmla" description="Malta" alias="Europe/Malta"/>
<type name="muplu" description="Mauritius" alias="Indian/Mauritius"/>
<type name="mvmle" description="Maldives" alias="Indian/Maldives"/>
Expand Down Expand Up @@ -321,15 +321,15 @@ For terms of use, see http://www.unicode.org/copyright.html
<type name="pmmqc" description="Saint Pierre and Miquelon" alias="America/Miquelon"/>
<type name="pnpcn" description="Pitcairn Islands" alias="Pacific/Pitcairn"/>
<type name="prsju" description="Puerto Rico" alias="America/Puerto_Rico"/>
<type name="pst8pdt" description="POSIX style time zone for US Pacific Time" alias="PST8PDT" since="1.8"/>
<type name="pst8pdt" description="POSIX style time zone for US Pacific Time" deprecated="true" preferred="uslax"/>
<type name="ptfnc" description="Madeira, Portugal" alias="Atlantic/Madeira"/>
<type name="ptlis" description="Lisbon, Portugal" alias="Europe/Lisbon Portugal"/>
<type name="ptpdl" description="Azores, Portugal" alias="Atlantic/Azores"/>
<type name="pwror" description="Palau" alias="Pacific/Palau"/>
<type name="pyasu" description="Asunción, Paraguay" alias="America/Asuncion"/>
<type name="qadoh" description="Qatar" alias="Asia/Qatar"/>
<type name="rereu" description="Réunion" alias="Indian/Reunion"/>
<type name="robuh" description="Bucharest, Romania" alias="Europe/Bucharest"/>
<type name="robuh" description="Bucharest, Romania" alias="Europe/Bucharest EET"/>
<type name="rsbeg" description="Belgrade, Serbia" alias="Europe/Belgrade"/>
<type name="ruasf" description="Astrakhan, Russia" alias="Europe/Astrakhan" since="30"/>
<type name="rubax" description="Barnaul, Russia" alias="Asia/Barnaul" since="30"/>
Expand Down Expand Up @@ -403,28 +403,28 @@ For terms of use, see http://www.unicode.org/copyright.html
<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" 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="unk" description="Unknown time zone" alias="Etc/Unknown Factory"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<type name="unk" description="Unknown time zone" alias="Etc/Unknown Factory"/>
<type name="unk" description="Unknown time zone" alias="Etc/Unknown Factory" iana="Factory"/>

I think adding the iana attribute here was what we agreed in the meeting today?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We didn't have time to finish discussing this point but I have some concerns with using iana="Factory". Since ECMAScript already returns "Etc/Unknown", I think it would be a potential web compat concern if we started returning "Factory". It might be better to just change ECMA-402 to allow "Etc/Unknown" as a return value.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I remember correctly from the last time I investigated this, different engines handle the Etc/Unknown value returned from ICU differently. And when we discussed the prospect of adding Etc/Unknown to ECMA-402 at a TG2 meeting (I think it was June 2023), if I remember correctly Yusuke did not support adding it. Also, Anba expressed the same anti-Etc/Unknown opinion here: tc39/ecma402#825 (comment).

I'm just looking for any cross-engine consensus for what ID to return when ICU returns Etc/Unknown. I don't have a strong opinion either way. If we can convince the other implementers that Etc/Unknown is OK, then I'd support that.

<type name="usadk" description="Adak (Alaska), United States" alias="America/Adak America/Atka US/Aleutian"/>
<type name="usaeg" description="Marengo (Indiana), United States" alias="America/Indiana/Marengo"/>
<type name="usanc" description="Anchorage, United States" alias="America/Anchorage US/Alaska"/>
<type name="usboi" description="Boise (Idaho), United States" alias="America/Boise"/>
<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="uschi" description="Chicago, United States" alias="America/Chicago US/Central CST6CDT"/>
<type name="usden" description="Denver, United States" alias="America/Denver America/Shiprock Navajo US/Mountain MST7MDT"/>
<type name="usdet" description="Detroit, United States" alias="America/Detroit US/Michigan"/>
<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="uslax" description="Los Angeles, United States" alias="America/Los_Angeles US/Pacific US/Pacific-New PST8PDT"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<type name="uslax" description="Los Angeles, United States" alias="America/Los_Angeles US/Pacific US/Pacific-New PST8PDT"/>
<type name="uslax" description="Los Angeles, United States" alias="America/Los_Angeles US/Pacific US/Pacific-New PST8PDT"/>

Typo: extra space

<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"/>
<type name="usnavajo" description="Shiprock (Navajo), United States" deprecated="true" preferred="usden"/>
<type name="usndcnt" description="Center (North Dakota), United States" alias="America/North_Dakota/Center"/>
<type name="usndnsl" description="New Salem (North Dakota), United States" alias="America/North_Dakota/New_Salem"/>
<type name="usnyc" description="New York, United States" alias="America/New_York US/Eastern"/>
<type name="usnyc" description="New York, United States" alias="America/New_York US/Eastern EST5EDT"/>
<type name="usoea" description="Vincennes (Indiana), United States" alias="America/Indiana/Vincennes"/>
<type name="usome" description="Nome (Alaska), United States" alias="America/Nome"/>
<type name="usphx" description="Phoenix, United States" alias="America/Phoenix US/Arizona"/>
Expand Down
4 changes: 4 additions & 0 deletions common/supplemental/supplementalMetadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -1819,6 +1819,10 @@ For terms of use, see http://www.unicode.org/copyright.html
<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"/>
<zoneAlias type="EST5EDT" replacement="America/New_York" reason="deprecated"/>
<zoneAlias type="CST6CDT" replacement="America/Chicago" reason="deprecated"/>
<zoneAlias type="MST7MDT" replacement="America/Denver" reason="deprecated"/>
<zoneAlias type="PST8PDT" replacement="America/Los_Angeles" reason="deprecated"/>
</alias>
<defaultContent locales="
aa_ET ab_GE af_ZA agq_CM ak_GH am_ET an_ES ann_NG apc_SY ar_001 arn_CL as_IN
Expand Down
Loading