From f550bec93e0fa2ca5f90c0e99f5c97d7ba68b272 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Mon, 22 Apr 2024 15:13:40 +0200 Subject: [PATCH] [winpr,timezone] update * update windowsZones.xml url * update timezones --- scripts/update-windows-zones.py | 3 +- winpr/libwinpr/timezone/WindowsZones.c | 52 +++++++++++++------------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/scripts/update-windows-zones.py b/scripts/update-windows-zones.py index 49b96e6d7a8f..4079418f38d3 100755 --- a/scripts/update-windows-zones.py +++ b/scripts/update-windows-zones.py @@ -8,7 +8,8 @@ base = os.path.normpath(os.path.join(os.path.dirname(name), '..')) rname = os.path.relpath(name, base) zfile = os.path.join(base, 'winpr/libwinpr/timezone/WindowsZones.c') -url = 'https://raw.githubusercontent.com/unicode-org/cldr/latest/common/supplemental/windowsZones.xml' +#url = 'https://raw.githubusercontent.com/unicode-org/cldr/latest/common/supplemental/windowsZones.xml' +url = 'https://raw.githubusercontent.com/unicode-org/cldr/main/common/supplemental/windowsZones.xml' try: with urllib.request.urlopen(url) as response: diff --git a/winpr/libwinpr/timezone/WindowsZones.c b/winpr/libwinpr/timezone/WindowsZones.c index d97ec3ccb86c..8e59de7c13d4 100644 --- a/winpr/libwinpr/timezone/WindowsZones.c +++ b/winpr/libwinpr/timezone/WindowsZones.c @@ -78,8 +78,7 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "Central America Standard Time", "Etc/GMT+6" }, { "Central America Standard Time", "Pacific/Galapagos" }, { "Central Asia Standard Time", "Antarctica/Vostok" }, - { "Central Asia Standard Time", "Asia/Almaty Asia/Qostanay" }, - { "Central Asia Standard Time", "Asia/Almaty" }, + { "Central Asia Standard Time", "Asia/Bishkek" }, { "Central Asia Standard Time", "Asia/Bishkek" }, { "Central Asia Standard Time", "Asia/Urumqi" }, { "Central Asia Standard Time", "Etc/GMT-6" }, @@ -99,23 +98,22 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "Central European Standard Time", "Europe/Warsaw" }, { "Central European Standard Time", "Europe/Warsaw" }, { "Central European Standard Time", "Europe/Zagreb" }, - { "Central Pacific Standard Time", "Antarctica/Macquarie" }, + { "Central Pacific Standard Time", "Antarctica/Casey" }, { "Central Pacific Standard Time", "Etc/GMT-11" }, { "Central Pacific Standard Time", "Pacific/Efate" }, { "Central Pacific Standard Time", "Pacific/Guadalcanal" }, { "Central Pacific Standard Time", "Pacific/Guadalcanal" }, { "Central Pacific Standard Time", "Pacific/Noumea" }, { "Central Pacific Standard Time", "Pacific/Ponape Pacific/Kosrae" }, - { "Central Standard Time (Mexico)", - "America/Mexico_City America/Bahia_Banderas America/Merida America/Monterrey" }, + { "Central Standard Time (Mexico)", "America/Mexico_City America/Bahia_Banderas America/Merida " + "America/Monterrey America/Chihuahua " }, { "Central Standard Time (Mexico)", "America/Mexico_City" }, { "Central Standard Time", "America/Chicago America/Indiana/Knox America/Indiana/Tell_City America/Menominee " "America/North_Dakota/Beulah America/North_Dakota/Center America/North_Dakota/New_Salem" }, { "Central Standard Time", "America/Chicago" }, - { "Central Standard Time", "America/Matamoros" }, - { "Central Standard Time", - "America/Winnipeg America/Rainy_River America/Rankin_Inlet America/Resolute" }, + { "Central Standard Time", "America/Matamoros America/Ojinaga" }, + { "Central Standard Time", "America/Winnipeg America/Rankin_Inlet America/Resolute" }, { "Central Standard Time", "CST6CDT" }, { "Chatham Islands Standard Time", "Pacific/Chatham" }, { "Chatham Islands Standard Time", "Pacific/Chatham" }, @@ -131,7 +129,6 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "E. Africa Standard Time", "Africa/Asmera" }, { "E. Africa Standard Time", "Africa/Dar_es_Salaam" }, { "E. Africa Standard Time", "Africa/Djibouti" }, - { "E. Africa Standard Time", "Africa/Juba" }, { "E. Africa Standard Time", "Africa/Kampala" }, { "E. Africa Standard Time", "Africa/Mogadishu" }, { "E. Africa Standard Time", "Africa/Nairobi" }, @@ -156,15 +153,14 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { "America/New_York America/Detroit America/Indiana/Petersburg America/Indiana/Vincennes " "America/Indiana/Winamac America/Kentucky/Monticello America/Louisville" }, { "Eastern Standard Time", "America/New_York" }, - { "Eastern Standard Time", "America/Toronto America/Iqaluit America/Montreal America/Nipigon " - "America/Pangnirtung America/Thunder_Bay" }, + { "Eastern Standard Time", "America/Toronto America/Iqaluit" }, { "Eastern Standard Time", "EST5EDT" }, { "Egypt Standard Time", "Africa/Cairo" }, { "Egypt Standard Time", "Africa/Cairo" }, { "Ekaterinburg Standard Time", "Asia/Yekaterinburg" }, { "Ekaterinburg Standard Time", "Asia/Yekaterinburg" }, { "FLE Standard Time", "Europe/Helsinki" }, - { "FLE Standard Time", "Europe/Kiev Europe/Uzhgorod Europe/Zaporozhye" }, + { "FLE Standard Time", "Europe/Kiev" }, { "FLE Standard Time", "Europe/Kiev" }, { "FLE Standard Time", "Europe/Mariehamn" }, { "FLE Standard Time", "Europe/Riga" }, @@ -202,6 +198,7 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "Greenwich Standard Time", "Africa/Monrovia" }, { "Greenwich Standard Time", "Africa/Nouakchott" }, { "Greenwich Standard Time", "Africa/Ouagadougou" }, + { "Greenwich Standard Time", "America/Danmarkshavn" }, { "Greenwich Standard Time", "Atlantic/Reykjavik" }, { "Greenwich Standard Time", "Atlantic/Reykjavik" }, { "Greenwich Standard Time", "Atlantic/St_Helena" }, @@ -210,7 +207,6 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "Hawaiian Standard Time", "Etc/GMT+10" }, { "Hawaiian Standard Time", "Pacific/Honolulu" }, { "Hawaiian Standard Time", "Pacific/Honolulu" }, - { "Hawaiian Standard Time", "Pacific/Johnston" }, { "Hawaiian Standard Time", "Pacific/Rarotonga" }, { "Hawaiian Standard Time", "Pacific/Tahiti" }, { "India Standard Time", "Asia/Calcutta" }, @@ -249,13 +245,12 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "Morocco Standard Time", "Africa/Casablanca" }, { "Morocco Standard Time", "Africa/Casablanca" }, { "Morocco Standard Time", "Africa/El_Aaiun" }, - { "Mountain Standard Time (Mexico)", "America/Chihuahua America/Mazatlan" }, - { "Mountain Standard Time (Mexico)", "America/Chihuahua" }, + { "Mountain Standard Time (Mexico)", "America/Mazatlan" }, + { "Mountain Standard Time (Mexico)", "America/Mazatlan" }, + { "Mountain Standard Time", "America/Ciudad_Juarez" }, { "Mountain Standard Time", "America/Denver America/Boise" }, { "Mountain Standard Time", "America/Denver" }, - { "Mountain Standard Time", - "America/Edmonton America/Cambridge_Bay America/Inuvik America/Yellowknife" }, - { "Mountain Standard Time", "America/Ojinaga" }, + { "Mountain Standard Time", "America/Edmonton America/Cambridge_Bay America/Inuvik" }, { "Mountain Standard Time", "MST7MDT" }, { "Myanmar Standard Time", "Asia/Rangoon" }, { "Myanmar Standard Time", "Asia/Rangoon" }, @@ -283,11 +278,11 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "Omsk Standard Time", "Asia/Omsk" }, { "Pacific SA Standard Time", "America/Santiago" }, { "Pacific SA Standard Time", "America/Santiago" }, - { "Pacific Standard Time (Mexico)", "America/Tijuana America/Santa_Isabel" }, + { "Pacific Standard Time (Mexico)", "America/Tijuana" }, { "Pacific Standard Time (Mexico)", "America/Tijuana" }, { "Pacific Standard Time", "America/Los_Angeles" }, { "Pacific Standard Time", "America/Los_Angeles" }, - { "Pacific Standard Time", "America/Vancouver America/Dawson America/Whitehorse" }, + { "Pacific Standard Time", "America/Vancouver" }, { "Pacific Standard Time", "PST8PDT" }, { "Pakistan Standard Time", "Asia/Karachi" }, { "Pakistan Standard Time", "Asia/Karachi" }, @@ -374,7 +369,6 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "Sao Tome Standard Time", "Africa/Sao_Tome" }, { "Saratov Standard Time", "Europe/Saratov" }, { "Saratov Standard Time", "Europe/Saratov" }, - { "Singapore Standard Time", "Antarctica/Casey" }, { "Singapore Standard Time", "Asia/Brunei" }, { "Singapore Standard Time", "Asia/Kuala_Lumpur Asia/Kuching" }, { "Singapore Standard Time", "Asia/Makassar" }, @@ -395,6 +389,8 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "South Africa Standard Time", "Africa/Maseru" }, { "South Africa Standard Time", "Africa/Mbabane" }, { "South Africa Standard Time", "Etc/GMT-2" }, + { "South Sudan Standard Time", "Africa/Juba" }, + { "South Sudan Standard Time", "Africa/Juba" }, { "Sri Lanka Standard Time", "Asia/Colombo" }, { "Sri Lanka Standard Time", "Asia/Colombo" }, { "Sudan Standard Time", "Africa/Khartoum" }, @@ -403,7 +399,7 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "Syria Standard Time", "Asia/Damascus" }, { "Taipei Standard Time", "Asia/Taipei" }, { "Taipei Standard Time", "Asia/Taipei" }, - { "Tasmania Standard Time", "Australia/Hobart Australia/Currie" }, + { "Tasmania Standard Time", "Australia/Hobart Antarctica/Macquarie" }, { "Tasmania Standard Time", "Australia/Hobart" }, { "Tocantins Standard Time", "America/Araguaina" }, { "Tocantins Standard Time", "America/Araguaina" }, @@ -426,14 +422,13 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "US Eastern Standard Time", "America/Indianapolis America/Indiana/Marengo America/Indiana/Vevay" }, { "US Eastern Standard Time", "America/Indianapolis" }, - { "US Mountain Standard Time", "America/Dawson_Creek America/Creston America/Fort_Nelson" }, + { "US Mountain Standard Time", "America/Creston America/Dawson_Creek America/Fort_Nelson" }, { "US Mountain Standard Time", "America/Hermosillo" }, { "US Mountain Standard Time", "America/Phoenix" }, { "US Mountain Standard Time", "America/Phoenix" }, { "US Mountain Standard Time", "Etc/GMT+7" }, - { "UTC", "America/Danmarkshavn" }, - { "UTC", "Etc/GMT Etc/UTC" }, - { "UTC", "Etc/GMT" }, + { "UTC", "Etc/UTC Etc/GMT" }, + { "UTC", "Etc/UTC" }, { "UTC+12", "Etc/GMT-12" }, { "UTC+12", "Etc/GMT-12" }, { "UTC+12", "Pacific/Funafuti" }, @@ -508,7 +503,8 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "West Asia Standard Time", "Antarctica/Mawson" }, { "West Asia Standard Time", "Asia/Ashgabat" }, { "West Asia Standard Time", "Asia/Dushanbe" }, - { "West Asia Standard Time", "Asia/Oral Asia/Aqtau Asia/Aqtobe Asia/Atyrau" }, + { "West Asia Standard Time", + "Asia/Oral Asia/Almaty Asia/Aqtau Asia/Aqtobe Asia/Atyrau Asia/Qostanay" }, { "West Asia Standard Time", "Asia/Tashkent Asia/Samarkand" }, { "West Asia Standard Time", "Asia/Tashkent" }, { "West Asia Standard Time", "Etc/GMT-5" }, @@ -525,6 +521,8 @@ const WINDOWS_TZID_ENTRY WindowsTimeZoneIdTable[] = { { "West Pacific Standard Time", "Pacific/Truk" }, { "Yakutsk Standard Time", "Asia/Yakutsk Asia/Khandyga" }, { "Yakutsk Standard Time", "Asia/Yakutsk" }, + { "Yukon Standard Time", "America/Whitehorse America/Dawson" }, + { "Yukon Standard Time", "America/Whitehorse" }, }; const size_t WindowsTimeZoneIdTableNrElements = ARRAYSIZE(WindowsTimeZoneIdTable);