From 12bd4bc5ad5a560161080200470a82fac9766b91 Mon Sep 17 00:00:00 2001 From: Mihail Geshoski Date: Fri, 24 Jul 2020 16:16:04 +0800 Subject: [PATCH] MDL-67943 core: Update timezone list in core_date --- lib/classes/date.php | 175 ++++++++++++++++++++++++++++++++++++------- 1 file changed, 148 insertions(+), 27 deletions(-) diff --git a/lib/classes/date.php b/lib/classes/date.php index e5371374bbc..9702d43f8bb 100644 --- a/lib/classes/date.php +++ b/lib/classes/date.php @@ -364,7 +364,7 @@ class core_date { 'Dateline Standard Time' => 'Etc/GMT+12', 'Hawaiian Standard Time' => 'Pacific/Honolulu', 'Alaskan Standard Time' => 'America/Anchorage', - 'Pacific Standard Time (Mexico)' => 'America/Santa_Isabel', + 'Pacific Standard Time (Mexico)' => 'America/Tijuana', 'Pacific Standard Time' => 'America/Los_Angeles', 'US Mountain Standard Time' => 'America/Phoenix', 'Mountain Standard Time (Mexico)' => 'America/Chihuahua', @@ -376,8 +376,8 @@ class core_date { 'SA Pacific Standard Time' => 'America/Bogota', 'S.A. Pacific Standard Time' => 'America/Bogota', 'Eastern Standard Time' => 'America/New_York', - 'US Eastern Standard Time' => 'America/Indianapolis', - 'U.S. Eastern Standard Time' => 'America/Indianapolis', + 'US Eastern Standard Time' => 'America/Indiana/Indianapolis', + 'U.S. Eastern Standard Time' => 'America/Indiana/Indianapolis', 'Venezuela Standard Time' => 'America/Caracas', 'Paraguay Standard Time' => 'America/Asuncion', 'Atlantic Standard Time' => 'America/Halifax', @@ -389,7 +389,7 @@ class core_date { 'Newfoundland Standard Time' => 'America/St_Johns', 'Newfoundland and Labrador Standard Time' => 'America/St_Johns', 'E. South America Standard Time' => 'America/Sao_Paulo', - 'Argentina Standard Time' => 'America/Buenos_Aires', + 'Argentina Standard Time' => 'America/Argentina/Buenos_Aires', 'SA Eastern Standard Time' => 'America/Cayenne', 'S.A. Eastern Standard Time' => 'America/Cayenne', 'Greenland Standard Time' => 'America/Godthab', @@ -435,11 +435,11 @@ class core_date { 'Pakistan Standard Time' => 'Asia/Karachi', 'India Standard Time' => 'Asia/Kolkata', // PHP and Windows differ in spelling. 'Sri Lanka Standard Time' => 'Asia/Colombo', - 'Nepal Standard Time' => 'Asia/Katmandu', + 'Nepal Standard Time' => 'Asia/Kathmandu', 'Central Asia Standard Time' => 'Asia/Almaty', 'Bangladesh Standard Time' => 'Asia/Dhaka', 'N. Central Asia Standard Time' => 'Asia/Novosibirsk', - 'Myanmar Standard Time' => 'Asia/Rangoon', + 'Myanmar Standard Time' => 'Asia/Yangon', 'SE Asia Standard Time' => 'Asia/Bangkok', 'S.E. Asia Standard Time' => 'Asia/Bangkok', 'North Asia Standard Time' => 'Asia/Krasnoyarsk', @@ -480,34 +480,106 @@ class core_date { 'Armenian Standard Time' => 'Asia/Yerevan', 'Kamchatka Standard Time' => 'Asia/Kamchatka', - // A lot more bad legacy time zones. + // A lot more bad legacy (deprecated) time zones. + 'Australia/ACT' => 'Australia/Sydney', + 'Australia/LHI' => 'Australia/Lord_Howe', + 'Australia/North' => 'Australia/Darwin', + 'Australia/NSW' => 'Australia/Sydney', + 'Australia/Queensland' => 'Australia/Brisbane', + 'Australia/South' => 'Australia/Adelaide', + 'Australia/Tasmania' => 'Australia/Hobart', + 'Australia/Victoria' => 'Australia/Melbourne', + 'Australia/West' => 'Australia/Perth', + 'Brazil/Acre' => 'America/Rio_Branco', + 'Brazil/DeNoronha' => 'America/Noronha', + 'Brazil/East' => 'America/Sao_Paulo', + 'Brazil/West' => 'America/Manaus', + 'Canada/Atlantic' => 'America/Halifax', + 'Canada/Central' => 'America/Winnipeg', + 'Canada/Eastern' => 'America/Toronto', + 'Canada/Mountain' => 'America/Edmonton', + 'Canada/Newfoundland' => 'America/St_Johns', + 'Canada/Pacific' => 'America/Vancouver', + 'Canada/Saskatchewan' => 'America/Regina', + 'Canada/Yukon' => 'America/Whitehorse', + 'CDT' => 'America/Chicago', 'CET' => 'Europe/Berlin', 'Central European Time' => 'Europe/Berlin', - 'CST' => 'America/Chicago', 'Central Time' => 'America/Chicago', - 'CST6CDT' => 'America/Chicago', - 'CDT' => 'America/Chicago', + 'Chile/Continental' => 'America/Santiago', + 'Chile/EasterIsland' => 'Pacific/Easter', 'China Time' => 'Asia/Shanghai', + 'CST' => 'America/Chicago', + 'CST6CDT' => 'America/Chicago', + 'Cuba' => 'America/Havana', 'EDT' => 'America/New_York', - 'EST' => 'America/New_York', + 'EET' => 'Europe/Kiev', + 'Egypt' => 'Africa/Cairo', + 'Eire' => 'Europe/Dublin', + 'EST' => 'America/Cancun', 'EST5EDT' => 'America/New_York', 'Eastern Time' => 'America/New_York', - 'IST' => 'Asia/Kolkata', - 'India Time' => 'Asia/Kolkata', - 'JST' => 'Asia/Tokyo', - 'Japan Time' => 'Asia/Tokyo', - 'Japan Standard Time' => 'Asia/Tokyo', - 'MDT' => 'America/Denver', - 'MST' => 'America/Denver', - 'MST7MDT' => 'America/Denver', - 'PDT' => 'America/Los_Angeles', - 'PST' => 'America/Los_Angeles', - 'Pacific Time' => 'America/Los_Angeles', - 'PST8PDT' => 'America/Los_Angeles', - 'HST' => 'Pacific/Honolulu', - 'WET' => 'Europe/London', - 'EET' => 'Europe/Kiev', + 'Etc/Greenwich' => 'Etc/GMT', + 'Etc/UCT' => 'Etc/UTC', + 'Etc/Universal' => 'Etc/UTC', + 'Etc/Zulu' => 'Etc/UTC', 'FET' => 'Europe/Minsk', + 'GB' => 'Europe/London', + 'GB-Eire' => 'Europe/London', + 'Greenwich' => 'Etc/GMT', + 'Hongkong' => 'Asia/Hong_Kong', + 'HST' => 'Pacific/Honolulu', + 'Iceland' => 'Atlantic/Reykjavik', + 'India Time' => 'Asia/Kolkata', + 'Iran' => 'Asia/Tehran', + 'Israel' => 'Asia/Jerusalem', + 'IST' => 'Asia/Kolkata', + 'Jamaica' => 'America/Jamaica', + 'Japan' => 'Asia/Tokyo', + 'Japan Standard Time' => 'Asia/Tokyo', + 'Japan Time' => 'Asia/Tokyo', + 'JST' => 'Asia/Tokyo', + 'Kwajalein' => 'Pacific/Kwajalein', + 'Libya' => 'Africa/Tripoli', + 'MDT' => 'America/Denver', + 'MET' => 'Europe/Paris', + 'Mexico/BajaNorte' => 'America/Tijuana', + 'Mexico/BajaSur' => 'America/Mazatlan', + 'Mexico/General' => 'America/Mexico_City', + 'MST' => 'America/Phoenix', + 'MST7MDT' => 'America/Denver', + 'Navajo' => 'America/Denver', + 'NZ' => 'Pacific/Auckland', + 'NZ-CHAT' => 'Pacific/Chatham', + 'Pacific Time' => 'America/Los_Angeles', + 'PDT' => 'America/Los_Angeles', + 'Poland' => 'Europe/Warsaw', + 'Portugal' => 'Europe/Lisbon', + 'PRC' => 'Asia/Shanghai', + 'PST' => 'America/Los_Angeles', + 'PST8PDT' => 'America/Los_Angeles', + 'ROC' => 'Asia/Taipei', + 'ROK' => 'Asia/Seoul', + 'Singapore' => 'Asia/Singapore', + 'Turkey' => 'Europe/Istanbul', + 'UCT' => 'Etc/UTC', + 'Universal' => 'Etc/UTC', + 'US/Alaska' => 'America/Anchorage', + 'US/Aleutian' => 'America/Adak', + 'US/Arizona' => 'America/Phoenix', + 'US/Central' => 'America/Chicago', + 'US/East-Indiana' => 'America/Indiana/Indianapolis', + 'US/Eastern' => 'America/New_York', + 'US/Hawaii' => 'Pacific/Honolulu', + 'US/Indiana-Starke' => 'America/Indiana/Knox', + 'US/Michigan' => 'America/Detroit', + 'US/Mountain' => 'America/Denver', + 'US/Pacific' => 'America/Los_Angeles', + 'US/Pacific-New' => 'America/Los_Angeles', + 'US/Samoa' => 'Pacific/Pago_Pago', + 'W-SU' => 'Europe/Moscow', + 'WET' => 'Europe/London', + 'Zulu' => 'Etc/UTC', // Some UTC variations. 'UTC-01' => 'Etc/GMT+1', @@ -525,8 +597,57 @@ class core_date { 'Etc/GMT-0' => 'Etc/GMT', 'Etc/GMT0' => 'Etc/GMT', - // And lastly some alternative city spelling. + // Link old timezone names with their new names. + 'Africa/Asmera' => 'Africa/Asmara', + 'Africa/Timbuktu' => 'Africa/Abidjan', + 'America/Argentina/ComodRivadavia' => 'America/Argentina/Catamarca', + 'America/Atka' => 'America/Adak', + 'America/Buenos_Aires' => 'America/Argentina/Buenos_Aires', + 'America/Catamarca' => 'America/Argentina/Catamarca', + 'America/Coral_Harbour' => 'America/Atikokan', + 'America/Cordoba' => 'America/Argentina/Cordoba', + 'America/Ensenada' => 'America/Tijuana', + 'America/Fort_Wayne' => 'America/Indiana/Indianapolis', + 'America/Indianapolis' => 'America/Indiana/Indianapolis', + 'America/Jujuy' => 'America/Argentina/Jujuy', + 'America/Knox_IN' => 'America/Indiana/Knox', + 'America/Louisville' => 'America/Kentucky/Louisville', + 'America/Mendoza' => 'America/Argentina/Mendoza', + 'America/Montreal' => 'America/Toronto', + 'America/Porto_Acre' => 'America/Rio_Branco', + 'America/Rosario' => 'America/Argentina/Cordoba', + 'America/Santa_Isabel' => 'America/Tijuana', + 'America/Shiprock' => 'America/Denver', + 'America/Virgin' => 'America/Port_of_Spain', + 'Antarctica/South_Pole' => 'Pacific/Auckland', + 'Asia/Ashkhabad' => 'Asia/Ashgabat', 'Asia/Calcutta' => 'Asia/Kolkata', + 'Asia/Chongqing' => 'Asia/Shanghai', + 'Asia/Chungking' => 'Asia/Shanghai', + 'Asia/Dacca' => 'Asia/Dhaka', + 'Asia/Harbin' => 'Asia/Shanghai', + 'Asia/Istanbul' => 'Europe/Istanbul', + 'Asia/Kashgar' => 'Asia/Urumqi', + 'Asia/Katmandu' => 'Asia/Kathmandu', + 'Asia/Macao' => 'Asia/Macau', + 'Asia/Rangoon' => 'Asia/Yangon', + 'Asia/Saigon' => 'Asia/Ho_Chi_Minh', + 'Asia/Tel_Aviv' => 'Asia/Jerusalem', + 'Asia/Thimbu' => 'Asia/Thimphu', + 'Asia/Ujung_Pandang' => 'Asia/Makassar', + 'Asia/Ulan_Bator' => 'Asia/Ulaanbaatar', + 'Atlantic/Faeroe' => 'Atlantic/Faroe', + 'Atlantic/Jan_Mayen' => 'Europe/Oslo', + 'Australia/Canberra' => 'Australia/Sydney', + 'Australia/Yancowinna' => 'Australia/Broken_Hill', + 'Europe/Belfast' => 'Europe/London', + 'Europe/Nicosia' => 'Asia/Nicosia', + 'Europe/Tiraspol' => 'Europe/Chisinau', + 'Pacific/Johnston' => 'Pacific/Honolulu', + 'Pacific/Ponape' => 'Pacific/Pohnpei', + 'Pacific/Samoa' => 'Pacific/Pago_Pago', + 'Pacific/Truk' => 'Pacific/Chuuk', + 'Pacific/Yap' => 'Pacific/Chuuk', ); // Legacy GMT fallback.