CLDR-13739 tzdata2020a updates (unicode-org#440)

- Also updating tzdata files included in cldr tools directory for just in case. - Added America/Nuuk - America/Godthab mapping in ZoneParser.java to resolve ConsoleCheckCLDR test failures.
jwtiyar · Apr 25, 2020 · a8cb95c · a8cb95c
1 parent f95e999
commit a8cb95c
Show file tree

Hide file tree

Showing 17 changed files with 1,142 additions and 605 deletions.
diff --git a/common/bcp47/timezone.xml b/common/bcp47/timezone.xml
@@ -185,7 +185,7 @@ 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"/>
+            <type name="glgoh" description="Nuuk (Godthåb), Greenland" alias="America/Godthab 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"/>

diff --git a/common/supplemental/metaZones.xml b/common/supplemental/metaZones.xml
@@ -358,7 +358,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 			</timezone>
 			<timezone type="America/Dawson">
 				<usesMetazone to="1973-10-28 09:00" mzone="Yukon"/>
-				<usesMetazone from="1973-10-28 09:00" mzone="America_Pacific"/>
+				<usesMetazone to="2020-03-08 10:00" from="1973-10-28 09:00" mzone="America_Pacific"/>
+				<usesMetazone from="2020-03-08 10:00" mzone="America_Mountain"/>
 			</timezone>
 			<timezone type="America/Dawson_Creek">
 				<usesMetazone to="1972-08-30 09:00" mzone="America_Pacific"/>
@@ -747,7 +748,8 @@ For terms of use, see http://www.unicode.org/copyright.html
 				<usesMetazone mzone="America_Pacific"/>
 			</timezone>
 			<timezone type="America/Whitehorse">
-				<usesMetazone mzone="America_Pacific"/>
+				<usesMetazone to="2020-03-08 10:00" mzone="America_Pacific"/>
+				<usesMetazone from="2020-03-08 10:00" mzone="America_Mountain"/>
 			</timezone>
 			<timezone type="America/Winnipeg">
 				<usesMetazone mzone="America_Central"/>

diff --git a/common/supplemental/windowsZones.xml b/common/supplemental/windowsZones.xml
@@ -58,13 +58,13 @@ For terms of use, see http://www.unicode.org/copyright.html
 
 			<!-- (UTC-08:00) Pacific Time (US & Canada) -->
 			<mapZone other="Pacific Standard Time" territory="001" type="America/Los_Angeles"/>
-			<mapZone other="Pacific Standard Time" territory="CA" type="America/Vancouver America/Dawson America/Whitehorse"/>
+			<mapZone other="Pacific Standard Time" territory="CA" type="America/Vancouver"/>
 			<mapZone other="Pacific Standard Time" territory="US" type="America/Los_Angeles"/>
 			<mapZone other="Pacific Standard Time" territory="ZZ" type="PST8PDT"/>
 
 			<!-- (UTC-07:00) Arizona -->
 			<mapZone other="US Mountain Standard Time" territory="001" type="America/Phoenix"/>
-			<mapZone other="US Mountain Standard Time" territory="CA" type="America/Dawson_Creek America/Creston America/Fort_Nelson"/>
+			<mapZone other="US Mountain Standard Time" territory="CA" type="America/Whitehorse America/Creston  America/Dawson  America/Dawson_Creek America/Fort_Nelson"/>
 			<mapZone other="US Mountain Standard Time" territory="MX" type="America/Hermosillo"/>
 			<mapZone other="US Mountain Standard Time" territory="US" type="America/Phoenix"/>
 			<mapZone other="US Mountain Standard Time" territory="ZZ" type="Etc/GMT+7"/>

diff --git a/tools/java/org/unicode/cldr/util/ZoneParser.java b/tools/java/org/unicode/cldr/util/ZoneParser.java
@@ -639,6 +639,7 @@ public int compare(String s1, String s2) {
             { "America/Argentina/Cordoba", "America/Cordoba" },
             { "America/Argentina/Jujuy", "America/Jujuy" },
             { "America/Argentina/Mendoza", "America/Mendoza" },
+            { "America/Nuuk", "America/Godthab" },
             { "America/Kentucky/Louisville", "America/Louisville" },
             { "America/Indiana/Indianapolis", "America/Indianapolis" },
             { "Africa/Asmara", "Africa/Asmera" },