diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2023-04-03 18:51:44 +0300 |
|---|---|---|
| committer | Hannu Nyman <hannu.nyman@iki.fi> | 2023-04-03 18:56:00 +0300 |
| commit | e98243ef9eb838cca80cdd6d1bd0cf69a509d103 (patch) | |
| tree | a13b9ee225c9e610ff1b830b7b28beb73d3e7368 | |
| parent | 650e6d2aefa3fbc9e52e1448255eb97615d578dc (diff) | |
timezone data: update to 2023c
Update timezone data to 2023a, 2023b, 2023c.
(2023c reverts 2023b.)
https://mm.icann.org/pipermail/tz-announce/2023-March/000077.html
https://mm.icann.org/pipermail/tz-announce/2023-March/000078.html
https://mm.icann.org/pipermail/tz-announce/2023-March/000079.html
Summary:
* Egypt now uses DST again, from April through October.
* Much of Greenland still uses DST from 2024 on.
* America/Yellowknife now links to America/Edmonton. (removed here)
* Europe/Kirov and Europe/Volgograd now use the abbreviations MSK/MSD
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit ce20b4a6e0c86313c0c6e9c89eedf8f033f5e637)
| -rw-r--r-- | modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua | 9 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua | 1 |
2 files changed, 5 insertions, 5 deletions
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index f0397a9853..48b7fcb0cb 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -15,7 +15,7 @@ TZ = { { 'Africa/Blantyre', 'CAT-2' }, { 'Africa/Brazzaville', 'WAT-1' }, { 'Africa/Bujumbura', 'CAT-2' }, - { 'Africa/Cairo', 'EET-2' }, + { 'Africa/Cairo', 'EET-2EEST,M4.5.5/0,M10.5.4/24' }, { 'Africa/Casablanca', '<+01>-1' }, { 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Africa/Conakry', 'GMT0' }, @@ -161,7 +161,7 @@ TZ = { { 'America/North Dakota/Beulah', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/North Dakota/Center', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/North Dakota/New Salem', 'CST6CDT,M3.2.0,M11.1.0' }, - { 'America/Nuuk', '<-02>2' }, + { 'America/Nuuk', '<-02>2<-01>,M3.5.0/-1,M10.5.0/0' }, { 'America/Ojinaga', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Panama', 'EST5' }, { 'America/Paramaribo', '<-03>3' }, @@ -198,7 +198,6 @@ TZ = { { 'America/Whitehorse', 'MST7' }, { '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', '<+11>-11' }, { 'Antarctica/Davis', '<+07>-7' }, { 'Antarctica/DumontDUrville', '<+10>-10' }, @@ -363,7 +362,7 @@ TZ = { { 'Europe/Istanbul', '<+03>-3' }, { 'Europe/Jersey', 'GMT0BST,M3.5.0/1,M10.5.0' }, { 'Europe/Kaliningrad', 'EET-2' }, - { 'Europe/Kirov', '<+03>-3' }, + { 'Europe/Kirov', 'MSK-3' }, { 'Europe/Kyiv', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Lisbon', 'WET0WEST,M3.5.0/1,M10.5.0' }, { 'Europe/Ljubljana', 'CET-1CEST,M3.5.0,M10.5.0/3' }, @@ -396,7 +395,7 @@ TZ = { { 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Vienna', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Vilnius', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, - { 'Europe/Volgograd', '<+03>-3' }, + { 'Europe/Volgograd', 'MSK-3' }, { 'Europe/Warsaw', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Zagreb', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Zurich', 'CET-1CEST,M3.5.0,M10.5.0/3' }, diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index 80bea8416e..6c85ce0a9b 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -9,6 +9,7 @@ OFFSET = { wat = 3600, -- WAT cat = 7200, -- CAT eet = 7200, -- EET + eest = 10800, -- EEST sast = 7200, -- SAST hst = -36000, -- HST hdt = -32400, -- HDT |