From cdcdfd2594634804ab09dc8105e46116edce0cd6 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sun, 7 Feb 2016 12:28:16 +0200 Subject: [PATCH] timezone data: update to 2016a Update timezone data to 2016a. http://mm.icann.org/pipermail/tz-announce/2016-January/000035.html Changes affecting future time stamps America/Cayman will not observe daylight saving this year after all. Revert our guess that it would. (Thanks to Matt Johnson.) Asia/Chita switches from +0800 to +0900 on 2016-03-27 at 02:00. (Thanks to Alexander Krivenyshev.) Asia/Tehran now has DST predictions for the year 2038 and later, to be March 21 00:00 to September 21 00:00. This is likely better than predicting no DST, albeit off by a day every now and then. Changes affecting past and future time stamps America/Metlakatla switched from PST all year to AKST/AKDT on 2015-11-01 at 02:00. (Thanks to Steffen Thorsen.) America/Santa_Isabel has been removed, and replaced with a backward compatibility link to America/Tijuana. Its contents were apparently based on a misreading of Mexican legislation. Signed-off-by: Hannu Nyman (cherry picked from commit 9b5724d39ea7b5da3cec358f26ec2ef698c73690) --- modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua | 8 ++++---- modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index ff13b1ccd..1efe6dd9f 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -89,7 +89,7 @@ TZ = { { 'America/Cancun', 'EST5' }, { 'America/Caracas', 'VET4:30' }, { 'America/Cayenne', 'GFT3' }, - { 'America/Cayman', 'EST5EDT,M3.2.0,M11.1.0' }, + { 'America/Cayman', 'EST5' }, { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' }, { 'America/Costa Rica', 'CST6' }, @@ -147,7 +147,7 @@ TZ = { { 'America/Mazatlan', 'MST7MDT,M4.1.0,M10.5.0' }, { 'America/Menominee', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Merida', 'CST6CDT,M4.1.0,M10.5.0' }, - { 'America/Metlakatla', 'PST8' }, + { 'America/Metlakatla', 'AKST9AKDT,M3.2.0,M11.1.0' }, { 'America/Mexico City', 'CST6CDT,M4.1.0,M10.5.0' }, { 'America/Miquelon', 'PMST3PMDT,M3.2.0,M11.1.0' }, { 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' }, @@ -177,7 +177,6 @@ TZ = { { 'America/Regina', 'CST6' }, { 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Rio Branco', 'ACT5' }, - { 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' }, { 'America/Santarem', 'BRT3' }, { 'America/Santiago', 'CLT3' }, { 'America/Santo Domingo', 'AST4' }, @@ -228,7 +227,7 @@ TZ = { { 'Asia/Beirut', 'EET-2EEST,M3.5.0/0,M10.5.0/0' }, { 'Asia/Bishkek', 'KGT-6' }, { 'Asia/Brunei', 'BNT-8' }, - { 'Asia/Chita', 'IRKT-8' }, + { 'Asia/Chita', 'YAKT-9' }, { 'Asia/Choibalsan', 'CHOT-8CHOST,M3.5.6,M9.5.6/0' }, { 'Asia/Colombo', 'IST-5:30' }, { 'Asia/Damascus', 'EET-2EEST,M3.5.5/0,M10.5.5/0' }, @@ -281,6 +280,7 @@ TZ = { { 'Asia/Taipei', 'CST-8' }, { 'Asia/Tashkent', 'UZT-5' }, { 'Asia/Tbilisi', 'GET-4' }, + { 'Asia/Tehran', 'IRST-3:30IRDT,J80/0,J264/0' }, { 'Asia/Thimphu', 'BTT-6' }, { 'Asia/Tokyo', 'JST-9' }, { 'Asia/Ulaanbaatar', 'ULAT-8ULAST,M3.5.6,M9.5.6/0' }, diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index 53c8adbc6..351ebccd3 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -68,7 +68,7 @@ OFFSET = { ict = 25200, -- ICT kgt = 21600, -- KGT bnt = 28800, -- BNT - irkt = 28800, -- IRKT + yakt = 32400, -- YAKT chot = 28800, -- CHOT chost = 32400, -- CHOST ist = 19800, -- IST @@ -79,13 +79,13 @@ OFFSET = { hkt = 28800, -- HKT hovt = 25200, -- HOVT hovst = 28800, -- HOVST + irkt = 28800, -- IRKT wib = 25200, -- WIB wit = 32400, -- WIT aft = 16200, -- AFT pett = 43200, -- PETT pkt = 18000, -- PKT npt = 20700, -- NPT - yakt = 32400, -- YAKT krat = 25200, -- KRAT myt = 28800, -- MYT magt = 36000, -- MAGT @@ -102,6 +102,8 @@ OFFSET = { sgt = 28800, -- SGT sret = 39600, -- SRET get = 14400, -- GET + irst = 12600, -- IRST + irdt = 16200, -- IRDT btt = 21600, -- BTT jst = 32400, -- JST ulat = 28800, -- ULAT -- 2.25.1