From cf2a6574f8871c756612e3917e6530c9e0d40617 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Bargull?= Date: Tue, 7 Nov 2023 08:45:48 +0000 Subject: [PATCH] Bug 1859752 - Part 6: Update time zone mappings. r=spidermonkey-reviewers,mgaudet Depends on D192730 Differential Revision: https://phabricator.services.mozilla.com/D192731 --- js/src/builtin/intl/TimeZoneDataGenerated.h | 11 ++++++++++- js/src/builtin/intl/make_intl_data.py | 5 ++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/js/src/builtin/intl/TimeZoneDataGenerated.h b/js/src/builtin/intl/TimeZoneDataGenerated.h index 7757e114021a..af1d125aeb47 100644 --- a/js/src/builtin/intl/TimeZoneDataGenerated.h +++ b/js/src/builtin/intl/TimeZoneDataGenerated.h @@ -22,8 +22,14 @@ const char* const ianaZonesTreatedAsLinksByICU[] = { "America/Ensenada", // America/Tijuana [backzone] "America/Indiana/Indianapolis", // America/Indianapolis [northamerica] "America/Kentucky/Louisville", // America/Louisville [northamerica] + "America/Montreal", // America/Toronto [backzone] + "America/Nipigon", // America/Toronto [backzone] "America/Nuuk", // America/Godthab [europe] + "America/Pangnirtung", // America/Iqaluit [backzone] + "America/Rainy_River", // America/Winnipeg [backzone] "America/Rosario", // America/Cordoba [backzone] + "America/Thunder_Bay", // America/Toronto [backzone] + "America/Yellowknife", // America/Edmonton [backzone] "Asia/Chongqing", // Asia/Shanghai [backzone] "Asia/Harbin", // Asia/Shanghai [backzone] "Asia/Ho_Chi_Minh", // Asia/Saigon [asia] @@ -34,13 +40,17 @@ const char* const ianaZonesTreatedAsLinksByICU[] = { "Asia/Yangon", // Asia/Rangoon [asia] "Atlantic/Faroe", // Atlantic/Faeroe [europe] "Atlantic/Jan_Mayen", // Arctic/Longyearbyen [backzone] + "Australia/Currie", // Australia/Hobart [backzone] "EST", // Etc/GMT+5 [northamerica] "Europe/Belfast", // Europe/London [backzone] "Europe/Kyiv", // Europe/Kiev [europe] "Europe/Tiraspol", // Europe/Chisinau [backzone] + "Europe/Uzhgorod", // Europe/Kiev [backzone] + "Europe/Zaporozhye", // Europe/Kiev [backzone] "HST", // Etc/GMT+10 [northamerica] "MST", // Etc/GMT+7 [northamerica] "Pacific/Chuuk", // Pacific/Truk [backzone] + "Pacific/Johnston", // Pacific/Honolulu [backzone] "Pacific/Kanton", // Pacific/Enderbury [australasia] "Pacific/Pohnpei", // Pacific/Ponape [backzone] }; @@ -67,7 +77,6 @@ const LinkAndTarget ianaLinksCanonicalizedDifferentlyByICU[] = { { "America/Lower_Princes", "America/Curacao" }, // America/Lower_Princes [backward] { "America/Marigot", "America/Port_of_Spain" }, // America/Marigot [backward] { "America/Mendoza", "America/Argentina/Mendoza" }, // America/Mendoza [backward] - { "America/Santa_Isabel", "America/Tijuana" }, // America/Santa_Isabel [backward] { "America/St_Barthelemy", "America/Port_of_Spain" }, // America/St_Barthelemy [backward] { "Antarctica/South_Pole", "Antarctica/McMurdo" }, // Pacific/Auckland [backward] { "Arctic/Longyearbyen", "Europe/Oslo" }, // Arctic/Longyearbyen [backward] diff --git a/js/src/builtin/intl/make_intl_data.py b/js/src/builtin/intl/make_intl_data.py index 7042c0a005d0..f74374251ddd 100755 --- a/js/src/builtin/intl/make_intl_data.py +++ b/js/src/builtin/intl/make_intl_data.py @@ -3035,7 +3035,10 @@ def updateTzdata(topsrcdir, args): if not os.path.isdir(icuDir): raise RuntimeError("not a directory: %s" % icuDir) - icuTzDir = os.path.join(topsrcdir, "intl/tzdata/source") + # Use tzdata from ICU 74, because tzdata from "icu-data" isn't yet updated + # to use the correct time zone mappings. + # icuTzDir = os.path.join(topsrcdir, "intl/tzdata/source") + icuTzDir = os.path.join(topsrcdir, "intl/icu/source/data/misc") if not os.path.isdir(icuTzDir): raise RuntimeError("not a directory: %s" % icuTzDir) -- 2.11.4.GIT