From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Mon, 12 Oct 2015 07:58:09 +0000 (+0300)
Subject: Timezone information: update to 2015g
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2cfd11b27268b21adc3ed126fb2b6c90da604528;p=oweals%2Fluci.git

Timezone information: update to 2015g

Changes in 2015g:
http://mm.icann.org/pipermail/tz-announce/2015-October/000034.html

     Norfolk moves from +1130 to +1100 on 2015-10-04 at 02:00 local time.

     Fiji's 2016 fall-back transition is scheduled for January 17, not 24.

     Fort Nelson, British Columbia will not fall back on 2015-11-01. It has
     effectively been on MST (-0700) since it advanced its clocks on 2015-03-08.
     New zone America/Fort_Nelson.

Note: the Turkey-related one-time rule change is not apparently catched by
the zoneinfo2lua script, so that change is not included in this commit.
(Turkey's 2015 fall-back transition is scheduled for Nov. 8, not Oct. 25.)

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
---

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index b109c712e..ff13b1ccd 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -105,6 +105,7 @@ TZ = {
 	{ 'America/Edmonton', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Eirunepe', 'ACT5' },
 	{ 'America/El Salvador', 'CST6' },
+	{ 'America/Fort Nelson', 'MST7' },
 	{ 'America/Fortaleza', 'BRT3' },
 	{ 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' },
 	{ 'America/Godthab', 'WGT3WGST,M3.5.0/-2,M10.5.0/-1' },
@@ -388,7 +389,7 @@ TZ = {
 	{ 'Pacific/Efate', 'VUT-11' },
 	{ 'Pacific/Enderbury', 'PHOT-13' },
 	{ 'Pacific/Fakaofo', 'TKT-13' },
-	{ 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.4/75' },
+	{ 'Pacific/Fiji', 'FJT-12FJST,M11.1.0,M1.3.0/3' },
 	{ 'Pacific/Funafuti', 'TVT-12' },
 	{ 'Pacific/Galapagos', 'GALT6' },
 	{ 'Pacific/Gambier', 'GAMT9' },
@@ -404,7 +405,7 @@ TZ = {
 	{ 'Pacific/Midway', 'SST11' },
 	{ 'Pacific/Nauru', 'NRT-12' },
 	{ 'Pacific/Niue', 'NUT11' },
-	{ 'Pacific/Norfolk', 'NFT-11:30' },
+	{ 'Pacific/Norfolk', 'NFT-11' },
 	{ 'Pacific/Noumea', 'NCT-11' },
 	{ 'Pacific/Pago Pago', 'SST11' },
 	{ 'Pacific/Palau', 'PWT-9' },
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index f156f3663..53c8adbc6 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -152,7 +152,7 @@ OFFSET = {
 	sst   = -39600,	-- SST
 	nrt   =  43200,	-- NRT
 	nut   = -39600,	-- NUT
-	nft   =  41400,	-- NFT
+	nft   =  39600,	-- NFT
 	nct   =  39600,	-- NCT
 	pwt   =  32400,	-- PWT
 	pont  =  39600,	-- PONT