Bug 1237085 - Incorrect timezone handling for US/Pacific timezone. r=philipp
authorGeoff Lankow <geoff@darktrojan.net>
Thu, 07 Jan 2016 12:15:14 +1300
changeset 26627 88992760923c48ab266bed737ff38fafdc750b87
parent 26626 54de083be103ab49f292c00c543d42b7608dbe2d
child 26628 5828d394321d8d3e70939aade8eb8a3672a77da3
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersphilipp
bugs1237085
Bug 1237085 - Incorrect timezone handling for US/Pacific timezone. r=philipp
calendar/providers/gdata/modules/timezoneMap.jsm
calendar/timezones/zones.json
--- a/calendar/providers/gdata/modules/timezoneMap.jsm
+++ b/calendar/providers/gdata/modules/timezoneMap.jsm
@@ -12,17 +12,17 @@ var windowsTimezoneMap = {
     "Mountain Standard Time (Mexico)": "America/Chihuahua",
     "Mountain Standard Time": "America/Denver",
     "Central America Standard Time": "America/Guatemala",
     "Central Standard Time": "America/Chicago",
     "Central Standard Time (Mexico)": "America/Mexico_City",
     "Canada Central Standard Time": "America/Regina",
     "SA Pacific Standard Time": "America/Bogota",
     "Eastern Standard Time": "America/New_York",
-    "US Eastern Standard Time": "America/Indianapolis",
+    "US Eastern Standard Time": "America/Indiana/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",
     "Pacific SA Standard Time": "America/Santiago",
     "Newfoundland Standard Time": "America/St_Johns",
     "E. South America Standard Time": "America/Sao_Paulo",
--- a/calendar/timezones/zones.json
+++ b/calendar/timezones/zones.json
@@ -335,16 +335,31 @@
       "aliasTo": "UTC"
     },
     "US Eastern Standard Time": {
       "aliasTo": "America/Indiana/Indianapolis"
     },
     "US Mountain Standard Time": {
       "aliasTo": "America/Phoenix"
     },
+    "US/Central": {
+      "aliasTo": "America/Chicago"
+    },
+    "US/Eastern": {
+      "aliasTo": "America/New_York"
+    },
+    "US/Mountain": {
+      "aliasTo": "America/Denver"
+    },
+    "US/Pacific": {
+      "aliasTo": "America/Los_Angeles"
+    },
+    "US/Pacific-New": {
+      "aliasTo": "America/Los_Angeles"
+    },
     "Ulaanbaatar Standard Time": {
       "aliasTo": "Asia/Ulaanbaatar"
     },
     "Universal": {
       "aliasTo": "UTC"
     },
     "Venezuela Standard Time": {
       "aliasTo": "America/Caracas"