diff --git a/data/dynamic.php b/data/dynamic.php index 9ff0cc8..2fe4327 100644 --- a/data/dynamic.php +++ b/data/dynamic.php @@ -1,5 +1,6 @@ 'Africa/Monrovia', 'Africa/Accra' => 'Africa/Monrovia', @@ -10,9 +11,9 @@ 'Africa/Bangui' => 'Africa/Algiers', 'Africa/Banjul' => 'Africa/Monrovia', 'Africa/Bissau' => 'Africa/Monrovia', - 'Africa/Blantyre' => 'Africa/Cairo', + 'Africa/Blantyre' => 'Africa/Windhoek', 'Africa/Brazzaville' => 'Africa/Algiers', - 'Africa/Bujumbura' => 'Africa/Cairo', + 'Africa/Bujumbura' => 'Africa/Windhoek', 'Africa/Ceuta' => 'Europe/Amsterdam', 'Africa/Conakry' => 'Africa/Monrovia', 'Africa/Dakar' => 'Africa/Monrovia', @@ -21,23 +22,22 @@ 'Africa/Douala' => 'Africa/Algiers', 'Africa/El_Aaiun' => 'Africa/Casablanca', 'Africa/Freetown' => 'Africa/Monrovia', - 'Africa/Gaborone' => 'Africa/Cairo', - 'Africa/Johannesburg' => 'Africa/Cairo', - 'Africa/Juba' => 'Europe/Moscow', + 'Africa/Gaborone' => 'Africa/Windhoek', + 'Africa/Johannesburg' => 'Africa/Windhoek', 'Africa/Kampala' => 'Europe/Moscow', - 'Africa/Khartoum' => 'Europe/Moscow', - 'Africa/Kigali' => 'Africa/Cairo', + 'Africa/Khartoum' => 'Africa/Windhoek', + 'Africa/Kigali' => 'Africa/Windhoek', 'Africa/Kinshasa' => 'Africa/Algiers', 'Africa/Lagos' => 'Africa/Algiers', 'Africa/Libreville' => 'Africa/Algiers', 'Africa/Lome' => 'Africa/Monrovia', 'Africa/Luanda' => 'Africa/Algiers', - 'Africa/Lubumbashi' => 'Africa/Cairo', - 'Africa/Lusaka' => 'Africa/Cairo', + 'Africa/Lubumbashi' => 'Africa/Windhoek', + 'Africa/Lusaka' => 'Africa/Windhoek', 'Africa/Malabo' => 'Africa/Algiers', - 'Africa/Maputo' => 'Africa/Cairo', - 'Africa/Maseru' => 'Africa/Cairo', - 'Africa/Mbabane' => 'Africa/Cairo', + 'Africa/Maputo' => 'Africa/Windhoek', + 'Africa/Maseru' => 'Africa/Windhoek', + 'Africa/Mbabane' => 'Africa/Windhoek', 'Africa/Mogadishu' => 'Europe/Moscow', 'Africa/Ndjamena' => 'Africa/Algiers', 'Africa/Niamey' => 'Africa/Algiers', @@ -73,7 +73,7 @@ 'America/Boa_Vista' => 'America/Manaus', 'America/Boise' => 'America/Denver', 'America/Cambridge_Bay' => 'America/Denver', - 'America/Campo_Grande' => 'America/Cuiaba', + 'America/Campo_Grande' => 'America/Manaus', 'America/Catamarca' => 'America/Buenos_Aires', 'America/Cayman' => 'America/Bogota', 'America/Coral_Harbour' => 'America/Bogota', @@ -82,7 +82,6 @@ 'America/Creston' => 'America/Phoenix', 'America/Curacao' => 'America/Manaus', 'America/Danmarkshavn' => 'Africa/Monrovia', - 'America/Dawson' => 'America/Los_Angeles', 'America/Dawson_Creek' => 'America/Phoenix', 'America/Detroit' => 'America/New_York', 'America/Dominica' => 'America/Manaus', @@ -90,6 +89,7 @@ 'America/Eirunepe' => 'America/Bogota', 'America/El_Salvador' => 'America/Regina', 'America/Ensenada' => 'America/Los_Angeles', + 'America/Fort_Nelson' => 'America/Phoenix', 'America/Fort_Wayne' => 'America/New_York', 'America/Glace_Bay' => 'America/Halifax', 'America/Goose_Bay' => 'America/Halifax', @@ -129,6 +129,7 @@ 'America/Mendoza' => 'America/Buenos_Aires', 'America/Menominee' => 'America/Chicago', 'America/Merida' => 'America/Mexico_City', + 'America/Metlakatla' => 'America/Anchorage', 'America/Moncton' => 'America/Halifax', 'America/Monterrey' => 'America/Mexico_City', 'America/Montreal' => 'America/New_York', @@ -139,6 +140,7 @@ 'America/North_Dakota/Beulah' => 'America/Chicago', 'America/North_Dakota/Center' => 'America/Chicago', 'America/North_Dakota/New_Salem' => 'America/Chicago', + 'America/Nuuk' => 'America/Godthab', 'America/Ojinaga' => 'America/Denver', 'America/Panama' => 'America/Bogota', 'America/Pangnirtung' => 'America/New_York', @@ -147,6 +149,7 @@ 'America/Porto_Acre' => 'America/Bogota', 'America/Porto_Velho' => 'America/Manaus', 'America/Puerto_Rico' => 'America/Manaus', + 'America/Punta_Arenas' => 'America/Buenos_Aires', 'America/Rainy_River' => 'America/Chicago', 'America/Rankin_Inlet' => 'America/Chicago', 'America/Recife' => 'America/Buenos_Aires', @@ -172,15 +175,15 @@ 'America/Tortola' => 'America/Manaus', 'America/Vancouver' => 'America/Los_Angeles', 'America/Virgin' => 'America/Manaus', - 'America/Whitehorse' => 'America/Los_Angeles', 'America/Winnipeg' => 'America/Chicago', 'America/Yakutat' => 'America/Anchorage', 'America/Yellowknife' => 'America/Denver', - 'Antarctica/Davis' => 'Asia/Bangkok', + 'Antarctica/Davis' => 'Asia/Novosibirsk', 'Antarctica/DumontDUrville' => 'Australia/Brisbane', - 'Antarctica/Macquarie' => 'Pacific/Bougainville', + 'Antarctica/Macquarie' => 'Australia/Canberra', 'Antarctica/Mawson' => 'Asia/Tashkent', 'Antarctica/McMurdo' => 'Pacific/Auckland', + 'Antarctica/Palmer' => 'America/Buenos_Aires', 'Antarctica/Rothera' => 'America/Buenos_Aires', 'Antarctica/South_Pole' => 'Pacific/Auckland', 'Antarctica/Syowa' => 'Europe/Moscow', @@ -194,50 +197,52 @@ 'Asia/Atyrau' => 'Asia/Tashkent', 'Asia/Bahrain' => 'Europe/Moscow', 'Asia/Bishkek' => 'Asia/Dhaka', - 'Asia/Brunei' => 'Asia/Chongqing', + 'Asia/Brunei' => 'Asia/Ulaanbaatar', 'Asia/Calcutta' => 'Asia/Kolkata', 'Asia/Choibalsan' => 'Asia/Ulaanbaatar', - 'Asia/Chungking' => 'Asia/Chongqing', + 'Asia/Chungking' => 'Asia/Ulaanbaatar', 'Asia/Dacca' => 'Asia/Dhaka', 'Asia/Dili' => 'Asia/Tokyo', - 'Asia/Dubai' => 'Asia/Muscat', + 'Asia/Dubai' => 'Asia/Baku', 'Asia/Dushanbe' => 'Asia/Tashkent', - 'Asia/Harbin' => 'Asia/Chongqing', + 'Asia/Famagusta' => 'Europe/Athens', + 'Asia/Harbin' => 'Asia/Ulaanbaatar', 'Asia/Hebron' => 'Asia/Gaza', - 'Asia/Ho_Chi_Minh' => 'Asia/Bangkok', - 'Asia/Hong_Kong' => 'Asia/Chongqing', - 'Asia/Jakarta' => 'Asia/Bangkok', + 'Asia/Ho_Chi_Minh' => 'Asia/Novosibirsk', + 'Asia/Hong_Kong' => 'Asia/Ulaanbaatar', + 'Asia/Jakarta' => 'Asia/Novosibirsk', 'Asia/Jayapura' => 'Asia/Tokyo', 'Asia/Kamchatka' => 'Asia/Anadyr', 'Asia/Kashgar' => 'Asia/Dhaka', 'Asia/Kathmandu' => 'Asia/Katmandu', 'Asia/Khandyga' => 'Asia/Tokyo', - 'Asia/Kuching' => 'Asia/Chongqing', - 'Asia/Macao' => 'Asia/Chongqing', - 'Asia/Macau' => 'Asia/Chongqing', - 'Asia/Makassar' => 'Asia/Chongqing', - 'Asia/Manila' => 'Asia/Chongqing', + 'Asia/Kuching' => 'Asia/Ulaanbaatar', + 'Asia/Macao' => 'Asia/Ulaanbaatar', + 'Asia/Macau' => 'Asia/Ulaanbaatar', + 'Asia/Makassar' => 'Asia/Ulaanbaatar', + 'Asia/Manila' => 'Asia/Ulaanbaatar', 'Asia/Nicosia' => 'Europe/Athens', - 'Asia/Novokuznetsk' => 'Asia/Bangkok', + 'Asia/Novokuznetsk' => 'Asia/Novosibirsk', 'Asia/Omsk' => 'Asia/Dhaka', 'Asia/Oral' => 'Asia/Tashkent', - 'Asia/Phnom_Penh' => 'Asia/Bangkok', - 'Asia/Pontianak' => 'Asia/Bangkok', + 'Asia/Phnom_Penh' => 'Asia/Novosibirsk', + 'Asia/Pontianak' => 'Asia/Novosibirsk', 'Asia/Qatar' => 'Europe/Moscow', - 'Asia/Qyzylorda' => 'Asia/Dhaka', + 'Asia/Qostanay' => 'Asia/Dhaka', + 'Asia/Qyzylorda' => 'Asia/Tashkent', 'Asia/Riyadh' => 'Europe/Moscow', - 'Asia/Saigon' => 'Asia/Bangkok', + 'Asia/Saigon' => 'Asia/Novosibirsk', 'Asia/Samarkand' => 'Asia/Tashkent', - 'Asia/Shanghai' => 'Asia/Chongqing', - 'Asia/Singapore' => 'Asia/Chongqing', + 'Asia/Shanghai' => 'Asia/Ulaanbaatar', + 'Asia/Singapore' => 'Asia/Ulaanbaatar', 'Asia/Tel_Aviv' => 'Asia/Jerusalem', 'Asia/Thimbu' => 'Asia/Dhaka', 'Asia/Thimphu' => 'Asia/Dhaka', - 'Asia/Ujung_Pandang' => 'Asia/Chongqing', + 'Asia/Ujung_Pandang' => 'Asia/Ulaanbaatar', 'Asia/Ulan_Bator' => 'Asia/Ulaanbaatar', 'Asia/Urumqi' => 'Asia/Dhaka', 'Asia/Ust-Nera' => 'Australia/Brisbane', - 'Asia/Vientiane' => 'Asia/Bangkok', + 'Asia/Vientiane' => 'Asia/Novosibirsk', 'Asia/Yangon' => 'Asia/Rangoon', 'Atlantic/Bermuda' => 'America/Halifax', 'Atlantic/Canary' => 'Europe/London', @@ -262,31 +267,25 @@ 'Australia/Sydney' => 'Australia/Canberra', 'Australia/Tasmania' => 'Australia/Canberra', 'Australia/Victoria' => 'Australia/Canberra', - 'Australia/West' => 'Asia/Chongqing', + 'Australia/West' => 'Asia/Ulaanbaatar', 'Australia/Yancowinna' => 'Australia/Adelaide', 'Brazil/Acre' => 'America/Bogota', 'Brazil/DeNoronha' => 'America/Noronha', - 'Brazil/East' => 'America/Sao_Paulo', + 'Brazil/East' => 'America/Buenos_Aires', 'Brazil/West' => 'America/Manaus', - 'CET' => 'Europe/Amsterdam', 'CST6CDT' => 'America/Chicago', 'Canada/Atlantic' => 'America/Halifax', 'Canada/Central' => 'America/Chicago', - 'Canada/East-Saskatchewan' => 'America/Regina', 'Canada/Eastern' => 'America/New_York', 'Canada/Mountain' => 'America/Denver', 'Canada/Newfoundland' => 'America/St_Johns', 'Canada/Pacific' => 'America/Los_Angeles', 'Canada/Saskatchewan' => 'America/Regina', - 'Canada/Yukon' => 'America/Los_Angeles', 'Chile/Continental' => 'America/Santiago', 'Chile/EasterIsland' => 'Pacific/Easter', 'Cuba' => 'America/Havana', - 'EET' => 'Europe/Athens', - 'EST' => 'America/New_York', 'EST5EDT' => 'America/New_York', - 'Egypt' => 'Africa/Cairo', - 'Eire' => 'Europe/London', + 'Egypt' => 'Africa/Windhoek', 'Etc/GMT' => 'Africa/Monrovia', 'Etc/GMT+0' => 'Africa/Monrovia', 'Etc/GMT+1' => 'Atlantic/Cape_Verde', @@ -303,14 +302,15 @@ 'Etc/GMT-10' => 'Australia/Brisbane', 'Etc/GMT-11' => 'Pacific/Bougainville', 'Etc/GMT-12' => 'Asia/Anadyr', + 'Etc/GMT-13' => 'Pacific/Tongatapu', 'Etc/GMT-14' => 'Pacific/Kiritimati', - 'Etc/GMT-2' => 'Africa/Cairo', + 'Etc/GMT-2' => 'Africa/Windhoek', 'Etc/GMT-3' => 'Europe/Moscow', - 'Etc/GMT-4' => 'Asia/Muscat', + 'Etc/GMT-4' => 'Asia/Baku', 'Etc/GMT-5' => 'Asia/Tashkent', 'Etc/GMT-6' => 'Asia/Dhaka', - 'Etc/GMT-7' => 'Asia/Bangkok', - 'Etc/GMT-8' => 'Asia/Chongqing', + 'Etc/GMT-7' => 'Asia/Novosibirsk', + 'Etc/GMT-8' => 'Asia/Ulaanbaatar', 'Etc/GMT-9' => 'Asia/Tokyo', 'Etc/GMT0' => 'Africa/Monrovia', 'Etc/Greenwich' => 'Africa/Monrovia', @@ -326,11 +326,10 @@ 'Europe/Budapest' => 'Europe/Amsterdam', 'Europe/Busingen' => 'Europe/Amsterdam', 'Europe/Copenhagen' => 'Europe/Amsterdam', - 'Europe/Dublin' => 'Europe/London', 'Europe/Gibraltar' => 'Europe/Amsterdam', 'Europe/Guernsey' => 'Europe/London', 'Europe/Isle_of_Man' => 'Europe/London', - 'Europe/Istanbul' => 'Asia/Istanbul', + 'Europe/Istanbul' => 'Europe/Moscow', 'Europe/Jersey' => 'Europe/London', 'Europe/Kiev' => 'Europe/Athens', 'Europe/Kirov' => 'Europe/Moscow', @@ -350,51 +349,45 @@ 'Europe/Rome' => 'Europe/Amsterdam', 'Europe/San_Marino' => 'Europe/Amsterdam', 'Europe/Sarajevo' => 'Europe/Amsterdam', + 'Europe/Saratov' => 'Asia/Baku', 'Europe/Simferopol' => 'Europe/Moscow', 'Europe/Skopje' => 'Europe/Amsterdam', 'Europe/Sofia' => 'Europe/Athens', 'Europe/Stockholm' => 'Europe/Amsterdam', 'Europe/Tallinn' => 'Europe/Athens', 'Europe/Tirane' => 'Europe/Amsterdam', - 'Europe/Ulyanovsk' => 'Europe/Astrakhan', + 'Europe/Ulyanovsk' => 'Asia/Baku', 'Europe/Uzhgorod' => 'Europe/Athens', 'Europe/Vaduz' => 'Europe/Amsterdam', 'Europe/Vatican' => 'Europe/Amsterdam', 'Europe/Vienna' => 'Europe/Amsterdam', 'Europe/Vilnius' => 'Europe/Athens', - 'Europe/Volgograd' => 'Europe/Moscow', 'Europe/Zagreb' => 'Europe/Amsterdam', 'Europe/Zaporozhye' => 'Europe/Athens', 'Europe/Zurich' => 'Europe/Amsterdam', 'Factory' => 'Africa/Monrovia', 'GB' => 'Europe/London', 'GB-Eire' => 'Europe/London', - 'GMT' => 'Africa/Monrovia', - 'GMT+0' => 'Africa/Monrovia', - 'GMT-0' => 'Africa/Monrovia', 'GMT0' => 'Africa/Monrovia', 'Greenwich' => 'Africa/Monrovia', - 'HST' => 'Pacific/Honolulu', - 'Hongkong' => 'Asia/Chongqing', + 'Hongkong' => 'Asia/Ulaanbaatar', 'Iceland' => 'Africa/Monrovia', 'Indian/Antananarivo' => 'Europe/Moscow', 'Indian/Chagos' => 'Asia/Dhaka', - 'Indian/Christmas' => 'Asia/Bangkok', + 'Indian/Christmas' => 'Asia/Novosibirsk', 'Indian/Cocos' => 'Asia/Rangoon', 'Indian/Comoro' => 'Europe/Moscow', 'Indian/Kerguelen' => 'Asia/Tashkent', - 'Indian/Mahe' => 'Asia/Muscat', + 'Indian/Mahe' => 'Asia/Baku', 'Indian/Maldives' => 'Asia/Tashkent', 'Indian/Mayotte' => 'Europe/Moscow', - 'Indian/Reunion' => 'Asia/Muscat', + 'Indian/Reunion' => 'Asia/Baku', 'Iran' => 'Asia/Tehran', 'Israel' => 'Asia/Jerusalem', 'Jamaica' => 'America/Bogota', 'Japan' => 'Asia/Tokyo', 'Kwajalein' => 'Asia/Anadyr', - 'Libya' => 'Africa/Cairo', - 'MET' => 'Europe/Amsterdam', - 'MST' => 'America/Denver', + 'Libya' => 'Africa/Windhoek', 'MST7MDT' => 'America/Denver', 'Mexico/BajaNorte' => 'America/Los_Angeles', 'Mexico/BajaSur' => 'America/Chihuahua', @@ -402,10 +395,12 @@ 'NZ' => 'Pacific/Auckland', 'NZ-CHAT' => 'Pacific/Chatham', 'Navajo' => 'America/Denver', - 'PRC' => 'Asia/Chongqing', + 'PRC' => 'Asia/Ulaanbaatar', 'PST8PDT' => 'America/Los_Angeles', 'Pacific/Chuuk' => 'Australia/Brisbane', 'Pacific/Efate' => 'Pacific/Bougainville', + 'Pacific/Enderbury' => 'Pacific/Tongatapu', + 'Pacific/Fakaofo' => 'Pacific/Tongatapu', 'Pacific/Funafuti' => 'Asia/Anadyr', 'Pacific/Galapagos' => 'America/Regina', 'Pacific/Johnston' => 'Pacific/Honolulu', @@ -431,11 +426,21 @@ 'Pacific/Yap' => 'Australia/Brisbane', 'Poland' => 'Europe/Amsterdam', 'Portugal' => 'Europe/London', - 'ROC' => 'Asia/Chongqing', + 'ROC' => 'Asia/Ulaanbaatar', 'ROK' => 'Asia/Tokyo', - 'Singapore' => 'Asia/Chongqing', - 'Turkey' => 'Asia/Istanbul', - 'UCT' => 'Africa/Monrovia', + 'Singapore' => 'Asia/Ulaanbaatar', + 'SystemV/AST4' => 'America/Manaus', + 'SystemV/AST4ADT' => 'America/Halifax', + 'SystemV/CST6' => 'America/Regina', + 'SystemV/CST6CDT' => 'America/Chicago', + 'SystemV/EST5' => 'America/Bogota', + 'SystemV/EST5EDT' => 'America/New_York', + 'SystemV/HST10' => 'Pacific/Honolulu', + 'SystemV/MST7' => 'America/Phoenix', + 'SystemV/MST7MDT' => 'America/Denver', + 'SystemV/PST8PDT' => 'America/Los_Angeles', + 'SystemV/YST9YDT' => 'America/Anchorage', + 'Turkey' => 'Europe/Moscow', 'US/Alaska' => 'America/Anchorage', 'US/Aleutian' => 'America/Adak', 'US/Arizona' => 'America/Phoenix', @@ -447,34 +452,44 @@ 'US/Michigan' => 'America/New_York', 'US/Mountain' => 'America/Denver', 'US/Pacific' => 'America/Los_Angeles', - 'US/Pacific-New' => 'America/Los_Angeles', 'US/Samoa' => 'Pacific/Midway', 'UTC' => 'Africa/Monrovia', 'Universal' => 'Africa/Monrovia', 'W-SU' => 'Europe/Moscow', - 'WET' => 'Europe/Amsterdam', 'Zulu' => 'Africa/Monrovia', ); $timezones_nomap = array ( - 0 => 'America/Metlakatla', - 1 => 'America/Punta_Arenas', - 2 => 'Antarctica/Casey', - 3 => 'Antarctica/Palmer', + 0 => 'Africa/Juba', + 1 => 'America/Dawson', + 2 => 'America/Whitehorse', + 3 => 'Antarctica/Casey', 4 => 'Antarctica/Troll', - 5 => 'Asia/Famagusta', - 6 => 'Europe/Chisinau', - 7 => 'Europe/Saratov', - 8 => 'Pacific/Enderbury', - 9 => 'Pacific/Fakaofo', - 10 => 'Pacific/Gambier', - 11 => 'Pacific/Pitcairn', + 5 => 'Europe/Chisinau', + 6 => 'Europe/Dublin', + 7 => 'Europe/Volgograd', + 8 => 'Pacific/Gambier', + 9 => 'Pacific/Pitcairn', ); $timezones_nomap_obsolete = array ( - 0 => 'Etc/GMT+12', - 1 => 'Etc/GMT+8', - 2 => 'Etc/GMT+9', - 3 => 'Etc/GMT-13', - 4 => 'Europe/Tiraspol', + 0 => 'CET', + 1 => 'Canada/Yukon', + 2 => 'EET', + 3 => 'EST', + 4 => 'Eire', + 5 => 'Etc/GMT+12', + 6 => 'Etc/GMT+8', + 7 => 'Etc/GMT+9', + 8 => 'Europe/Tiraspol', + 9 => 'GMT', + 10 => 'GMT+0', + 11 => 'GMT-0', + 12 => 'HST', + 13 => 'MET', + 14 => 'MST', + 15 => 'SystemV/PST8', + 16 => 'SystemV/YST9', + 17 => 'UCT', + 18 => 'WET', ); $timezones_probe_map = array ( '-660:-660:-660:-660:-660:-660' => diff --git a/lib/lib_timezones.js b/lib/lib_timezones.js index 34b4830..8f9dd06 100644 --- a/lib/lib_timezones.js +++ b/lib/lib_timezones.js @@ -415,7 +415,8 @@ function timezones_guess(){ "Asia\/Singapore": "Asia\/Kuala_Lumpur", "Australia\/Sydney": "Australia\/Canberra", "Pacific\/Port_Moresby": "Pacific\/Guam", - "Asia\/Kamchatka": "Asia\/Anadyr" + "Asia\/Kamchatka": "Asia\/Anadyr", + "WET": "Europe\/Amsterdam" } var _auto_alts = { "Africa\/Abidjan": "Africa\/Monrovia", @@ -427,9 +428,9 @@ function timezones_guess(){ "Africa\/Bangui": "Africa\/Algiers", "Africa\/Banjul": "Africa\/Monrovia", "Africa\/Bissau": "Africa\/Monrovia", - "Africa\/Blantyre": "Africa\/Cairo", + "Africa\/Blantyre": "Africa\/Windhoek", "Africa\/Brazzaville": "Africa\/Algiers", - "Africa\/Bujumbura": "Africa\/Cairo", + "Africa\/Bujumbura": "Africa\/Windhoek", "Africa\/Ceuta": "Europe\/Amsterdam", "Africa\/Conakry": "Africa\/Monrovia", "Africa\/Dakar": "Africa\/Monrovia", @@ -438,23 +439,22 @@ function timezones_guess(){ "Africa\/Douala": "Africa\/Algiers", "Africa\/El_Aaiun": "Africa\/Casablanca", "Africa\/Freetown": "Africa\/Monrovia", - "Africa\/Gaborone": "Africa\/Cairo", - "Africa\/Johannesburg": "Africa\/Cairo", - "Africa\/Juba": "Europe\/Moscow", + "Africa\/Gaborone": "Africa\/Windhoek", + "Africa\/Johannesburg": "Africa\/Windhoek", "Africa\/Kampala": "Europe\/Moscow", - "Africa\/Khartoum": "Europe\/Moscow", - "Africa\/Kigali": "Africa\/Cairo", + "Africa\/Khartoum": "Africa\/Windhoek", + "Africa\/Kigali": "Africa\/Windhoek", "Africa\/Kinshasa": "Africa\/Algiers", "Africa\/Lagos": "Africa\/Algiers", "Africa\/Libreville": "Africa\/Algiers", "Africa\/Lome": "Africa\/Monrovia", "Africa\/Luanda": "Africa\/Algiers", - "Africa\/Lubumbashi": "Africa\/Cairo", - "Africa\/Lusaka": "Africa\/Cairo", + "Africa\/Lubumbashi": "Africa\/Windhoek", + "Africa\/Lusaka": "Africa\/Windhoek", "Africa\/Malabo": "Africa\/Algiers", - "Africa\/Maputo": "Africa\/Cairo", - "Africa\/Maseru": "Africa\/Cairo", - "Africa\/Mbabane": "Africa\/Cairo", + "Africa\/Maputo": "Africa\/Windhoek", + "Africa\/Maseru": "Africa\/Windhoek", + "Africa\/Mbabane": "Africa\/Windhoek", "Africa\/Mogadishu": "Europe\/Moscow", "Africa\/Ndjamena": "Africa\/Algiers", "Africa\/Niamey": "Africa\/Algiers", @@ -490,7 +490,7 @@ function timezones_guess(){ "America\/Boa_Vista": "America\/Manaus", "America\/Boise": "America\/Denver", "America\/Cambridge_Bay": "America\/Denver", - "America\/Campo_Grande": "America\/Cuiaba", + "America\/Campo_Grande": "America\/Manaus", "America\/Catamarca": "America\/Buenos_Aires", "America\/Cayman": "America\/Bogota", "America\/Coral_Harbour": "America\/Bogota", @@ -499,7 +499,6 @@ function timezones_guess(){ "America\/Creston": "America\/Phoenix", "America\/Curacao": "America\/Manaus", "America\/Danmarkshavn": "Africa\/Monrovia", - "America\/Dawson": "America\/Los_Angeles", "America\/Dawson_Creek": "America\/Phoenix", "America\/Detroit": "America\/New_York", "America\/Dominica": "America\/Manaus", @@ -507,6 +506,7 @@ function timezones_guess(){ "America\/Eirunepe": "America\/Bogota", "America\/El_Salvador": "America\/Regina", "America\/Ensenada": "America\/Los_Angeles", + "America\/Fort_Nelson": "America\/Phoenix", "America\/Fort_Wayne": "America\/New_York", "America\/Glace_Bay": "America\/Halifax", "America\/Goose_Bay": "America\/Halifax", @@ -546,6 +546,7 @@ function timezones_guess(){ "America\/Mendoza": "America\/Buenos_Aires", "America\/Menominee": "America\/Chicago", "America\/Merida": "America\/Mexico_City", + "America\/Metlakatla": "America\/Anchorage", "America\/Moncton": "America\/Halifax", "America\/Monterrey": "America\/Mexico_City", "America\/Montreal": "America\/New_York", @@ -556,6 +557,7 @@ function timezones_guess(){ "America\/North_Dakota\/Beulah": "America\/Chicago", "America\/North_Dakota\/Center": "America\/Chicago", "America\/North_Dakota\/New_Salem": "America\/Chicago", + "America\/Nuuk": "America\/Godthab", "America\/Ojinaga": "America\/Denver", "America\/Panama": "America\/Bogota", "America\/Pangnirtung": "America\/New_York", @@ -564,6 +566,7 @@ function timezones_guess(){ "America\/Porto_Acre": "America\/Bogota", "America\/Porto_Velho": "America\/Manaus", "America\/Puerto_Rico": "America\/Manaus", + "America\/Punta_Arenas": "America\/Buenos_Aires", "America\/Rainy_River": "America\/Chicago", "America\/Rankin_Inlet": "America\/Chicago", "America\/Recife": "America\/Buenos_Aires", @@ -589,15 +592,15 @@ function timezones_guess(){ "America\/Tortola": "America\/Manaus", "America\/Vancouver": "America\/Los_Angeles", "America\/Virgin": "America\/Manaus", - "America\/Whitehorse": "America\/Los_Angeles", "America\/Winnipeg": "America\/Chicago", "America\/Yakutat": "America\/Anchorage", "America\/Yellowknife": "America\/Denver", - "Antarctica\/Davis": "Asia\/Bangkok", + "Antarctica\/Davis": "Asia\/Novosibirsk", "Antarctica\/DumontDUrville": "Australia\/Brisbane", - "Antarctica\/Macquarie": "Pacific\/Bougainville", + "Antarctica\/Macquarie": "Australia\/Canberra", "Antarctica\/Mawson": "Asia\/Tashkent", "Antarctica\/McMurdo": "Pacific\/Auckland", + "Antarctica\/Palmer": "America\/Buenos_Aires", "Antarctica\/Rothera": "America\/Buenos_Aires", "Antarctica\/South_Pole": "Pacific\/Auckland", "Antarctica\/Syowa": "Europe\/Moscow", @@ -611,50 +614,52 @@ function timezones_guess(){ "Asia\/Atyrau": "Asia\/Tashkent", "Asia\/Bahrain": "Europe\/Moscow", "Asia\/Bishkek": "Asia\/Dhaka", - "Asia\/Brunei": "Asia\/Chongqing", + "Asia\/Brunei": "Asia\/Ulaanbaatar", "Asia\/Calcutta": "Asia\/Kolkata", "Asia\/Choibalsan": "Asia\/Ulaanbaatar", - "Asia\/Chungking": "Asia\/Chongqing", + "Asia\/Chungking": "Asia\/Ulaanbaatar", "Asia\/Dacca": "Asia\/Dhaka", "Asia\/Dili": "Asia\/Tokyo", - "Asia\/Dubai": "Asia\/Muscat", + "Asia\/Dubai": "Asia\/Baku", "Asia\/Dushanbe": "Asia\/Tashkent", - "Asia\/Harbin": "Asia\/Chongqing", + "Asia\/Famagusta": "Europe\/Athens", + "Asia\/Harbin": "Asia\/Ulaanbaatar", "Asia\/Hebron": "Asia\/Gaza", - "Asia\/Ho_Chi_Minh": "Asia\/Bangkok", - "Asia\/Hong_Kong": "Asia\/Chongqing", - "Asia\/Jakarta": "Asia\/Bangkok", + "Asia\/Ho_Chi_Minh": "Asia\/Novosibirsk", + "Asia\/Hong_Kong": "Asia\/Ulaanbaatar", + "Asia\/Jakarta": "Asia\/Novosibirsk", "Asia\/Jayapura": "Asia\/Tokyo", "Asia\/Kamchatka": "Asia\/Anadyr", "Asia\/Kashgar": "Asia\/Dhaka", "Asia\/Kathmandu": "Asia\/Katmandu", "Asia\/Khandyga": "Asia\/Tokyo", - "Asia\/Kuching": "Asia\/Chongqing", - "Asia\/Macao": "Asia\/Chongqing", - "Asia\/Macau": "Asia\/Chongqing", - "Asia\/Makassar": "Asia\/Chongqing", - "Asia\/Manila": "Asia\/Chongqing", + "Asia\/Kuching": "Asia\/Ulaanbaatar", + "Asia\/Macao": "Asia\/Ulaanbaatar", + "Asia\/Macau": "Asia\/Ulaanbaatar", + "Asia\/Makassar": "Asia\/Ulaanbaatar", + "Asia\/Manila": "Asia\/Ulaanbaatar", "Asia\/Nicosia": "Europe\/Athens", - "Asia\/Novokuznetsk": "Asia\/Bangkok", + "Asia\/Novokuznetsk": "Asia\/Novosibirsk", "Asia\/Omsk": "Asia\/Dhaka", "Asia\/Oral": "Asia\/Tashkent", - "Asia\/Phnom_Penh": "Asia\/Bangkok", - "Asia\/Pontianak": "Asia\/Bangkok", + "Asia\/Phnom_Penh": "Asia\/Novosibirsk", + "Asia\/Pontianak": "Asia\/Novosibirsk", "Asia\/Qatar": "Europe\/Moscow", - "Asia\/Qyzylorda": "Asia\/Dhaka", + "Asia\/Qostanay": "Asia\/Dhaka", + "Asia\/Qyzylorda": "Asia\/Tashkent", "Asia\/Riyadh": "Europe\/Moscow", - "Asia\/Saigon": "Asia\/Bangkok", + "Asia\/Saigon": "Asia\/Novosibirsk", "Asia\/Samarkand": "Asia\/Tashkent", - "Asia\/Shanghai": "Asia\/Chongqing", - "Asia\/Singapore": "Asia\/Chongqing", + "Asia\/Shanghai": "Asia\/Ulaanbaatar", + "Asia\/Singapore": "Asia\/Ulaanbaatar", "Asia\/Tel_Aviv": "Asia\/Jerusalem", "Asia\/Thimbu": "Asia\/Dhaka", "Asia\/Thimphu": "Asia\/Dhaka", - "Asia\/Ujung_Pandang": "Asia\/Chongqing", + "Asia\/Ujung_Pandang": "Asia\/Ulaanbaatar", "Asia\/Ulan_Bator": "Asia\/Ulaanbaatar", "Asia\/Urumqi": "Asia\/Dhaka", "Asia\/Ust-Nera": "Australia\/Brisbane", - "Asia\/Vientiane": "Asia\/Bangkok", + "Asia\/Vientiane": "Asia\/Novosibirsk", "Asia\/Yangon": "Asia\/Rangoon", "Atlantic\/Bermuda": "America\/Halifax", "Atlantic\/Canary": "Europe\/London", @@ -679,31 +684,25 @@ function timezones_guess(){ "Australia\/Sydney": "Australia\/Canberra", "Australia\/Tasmania": "Australia\/Canberra", "Australia\/Victoria": "Australia\/Canberra", - "Australia\/West": "Asia\/Chongqing", + "Australia\/West": "Asia\/Ulaanbaatar", "Australia\/Yancowinna": "Australia\/Adelaide", "Brazil\/Acre": "America\/Bogota", "Brazil\/DeNoronha": "America\/Noronha", - "Brazil\/East": "America\/Sao_Paulo", + "Brazil\/East": "America\/Buenos_Aires", "Brazil\/West": "America\/Manaus", - "CET": "Europe\/Amsterdam", "CST6CDT": "America\/Chicago", "Canada\/Atlantic": "America\/Halifax", "Canada\/Central": "America\/Chicago", - "Canada\/East-Saskatchewan": "America\/Regina", "Canada\/Eastern": "America\/New_York", "Canada\/Mountain": "America\/Denver", "Canada\/Newfoundland": "America\/St_Johns", "Canada\/Pacific": "America\/Los_Angeles", "Canada\/Saskatchewan": "America\/Regina", - "Canada\/Yukon": "America\/Los_Angeles", "Chile\/Continental": "America\/Santiago", "Chile\/EasterIsland": "Pacific\/Easter", "Cuba": "America\/Havana", - "EET": "Europe\/Athens", - "EST": "America\/New_York", "EST5EDT": "America\/New_York", - "Egypt": "Africa\/Cairo", - "Eire": "Europe\/London", + "Egypt": "Africa\/Windhoek", "Etc\/GMT": "Africa\/Monrovia", "Etc\/GMT+0": "Africa\/Monrovia", "Etc\/GMT+1": "Atlantic\/Cape_Verde", @@ -720,14 +719,15 @@ function timezones_guess(){ "Etc\/GMT-10": "Australia\/Brisbane", "Etc\/GMT-11": "Pacific\/Bougainville", "Etc\/GMT-12": "Asia\/Anadyr", + "Etc\/GMT-13": "Pacific\/Tongatapu", "Etc\/GMT-14": "Pacific\/Kiritimati", - "Etc\/GMT-2": "Africa\/Cairo", + "Etc\/GMT-2": "Africa\/Windhoek", "Etc\/GMT-3": "Europe\/Moscow", - "Etc\/GMT-4": "Asia\/Muscat", + "Etc\/GMT-4": "Asia\/Baku", "Etc\/GMT-5": "Asia\/Tashkent", "Etc\/GMT-6": "Asia\/Dhaka", - "Etc\/GMT-7": "Asia\/Bangkok", - "Etc\/GMT-8": "Asia\/Chongqing", + "Etc\/GMT-7": "Asia\/Novosibirsk", + "Etc\/GMT-8": "Asia\/Ulaanbaatar", "Etc\/GMT-9": "Asia\/Tokyo", "Etc\/GMT0": "Africa\/Monrovia", "Etc\/Greenwich": "Africa\/Monrovia", @@ -743,11 +743,10 @@ function timezones_guess(){ "Europe\/Budapest": "Europe\/Amsterdam", "Europe\/Busingen": "Europe\/Amsterdam", "Europe\/Copenhagen": "Europe\/Amsterdam", - "Europe\/Dublin": "Europe\/London", "Europe\/Gibraltar": "Europe\/Amsterdam", "Europe\/Guernsey": "Europe\/London", "Europe\/Isle_of_Man": "Europe\/London", - "Europe\/Istanbul": "Asia\/Istanbul", + "Europe\/Istanbul": "Europe\/Moscow", "Europe\/Jersey": "Europe\/London", "Europe\/Kiev": "Europe\/Athens", "Europe\/Kirov": "Europe\/Moscow", @@ -767,51 +766,45 @@ function timezones_guess(){ "Europe\/Rome": "Europe\/Amsterdam", "Europe\/San_Marino": "Europe\/Amsterdam", "Europe\/Sarajevo": "Europe\/Amsterdam", + "Europe\/Saratov": "Asia\/Baku", "Europe\/Simferopol": "Europe\/Moscow", "Europe\/Skopje": "Europe\/Amsterdam", "Europe\/Sofia": "Europe\/Athens", "Europe\/Stockholm": "Europe\/Amsterdam", "Europe\/Tallinn": "Europe\/Athens", "Europe\/Tirane": "Europe\/Amsterdam", - "Europe\/Ulyanovsk": "Europe\/Astrakhan", + "Europe\/Ulyanovsk": "Asia\/Baku", "Europe\/Uzhgorod": "Europe\/Athens", "Europe\/Vaduz": "Europe\/Amsterdam", "Europe\/Vatican": "Europe\/Amsterdam", "Europe\/Vienna": "Europe\/Amsterdam", "Europe\/Vilnius": "Europe\/Athens", - "Europe\/Volgograd": "Europe\/Moscow", "Europe\/Zagreb": "Europe\/Amsterdam", "Europe\/Zaporozhye": "Europe\/Athens", "Europe\/Zurich": "Europe\/Amsterdam", "Factory": "Africa\/Monrovia", "GB": "Europe\/London", "GB-Eire": "Europe\/London", - "GMT": "Africa\/Monrovia", - "GMT+0": "Africa\/Monrovia", - "GMT-0": "Africa\/Monrovia", "GMT0": "Africa\/Monrovia", "Greenwich": "Africa\/Monrovia", - "HST": "Pacific\/Honolulu", - "Hongkong": "Asia\/Chongqing", + "Hongkong": "Asia\/Ulaanbaatar", "Iceland": "Africa\/Monrovia", "Indian\/Antananarivo": "Europe\/Moscow", "Indian\/Chagos": "Asia\/Dhaka", - "Indian\/Christmas": "Asia\/Bangkok", + "Indian\/Christmas": "Asia\/Novosibirsk", "Indian\/Cocos": "Asia\/Rangoon", "Indian\/Comoro": "Europe\/Moscow", "Indian\/Kerguelen": "Asia\/Tashkent", - "Indian\/Mahe": "Asia\/Muscat", + "Indian\/Mahe": "Asia\/Baku", "Indian\/Maldives": "Asia\/Tashkent", "Indian\/Mayotte": "Europe\/Moscow", - "Indian\/Reunion": "Asia\/Muscat", + "Indian\/Reunion": "Asia\/Baku", "Iran": "Asia\/Tehran", "Israel": "Asia\/Jerusalem", "Jamaica": "America\/Bogota", "Japan": "Asia\/Tokyo", "Kwajalein": "Asia\/Anadyr", - "Libya": "Africa\/Cairo", - "MET": "Europe\/Amsterdam", - "MST": "America\/Denver", + "Libya": "Africa\/Windhoek", "MST7MDT": "America\/Denver", "Mexico\/BajaNorte": "America\/Los_Angeles", "Mexico\/BajaSur": "America\/Chihuahua", @@ -819,10 +812,12 @@ function timezones_guess(){ "NZ": "Pacific\/Auckland", "NZ-CHAT": "Pacific\/Chatham", "Navajo": "America\/Denver", - "PRC": "Asia\/Chongqing", + "PRC": "Asia\/Ulaanbaatar", "PST8PDT": "America\/Los_Angeles", "Pacific\/Chuuk": "Australia\/Brisbane", "Pacific\/Efate": "Pacific\/Bougainville", + "Pacific\/Enderbury": "Pacific\/Tongatapu", + "Pacific\/Fakaofo": "Pacific\/Tongatapu", "Pacific\/Funafuti": "Asia\/Anadyr", "Pacific\/Galapagos": "America\/Regina", "Pacific\/Johnston": "Pacific\/Honolulu", @@ -848,11 +843,21 @@ function timezones_guess(){ "Pacific\/Yap": "Australia\/Brisbane", "Poland": "Europe\/Amsterdam", "Portugal": "Europe\/London", - "ROC": "Asia\/Chongqing", + "ROC": "Asia\/Ulaanbaatar", "ROK": "Asia\/Tokyo", - "Singapore": "Asia\/Chongqing", - "Turkey": "Asia\/Istanbul", - "UCT": "Africa\/Monrovia", + "Singapore": "Asia\/Ulaanbaatar", + "SystemV\/AST4": "America\/Manaus", + "SystemV\/AST4ADT": "America\/Halifax", + "SystemV\/CST6": "America\/Regina", + "SystemV\/CST6CDT": "America\/Chicago", + "SystemV\/EST5": "America\/Bogota", + "SystemV\/EST5EDT": "America\/New_York", + "SystemV\/HST10": "Pacific\/Honolulu", + "SystemV\/MST7": "America\/Phoenix", + "SystemV\/MST7MDT": "America\/Denver", + "SystemV\/PST8PDT": "America\/Los_Angeles", + "SystemV\/YST9YDT": "America\/Anchorage", + "Turkey": "Europe\/Moscow", "US\/Alaska": "America\/Anchorage", "US\/Aleutian": "America\/Adak", "US\/Arizona": "America\/Phoenix", @@ -864,36 +869,46 @@ function timezones_guess(){ "US\/Michigan": "America\/New_York", "US\/Mountain": "America\/Denver", "US\/Pacific": "America\/Los_Angeles", - "US\/Pacific-New": "America\/Los_Angeles", "US\/Samoa": "Pacific\/Midway", "UTC": "Africa\/Monrovia", "Universal": "Africa\/Monrovia", "W-SU": "Europe\/Moscow", - "WET": "Europe\/Amsterdam", "Zulu": "Africa\/Monrovia" }; var _fallback_alts = { - "America\/Fort_Nelson": "America\/Denver" + }; // The follow zone IDs have no mapping to our choice list: - // America/Metlakatla - // America/Punta_Arenas + // Africa/Juba + // America/Dawson + // America/Whitehorse // Antarctica/Casey - // Antarctica/Palmer // Antarctica/Troll - // Asia/Famagusta // Europe/Chisinau - // Europe/Saratov - // Pacific/Enderbury - // Pacific/Fakaofo + // Europe/Dublin + // Europe/Volgograd // Pacific/Gambier // Pacific/Pitcairn + // CET (Obsolete) + // Canada/Yukon (Obsolete) + // EET (Obsolete) + // EST (Obsolete) + // Eire (Obsolete) // Etc/GMT+12 (Obsolete) // Etc/GMT+8 (Obsolete) // Etc/GMT+9 (Obsolete) - // Etc/GMT-13 (Obsolete) // Europe/Tiraspol (Obsolete) + // GMT (Obsolete) + // GMT+0 (Obsolete) + // GMT-0 (Obsolete) + // HST (Obsolete) + // MET (Obsolete) + // MST (Obsolete) + // SystemV/PST8 (Obsolete) + // SystemV/YST9 (Obsolete) + // UCT (Obsolete) + // WET (Obsolete) return self; diff --git a/lib/lib_timezones.min.js b/lib/lib_timezones.min.js index be3920c..b624ce8 100644 --- a/lib/lib_timezones.min.js +++ b/lib/lib_timezones.min.js @@ -1,2 +1,2 @@ -/*! lib_timezones 2017-06-08 */ -"use strict";function timezones_list(){var a=new TimezoneDetector;return a.getList()}function timezones_guess(){var a=new TimezoneDetector,b={};arguments.length>0&&(b["default"]=arguments[0]);var c=a.detect(b);return c.zoneId}(function(){var a=this,b=(a.TimezoneDetector,function(){var a=this;a.getList=function(){return e},a.detect=function(a){var d={zoneId:"America/Los_Angeles",method:"gave_up"};a&&a["default"]&&(d.zoneId=a["default"],d.method="default"),d.intl=b();var i=d.intl.zoneId;if(i){for(var j=0;j 'Australia/Canberra', 'Pacific/Port_Moresby' => 'Pacific/Guam', 'Asia/Kamchatka' => 'Asia/Anadyr', + 'WET' => 'Europe/Amsterdam', ); $auto_map = array( 'Africa/Abidjan' => 'Africa/Monrovia', @@ -305,9 +306,9 @@ function timezones_filter($zone, $default = null){ 'Africa/Bangui' => 'Africa/Algiers', 'Africa/Banjul' => 'Africa/Monrovia', 'Africa/Bissau' => 'Africa/Monrovia', - 'Africa/Blantyre' => 'Africa/Cairo', + 'Africa/Blantyre' => 'Africa/Windhoek', 'Africa/Brazzaville' => 'Africa/Algiers', - 'Africa/Bujumbura' => 'Africa/Cairo', + 'Africa/Bujumbura' => 'Africa/Windhoek', 'Africa/Ceuta' => 'Europe/Amsterdam', 'Africa/Conakry' => 'Africa/Monrovia', 'Africa/Dakar' => 'Africa/Monrovia', @@ -316,23 +317,22 @@ function timezones_filter($zone, $default = null){ 'Africa/Douala' => 'Africa/Algiers', 'Africa/El_Aaiun' => 'Africa/Casablanca', 'Africa/Freetown' => 'Africa/Monrovia', - 'Africa/Gaborone' => 'Africa/Cairo', - 'Africa/Johannesburg' => 'Africa/Cairo', - 'Africa/Juba' => 'Europe/Moscow', + 'Africa/Gaborone' => 'Africa/Windhoek', + 'Africa/Johannesburg' => 'Africa/Windhoek', 'Africa/Kampala' => 'Europe/Moscow', - 'Africa/Khartoum' => 'Europe/Moscow', - 'Africa/Kigali' => 'Africa/Cairo', + 'Africa/Khartoum' => 'Africa/Windhoek', + 'Africa/Kigali' => 'Africa/Windhoek', 'Africa/Kinshasa' => 'Africa/Algiers', 'Africa/Lagos' => 'Africa/Algiers', 'Africa/Libreville' => 'Africa/Algiers', 'Africa/Lome' => 'Africa/Monrovia', 'Africa/Luanda' => 'Africa/Algiers', - 'Africa/Lubumbashi' => 'Africa/Cairo', - 'Africa/Lusaka' => 'Africa/Cairo', + 'Africa/Lubumbashi' => 'Africa/Windhoek', + 'Africa/Lusaka' => 'Africa/Windhoek', 'Africa/Malabo' => 'Africa/Algiers', - 'Africa/Maputo' => 'Africa/Cairo', - 'Africa/Maseru' => 'Africa/Cairo', - 'Africa/Mbabane' => 'Africa/Cairo', + 'Africa/Maputo' => 'Africa/Windhoek', + 'Africa/Maseru' => 'Africa/Windhoek', + 'Africa/Mbabane' => 'Africa/Windhoek', 'Africa/Mogadishu' => 'Europe/Moscow', 'Africa/Ndjamena' => 'Africa/Algiers', 'Africa/Niamey' => 'Africa/Algiers', @@ -368,7 +368,7 @@ function timezones_filter($zone, $default = null){ 'America/Boa_Vista' => 'America/Manaus', 'America/Boise' => 'America/Denver', 'America/Cambridge_Bay' => 'America/Denver', - 'America/Campo_Grande' => 'America/Cuiaba', + 'America/Campo_Grande' => 'America/Manaus', 'America/Catamarca' => 'America/Buenos_Aires', 'America/Cayman' => 'America/Bogota', 'America/Coral_Harbour' => 'America/Bogota', @@ -377,7 +377,6 @@ function timezones_filter($zone, $default = null){ 'America/Creston' => 'America/Phoenix', 'America/Curacao' => 'America/Manaus', 'America/Danmarkshavn' => 'Africa/Monrovia', - 'America/Dawson' => 'America/Los_Angeles', 'America/Dawson_Creek' => 'America/Phoenix', 'America/Detroit' => 'America/New_York', 'America/Dominica' => 'America/Manaus', @@ -385,6 +384,7 @@ function timezones_filter($zone, $default = null){ 'America/Eirunepe' => 'America/Bogota', 'America/El_Salvador' => 'America/Regina', 'America/Ensenada' => 'America/Los_Angeles', + 'America/Fort_Nelson' => 'America/Phoenix', 'America/Fort_Wayne' => 'America/New_York', 'America/Glace_Bay' => 'America/Halifax', 'America/Goose_Bay' => 'America/Halifax', @@ -424,6 +424,7 @@ function timezones_filter($zone, $default = null){ 'America/Mendoza' => 'America/Buenos_Aires', 'America/Menominee' => 'America/Chicago', 'America/Merida' => 'America/Mexico_City', + 'America/Metlakatla' => 'America/Anchorage', 'America/Moncton' => 'America/Halifax', 'America/Monterrey' => 'America/Mexico_City', 'America/Montreal' => 'America/New_York', @@ -434,6 +435,7 @@ function timezones_filter($zone, $default = null){ 'America/North_Dakota/Beulah' => 'America/Chicago', 'America/North_Dakota/Center' => 'America/Chicago', 'America/North_Dakota/New_Salem' => 'America/Chicago', + 'America/Nuuk' => 'America/Godthab', 'America/Ojinaga' => 'America/Denver', 'America/Panama' => 'America/Bogota', 'America/Pangnirtung' => 'America/New_York', @@ -442,6 +444,7 @@ function timezones_filter($zone, $default = null){ 'America/Porto_Acre' => 'America/Bogota', 'America/Porto_Velho' => 'America/Manaus', 'America/Puerto_Rico' => 'America/Manaus', + 'America/Punta_Arenas' => 'America/Buenos_Aires', 'America/Rainy_River' => 'America/Chicago', 'America/Rankin_Inlet' => 'America/Chicago', 'America/Recife' => 'America/Buenos_Aires', @@ -467,15 +470,15 @@ function timezones_filter($zone, $default = null){ 'America/Tortola' => 'America/Manaus', 'America/Vancouver' => 'America/Los_Angeles', 'America/Virgin' => 'America/Manaus', - 'America/Whitehorse' => 'America/Los_Angeles', 'America/Winnipeg' => 'America/Chicago', 'America/Yakutat' => 'America/Anchorage', 'America/Yellowknife' => 'America/Denver', - 'Antarctica/Davis' => 'Asia/Bangkok', + 'Antarctica/Davis' => 'Asia/Novosibirsk', 'Antarctica/DumontDUrville' => 'Australia/Brisbane', - 'Antarctica/Macquarie' => 'Pacific/Bougainville', + 'Antarctica/Macquarie' => 'Australia/Canberra', 'Antarctica/Mawson' => 'Asia/Tashkent', 'Antarctica/McMurdo' => 'Pacific/Auckland', + 'Antarctica/Palmer' => 'America/Buenos_Aires', 'Antarctica/Rothera' => 'America/Buenos_Aires', 'Antarctica/South_Pole' => 'Pacific/Auckland', 'Antarctica/Syowa' => 'Europe/Moscow', @@ -489,50 +492,52 @@ function timezones_filter($zone, $default = null){ 'Asia/Atyrau' => 'Asia/Tashkent', 'Asia/Bahrain' => 'Europe/Moscow', 'Asia/Bishkek' => 'Asia/Dhaka', - 'Asia/Brunei' => 'Asia/Chongqing', + 'Asia/Brunei' => 'Asia/Ulaanbaatar', 'Asia/Calcutta' => 'Asia/Kolkata', 'Asia/Choibalsan' => 'Asia/Ulaanbaatar', - 'Asia/Chungking' => 'Asia/Chongqing', + 'Asia/Chungking' => 'Asia/Ulaanbaatar', 'Asia/Dacca' => 'Asia/Dhaka', 'Asia/Dili' => 'Asia/Tokyo', - 'Asia/Dubai' => 'Asia/Muscat', + 'Asia/Dubai' => 'Asia/Baku', 'Asia/Dushanbe' => 'Asia/Tashkent', - 'Asia/Harbin' => 'Asia/Chongqing', + 'Asia/Famagusta' => 'Europe/Athens', + 'Asia/Harbin' => 'Asia/Ulaanbaatar', 'Asia/Hebron' => 'Asia/Gaza', - 'Asia/Ho_Chi_Minh' => 'Asia/Bangkok', - 'Asia/Hong_Kong' => 'Asia/Chongqing', - 'Asia/Jakarta' => 'Asia/Bangkok', + 'Asia/Ho_Chi_Minh' => 'Asia/Novosibirsk', + 'Asia/Hong_Kong' => 'Asia/Ulaanbaatar', + 'Asia/Jakarta' => 'Asia/Novosibirsk', 'Asia/Jayapura' => 'Asia/Tokyo', 'Asia/Kamchatka' => 'Asia/Anadyr', 'Asia/Kashgar' => 'Asia/Dhaka', 'Asia/Kathmandu' => 'Asia/Katmandu', 'Asia/Khandyga' => 'Asia/Tokyo', - 'Asia/Kuching' => 'Asia/Chongqing', - 'Asia/Macao' => 'Asia/Chongqing', - 'Asia/Macau' => 'Asia/Chongqing', - 'Asia/Makassar' => 'Asia/Chongqing', - 'Asia/Manila' => 'Asia/Chongqing', + 'Asia/Kuching' => 'Asia/Ulaanbaatar', + 'Asia/Macao' => 'Asia/Ulaanbaatar', + 'Asia/Macau' => 'Asia/Ulaanbaatar', + 'Asia/Makassar' => 'Asia/Ulaanbaatar', + 'Asia/Manila' => 'Asia/Ulaanbaatar', 'Asia/Nicosia' => 'Europe/Athens', - 'Asia/Novokuznetsk' => 'Asia/Bangkok', + 'Asia/Novokuznetsk' => 'Asia/Novosibirsk', 'Asia/Omsk' => 'Asia/Dhaka', 'Asia/Oral' => 'Asia/Tashkent', - 'Asia/Phnom_Penh' => 'Asia/Bangkok', - 'Asia/Pontianak' => 'Asia/Bangkok', + 'Asia/Phnom_Penh' => 'Asia/Novosibirsk', + 'Asia/Pontianak' => 'Asia/Novosibirsk', 'Asia/Qatar' => 'Europe/Moscow', - 'Asia/Qyzylorda' => 'Asia/Dhaka', + 'Asia/Qostanay' => 'Asia/Dhaka', + 'Asia/Qyzylorda' => 'Asia/Tashkent', 'Asia/Riyadh' => 'Europe/Moscow', - 'Asia/Saigon' => 'Asia/Bangkok', + 'Asia/Saigon' => 'Asia/Novosibirsk', 'Asia/Samarkand' => 'Asia/Tashkent', - 'Asia/Shanghai' => 'Asia/Chongqing', - 'Asia/Singapore' => 'Asia/Chongqing', + 'Asia/Shanghai' => 'Asia/Ulaanbaatar', + 'Asia/Singapore' => 'Asia/Ulaanbaatar', 'Asia/Tel_Aviv' => 'Asia/Jerusalem', 'Asia/Thimbu' => 'Asia/Dhaka', 'Asia/Thimphu' => 'Asia/Dhaka', - 'Asia/Ujung_Pandang' => 'Asia/Chongqing', + 'Asia/Ujung_Pandang' => 'Asia/Ulaanbaatar', 'Asia/Ulan_Bator' => 'Asia/Ulaanbaatar', 'Asia/Urumqi' => 'Asia/Dhaka', 'Asia/Ust-Nera' => 'Australia/Brisbane', - 'Asia/Vientiane' => 'Asia/Bangkok', + 'Asia/Vientiane' => 'Asia/Novosibirsk', 'Asia/Yangon' => 'Asia/Rangoon', 'Atlantic/Bermuda' => 'America/Halifax', 'Atlantic/Canary' => 'Europe/London', @@ -557,31 +562,25 @@ function timezones_filter($zone, $default = null){ 'Australia/Sydney' => 'Australia/Canberra', 'Australia/Tasmania' => 'Australia/Canberra', 'Australia/Victoria' => 'Australia/Canberra', - 'Australia/West' => 'Asia/Chongqing', + 'Australia/West' => 'Asia/Ulaanbaatar', 'Australia/Yancowinna' => 'Australia/Adelaide', 'Brazil/Acre' => 'America/Bogota', 'Brazil/DeNoronha' => 'America/Noronha', - 'Brazil/East' => 'America/Sao_Paulo', + 'Brazil/East' => 'America/Buenos_Aires', 'Brazil/West' => 'America/Manaus', - 'CET' => 'Europe/Amsterdam', 'CST6CDT' => 'America/Chicago', 'Canada/Atlantic' => 'America/Halifax', 'Canada/Central' => 'America/Chicago', - 'Canada/East-Saskatchewan' => 'America/Regina', 'Canada/Eastern' => 'America/New_York', 'Canada/Mountain' => 'America/Denver', 'Canada/Newfoundland' => 'America/St_Johns', 'Canada/Pacific' => 'America/Los_Angeles', 'Canada/Saskatchewan' => 'America/Regina', - 'Canada/Yukon' => 'America/Los_Angeles', 'Chile/Continental' => 'America/Santiago', 'Chile/EasterIsland' => 'Pacific/Easter', 'Cuba' => 'America/Havana', - 'EET' => 'Europe/Athens', - 'EST' => 'America/New_York', 'EST5EDT' => 'America/New_York', - 'Egypt' => 'Africa/Cairo', - 'Eire' => 'Europe/London', + 'Egypt' => 'Africa/Windhoek', 'Etc/GMT' => 'Africa/Monrovia', 'Etc/GMT+0' => 'Africa/Monrovia', 'Etc/GMT+1' => 'Atlantic/Cape_Verde', @@ -598,14 +597,15 @@ function timezones_filter($zone, $default = null){ 'Etc/GMT-10' => 'Australia/Brisbane', 'Etc/GMT-11' => 'Pacific/Bougainville', 'Etc/GMT-12' => 'Asia/Anadyr', + 'Etc/GMT-13' => 'Pacific/Tongatapu', 'Etc/GMT-14' => 'Pacific/Kiritimati', - 'Etc/GMT-2' => 'Africa/Cairo', + 'Etc/GMT-2' => 'Africa/Windhoek', 'Etc/GMT-3' => 'Europe/Moscow', - 'Etc/GMT-4' => 'Asia/Muscat', + 'Etc/GMT-4' => 'Asia/Baku', 'Etc/GMT-5' => 'Asia/Tashkent', 'Etc/GMT-6' => 'Asia/Dhaka', - 'Etc/GMT-7' => 'Asia/Bangkok', - 'Etc/GMT-8' => 'Asia/Chongqing', + 'Etc/GMT-7' => 'Asia/Novosibirsk', + 'Etc/GMT-8' => 'Asia/Ulaanbaatar', 'Etc/GMT-9' => 'Asia/Tokyo', 'Etc/GMT0' => 'Africa/Monrovia', 'Etc/Greenwich' => 'Africa/Monrovia', @@ -621,11 +621,10 @@ function timezones_filter($zone, $default = null){ 'Europe/Budapest' => 'Europe/Amsterdam', 'Europe/Busingen' => 'Europe/Amsterdam', 'Europe/Copenhagen' => 'Europe/Amsterdam', - 'Europe/Dublin' => 'Europe/London', 'Europe/Gibraltar' => 'Europe/Amsterdam', 'Europe/Guernsey' => 'Europe/London', 'Europe/Isle_of_Man' => 'Europe/London', - 'Europe/Istanbul' => 'Asia/Istanbul', + 'Europe/Istanbul' => 'Europe/Moscow', 'Europe/Jersey' => 'Europe/London', 'Europe/Kiev' => 'Europe/Athens', 'Europe/Kirov' => 'Europe/Moscow', @@ -645,51 +644,45 @@ function timezones_filter($zone, $default = null){ 'Europe/Rome' => 'Europe/Amsterdam', 'Europe/San_Marino' => 'Europe/Amsterdam', 'Europe/Sarajevo' => 'Europe/Amsterdam', + 'Europe/Saratov' => 'Asia/Baku', 'Europe/Simferopol' => 'Europe/Moscow', 'Europe/Skopje' => 'Europe/Amsterdam', 'Europe/Sofia' => 'Europe/Athens', 'Europe/Stockholm' => 'Europe/Amsterdam', 'Europe/Tallinn' => 'Europe/Athens', 'Europe/Tirane' => 'Europe/Amsterdam', - 'Europe/Ulyanovsk' => 'Europe/Astrakhan', + 'Europe/Ulyanovsk' => 'Asia/Baku', 'Europe/Uzhgorod' => 'Europe/Athens', 'Europe/Vaduz' => 'Europe/Amsterdam', 'Europe/Vatican' => 'Europe/Amsterdam', 'Europe/Vienna' => 'Europe/Amsterdam', 'Europe/Vilnius' => 'Europe/Athens', - 'Europe/Volgograd' => 'Europe/Moscow', 'Europe/Zagreb' => 'Europe/Amsterdam', 'Europe/Zaporozhye' => 'Europe/Athens', 'Europe/Zurich' => 'Europe/Amsterdam', 'Factory' => 'Africa/Monrovia', 'GB' => 'Europe/London', 'GB-Eire' => 'Europe/London', - 'GMT' => 'Africa/Monrovia', - 'GMT+0' => 'Africa/Monrovia', - 'GMT-0' => 'Africa/Monrovia', 'GMT0' => 'Africa/Monrovia', 'Greenwich' => 'Africa/Monrovia', - 'HST' => 'Pacific/Honolulu', - 'Hongkong' => 'Asia/Chongqing', + 'Hongkong' => 'Asia/Ulaanbaatar', 'Iceland' => 'Africa/Monrovia', 'Indian/Antananarivo' => 'Europe/Moscow', 'Indian/Chagos' => 'Asia/Dhaka', - 'Indian/Christmas' => 'Asia/Bangkok', + 'Indian/Christmas' => 'Asia/Novosibirsk', 'Indian/Cocos' => 'Asia/Rangoon', 'Indian/Comoro' => 'Europe/Moscow', 'Indian/Kerguelen' => 'Asia/Tashkent', - 'Indian/Mahe' => 'Asia/Muscat', + 'Indian/Mahe' => 'Asia/Baku', 'Indian/Maldives' => 'Asia/Tashkent', 'Indian/Mayotte' => 'Europe/Moscow', - 'Indian/Reunion' => 'Asia/Muscat', + 'Indian/Reunion' => 'Asia/Baku', 'Iran' => 'Asia/Tehran', 'Israel' => 'Asia/Jerusalem', 'Jamaica' => 'America/Bogota', 'Japan' => 'Asia/Tokyo', 'Kwajalein' => 'Asia/Anadyr', - 'Libya' => 'Africa/Cairo', - 'MET' => 'Europe/Amsterdam', - 'MST' => 'America/Denver', + 'Libya' => 'Africa/Windhoek', 'MST7MDT' => 'America/Denver', 'Mexico/BajaNorte' => 'America/Los_Angeles', 'Mexico/BajaSur' => 'America/Chihuahua', @@ -697,10 +690,12 @@ function timezones_filter($zone, $default = null){ 'NZ' => 'Pacific/Auckland', 'NZ-CHAT' => 'Pacific/Chatham', 'Navajo' => 'America/Denver', - 'PRC' => 'Asia/Chongqing', + 'PRC' => 'Asia/Ulaanbaatar', 'PST8PDT' => 'America/Los_Angeles', 'Pacific/Chuuk' => 'Australia/Brisbane', 'Pacific/Efate' => 'Pacific/Bougainville', + 'Pacific/Enderbury' => 'Pacific/Tongatapu', + 'Pacific/Fakaofo' => 'Pacific/Tongatapu', 'Pacific/Funafuti' => 'Asia/Anadyr', 'Pacific/Galapagos' => 'America/Regina', 'Pacific/Johnston' => 'Pacific/Honolulu', @@ -726,11 +721,21 @@ function timezones_filter($zone, $default = null){ 'Pacific/Yap' => 'Australia/Brisbane', 'Poland' => 'Europe/Amsterdam', 'Portugal' => 'Europe/London', - 'ROC' => 'Asia/Chongqing', + 'ROC' => 'Asia/Ulaanbaatar', 'ROK' => 'Asia/Tokyo', - 'Singapore' => 'Asia/Chongqing', - 'Turkey' => 'Asia/Istanbul', - 'UCT' => 'Africa/Monrovia', + 'Singapore' => 'Asia/Ulaanbaatar', + 'SystemV/AST4' => 'America/Manaus', + 'SystemV/AST4ADT' => 'America/Halifax', + 'SystemV/CST6' => 'America/Regina', + 'SystemV/CST6CDT' => 'America/Chicago', + 'SystemV/EST5' => 'America/Bogota', + 'SystemV/EST5EDT' => 'America/New_York', + 'SystemV/HST10' => 'Pacific/Honolulu', + 'SystemV/MST7' => 'America/Phoenix', + 'SystemV/MST7MDT' => 'America/Denver', + 'SystemV/PST8PDT' => 'America/Los_Angeles', + 'SystemV/YST9YDT' => 'America/Anchorage', + 'Turkey' => 'Europe/Moscow', 'US/Alaska' => 'America/Anchorage', 'US/Aleutian' => 'America/Adak', 'US/Arizona' => 'America/Phoenix', @@ -742,16 +747,13 @@ function timezones_filter($zone, $default = null){ 'US/Michigan' => 'America/New_York', 'US/Mountain' => 'America/Denver', 'US/Pacific' => 'America/Los_Angeles', - 'US/Pacific-New' => 'America/Los_Angeles', 'US/Samoa' => 'Pacific/Midway', 'UTC' => 'Africa/Monrovia', 'Universal' => 'Africa/Monrovia', 'W-SU' => 'Europe/Moscow', - 'WET' => 'Europe/Amsterdam', 'Zulu' => 'Africa/Monrovia', ); $fallback_map = array( - 'America/Fort_Nelson' => 'America/Denver', ); if (isset($manual_map[$zone])) return $manual_map[$zone];