summaryrefslogtreecommitdiffhomepage
path: root/modules
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2015-05-23 17:34:13 +0300
committerHannu Nyman <hannu.nyman@iki.fi>2015-05-23 17:34:13 +0300
commitc7a683053629a1d82cbe56e87234ff6770523a17 (patch)
tree1ca3ebdcb7dac11bc4a7cc7b7595000687709e3f /modules
parent64b728a2dfc1fd2ed5e7cced67c3ab2555dd3a53 (diff)
Timezone information is updated to 2015d, released on 24 Apr 2015.
I used build/zoneinfo2lua.pl to pull data from my Ubuntu 15.04. Changes in 2015d are rather small: http://mm.icann.org/pipermail/tz-announce/2015-April/000031.html Changes affecting future time stamps Egypt will not observe DST in 2015 and will consider canceling it permanently. For now, assume no DST indefinitely. Change affecting time zone abbreviations The abbreviations for Hawaii-Aleutian standard and daylight times have been changed from HAST/HADT to HST/HDT, as per US Government Printing Office style. This affects only America/Adak since 1983, as America/Honolulu was already using the new style. Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
Diffstat (limited to 'modules')
-rw-r--r--modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua4
-rw-r--r--modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua6
2 files changed, 4 insertions, 6 deletions
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 148bdcbfc5..b604f6b65e 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-2EEST,M4.5.4/24,M9.5.4/24' },
+ { 'Africa/Cairo', 'EET-2' },
{ 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' },
{ 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
{ 'Africa/Conakry', 'GMT0' },
@@ -55,7 +55,7 @@ TZ = {
{ 'Africa/Tripoli', 'EET-2' },
{ 'Africa/Tunis', 'CET-1' },
{ 'Africa/Windhoek', 'WAT-1WAST,M9.1.0,M4.1.0' },
- { 'America/Adak', 'HAST10HADT,M3.2.0,M11.1.0' },
+ { 'America/Adak', 'HST10HDT,M3.2.0,M11.1.0' },
{ 'America/Anchorage', 'AKST9AKDT,M3.2.0,M11.1.0' },
{ 'America/Anguilla', 'AST4' },
{ 'America/Antigua', 'AST4' },
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index fe3f860977..24429ac36b 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -9,11 +9,10 @@ OFFSET = {
wat = 3600, -- WAT
cat = 7200, -- CAT
eet = 7200, -- EET
- eest = 10800, -- EEST
wet = 0, -- WET
sast = 7200, -- SAST
- hast = -36000, -- HAST
- hadt = -32400, -- HADT
+ hst = -36000, -- HST
+ hdt = -32400, -- HDT
akst = -32400, -- AKST
akdt = -28800, -- AKDT
ast = -14400, -- AST
@@ -147,7 +146,6 @@ OFFSET = {
galt = -21600, -- GALT
gamt = -32400, -- GAMT
sbt = 39600, -- SBT
- hst = -36000, -- HST
lint = 50400, -- LINT
kost = 39600, -- KOST
mht = 43200, -- MHT