L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-63032-master' of git://github.com/peterRd/moodle

Browse Source
This commit is contained in:
Sara Arjona
2020-02-14 11:15:30 +01:00
committed by Eloy Lafuente (stronk7)
parent c74532c8b3 1cb6c0bb31
commit 4bbf8716fa
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/classes/date.php
+18
View File
@@ -374,18 +374,24 @@ class core_date {
'Central Standard Time (Mexico)' => 'America/Mexico_City',
'Canada Central Standard Time' => 'America/Regina',
'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',
'Venezuela Standard Time' => 'America/Caracas',
'Paraguay Standard Time' => 'America/Asuncion',
'Atlantic Standard Time' => 'America/Halifax',
'Central Brazilian Standard Time' => 'America/Cuiaba',
'SA Western Standard Time' => 'America/La_Paz',
'S.A. Western Standard Time' => 'America/La_Paz',
'Pacific SA Standard Time' => 'America/Santiago',
'Pacific S.A. Standard Time' => 'America/Santiago',
'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',
'SA Eastern Standard Time' => 'America/Cayenne',
'S.A. Eastern Standard Time' => 'America/Cayenne',
'Greenland Standard Time' => 'America/Godthab',
'Montevideo Standard Time' => 'America/Montevideo',
'Bahia Standard Time' => 'America/Bahia',
@@ -435,6 +441,7 @@ class core_date {
'N. Central Asia Standard Time' => 'Asia/Novosibirsk',
'Myanmar Standard Time' => 'Asia/Rangoon',
'SE Asia Standard Time' => 'Asia/Bangkok',
'S.E. Asia Standard Time' => 'Asia/Bangkok',
'North Asia Standard Time' => 'Asia/Krasnoyarsk',
'China Standard Time' => 'Asia/Shanghai',
'North Asia East Standard Time' => 'Asia/Irkutsk',
@@ -447,8 +454,10 @@ class core_date {
'Yakutsk Standard Time' => 'Asia/Yakutsk',
'Cen. Australia Standard Time' => 'Australia/Adelaide',
'AUS Central Standard Time' => 'Australia/Darwin',
'A.U.S. Central Standard Time' => 'Australia/Darwin',
'E. Australia Standard Time' => 'Australia/Brisbane',
'AUS Eastern Standard Time' => 'Australia/Sydney',
'A.U.S. Eastern Standard Time' => 'Australia/Sydney',
'West Pacific Standard Time' => 'Pacific/Port_Moresby',
'Tasmania Standard Time' => 'Australia/Hobart',
'Magadan Standard Time' => 'Asia/Magadan',
@@ -458,9 +467,18 @@ class core_date {
'Russia Time Zone 11' => 'Asia/Kamchatka',
'New Zealand Standard Time' => 'Pacific/Auckland',
'Fiji Standard Time' => 'Pacific/Fiji',
'Fiji Islands Standard Time' => 'Pacific/Fiji',
'Tonga Standard Time' => 'Pacific/Tongatapu',
'Samoa Standard Time' => 'Pacific/Apia',
'Line Islands Standard Time' => 'Pacific/Kiritimati',
'Mexico Standard Time 2' => 'America/Chihuahua',
'Mexico Standard Time' => 'America/Mexico_City',
'U.S. Mountain Standard Time' => 'America/Phoenix',
'Mid-Atlantic Standard Time' => 'Atlantic/South_Georgia',
'E. Europe Standard Time' => 'Europe/Minsk',
'Transitional Islamic State of Afghanistan Standard Time' => 'Asia/Kabul',
'Armenian Standard Time' => 'Asia/Yerevan',
'Kamchatka Standard Time' => 'Asia/Kamchatka',
// A lot more bad legacy time zones.
'CET' => 'Europe/Berlin',