From 423a5b19fdf5f1718acb2ab506114b3938ce9b71 Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Sat, 31 Oct 2020 20:17:39 +0200 Subject: [PATCH] timezone data: update to 2020d Update timezone data to 2020d 2020b: http://mm.icann.org/pipermail/tz-announce/2020-October/000059.html Macquarie Island has stayed in sync with Tasmania since 2011. Casey, Antarctica is at +08 in winter and +11 in summer. 2020c: http://mm.icann.org/pipermail/tz-announce/2020-October/000060.html 2020d: http://mm.icann.org/pipermail/tz-announce/2020-October/000062.html Palestine ends DST earlier than predicted, on 2020-10-24. Signed-off-by: Hannu Nyman (cherry picked from commit ce3402a4530e06b1b5479e56caf9b8bb3a07dc15) --- modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua | 8 ++++---- modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index 95f2ad4cfc..705a15db22 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -202,10 +202,10 @@ TZ = { { 'America/Winnipeg', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Yakutat', 'AKST9AKDT,M3.2.0,M11.1.0' }, { 'America/Yellowknife', 'MST7MDT,M3.2.0,M11.1.0' }, - { 'Antarctica/Casey', '<+08>-8' }, + { 'Antarctica/Casey', '<+11>-11' }, { 'Antarctica/Davis', '<+07>-7' }, { 'Antarctica/DumontDUrville', '<+10>-10' }, - { 'Antarctica/Macquarie', '<+11>-11' }, + { 'Antarctica/Macquarie', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, { 'Antarctica/Mawson', '<+05>-5' }, { 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, { 'Antarctica/Palmer', '<-03>3' }, @@ -239,8 +239,8 @@ TZ = { { 'Asia/Dubai', '<+04>-4' }, { 'Asia/Dushanbe', '<+05>-5' }, { 'Asia/Famagusta', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Asia/Gaza', 'EET-2EEST,M3.5.5/0,M10.5.6/1' }, - { 'Asia/Hebron', 'EET-2EEST,M3.5.5/0,M10.5.6/1' }, + { 'Asia/Gaza', 'EET-2EEST,M3.4.4/48,M10.4.4/49' }, + { 'Asia/Hebron', 'EET-2EEST,M3.4.4/48,M10.4.4/49' }, { 'Asia/Ho Chi Minh', '<+07>-7' }, { 'Asia/Hong Kong', 'HKT-8' }, { 'Asia/Hovd', '<+07>-7' }, diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index e63e2a6958..caee1d2c1c 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -24,6 +24,8 @@ OFFSET = { pdt = -25200, -- PDT nst = -12600, -- NST ndt = -9000, -- NDT + aest = 36000, -- AEST + aedt = 39600, -- AEDT nzst = 43200, -- NZST nzdt = 46800, -- NZDT hkt = 28800, -- HKT @@ -38,7 +40,6 @@ OFFSET = { wet = 0, -- WET acst = 34200, -- ACST acdt = 37800, -- ACDT - aest = 36000, -- AEST awst = 28800, -- AWST msk = 10800, -- MSK sst = -39600, -- SST -- 2.30.2