summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-04-19 13:12:53 +0200
committerJo-Philipp Wich <jow@openwrt.org>2015-04-19 13:12:53 +0200
commit493662e7fb71789b099aee59b9c522440ccbc5bc (patch)
tree7de8f88951e4427cfab61fbc3390cca86c43874a
parentec09e995a843a57ae9e66b63dc64634e94d0b4f1 (diff)
parent4d18e09e05db35782e38450cd149e3a4d44e53b4 (diff)
Merge pull request #361 from hnyman/timezone2015c
Timezone data: Update to 2015c
-rw-r--r--modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua12
-rw-r--r--modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua3
2 files changed, 9 insertions, 6 deletions
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 97a3608ea..148bdcbfc 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.5/0,M9.5.4/24' },
+ { 'Africa/Cairo', 'EET-2EEST,M4.5.4/24,M9.5.4/24' },
{ 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' },
{ 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
{ 'Africa/Conakry', 'GMT0' },
@@ -228,18 +228,18 @@ TZ = {
{ 'Asia/Bishkek', 'KGT-6' },
{ 'Asia/Brunei', 'BNT-8' },
{ 'Asia/Chita', 'IRKT-8' },
- { 'Asia/Choibalsan', 'CHOT-8' },
+ { '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' },
{ 'Asia/Dhaka', 'BDT-6' },
{ 'Asia/Dili', 'TLT-9' },
{ 'Asia/Dubai', 'GST-4' },
{ 'Asia/Dushanbe', 'TJT-5' },
- { 'Asia/Gaza', 'EET-2EEST,M3.5.4/24,M9.3.6/144' },
- { 'Asia/Hebron', 'EET-2EEST,M3.5.4/24,M9.3.6/144' },
+ { 'Asia/Gaza', 'EET-2EEST,M3.5.5/24,M10.3.6/144' },
+ { 'Asia/Hebron', 'EET-2EEST,M3.5.5/24,M10.3.6/144' },
{ 'Asia/Ho Chi Minh', 'ICT-7' },
{ 'Asia/Hong Kong', 'HKT-8' },
- { 'Asia/Hovd', 'HOVT-7' },
+ { 'Asia/Hovd', 'HOVT-7HOVST,M3.5.6,M9.5.6/0' },
{ 'Asia/Irkutsk', 'IRKT-8' },
{ 'Asia/Jakarta', 'WIB-7' },
{ 'Asia/Jayapura', 'WIT-9' },
@@ -282,7 +282,7 @@ TZ = {
{ 'Asia/Tbilisi', 'GET-4' },
{ 'Asia/Thimphu', 'BTT-6' },
{ 'Asia/Tokyo', 'JST-9' },
- { 'Asia/Ulaanbaatar', 'ULAT-8' },
+ { 'Asia/Ulaanbaatar', 'ULAT-8ULAST,M3.5.6,M9.5.6/0' },
{ 'Asia/Urumqi', 'XJT-6' },
{ 'Asia/Ust-Nera', 'VLAT-10' },
{ 'Asia/Vientiane', 'ICT-7' },
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index c8c908b6e..fe3f86097 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -72,6 +72,7 @@ OFFSET = {
bnt = 28800, -- BNT
irkt = 28800, -- IRKT
chot = 28800, -- CHOT
+ chost = 32400, -- CHOST
ist = 19800, -- IST
bdt = 21600, -- BDT
tlt = 32400, -- TLT
@@ -79,6 +80,7 @@ OFFSET = {
tjt = 18000, -- TJT
hkt = 28800, -- HKT
hovt = 25200, -- HOVT
+ hovst = 28800, -- HOVST
wib = 25200, -- WIB
wit = 32400, -- WIT
aft = 16200, -- AFT
@@ -105,6 +107,7 @@ OFFSET = {
btt = 21600, -- BTT
jst = 32400, -- JST
ulat = 28800, -- ULAT
+ ulast = 32400, -- ULAST
xjt = 21600, -- XJT
vlat = 36000, -- VLAT
yekt = 18000, -- YEKT