Merge pull request #441 from hnyman/tz2015f

Timezone information: update to 2015f

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index b604f6b..b109c71 100644 (file)
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -89,7 +89,7 @@ TZ = {
        { 'America/Cancun', 'EST5' },
        { 'America/Caracas', 'VET4:30' },
        { 'America/Cayenne', 'GFT3' },
-       { 'America/Cayman', 'EST5' },
+       { 'America/Cayman', 'EST5EDT,M3.2.0,M11.1.0' },
        { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' },
        { 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' },
        { 'America/Costa Rica', 'CST6' },
@@ -151,7 +151,7 @@ TZ = {
        { 'America/Miquelon', 'PMST3PMDT,M3.2.0,M11.1.0' },
        { 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' },
        { 'America/Monterrey', 'CST6CDT,M4.1.0,M10.5.0' },
-       { 'America/Montevideo', 'UYT3UYST,M10.1.0,M3.2.0' },
+       { 'America/Montevideo', 'UYT3' },
        { 'America/Montserrat', 'AST4' },
        { 'America/Nassau', 'EST5EDT,M3.2.0,M11.1.0' },
        { 'America/New York', 'EST5EDT,M3.2.0,M11.1.0' },
@@ -266,7 +266,7 @@ TZ = {
        { 'Asia/Oral', 'ORAT-5' },
        { 'Asia/Phnom Penh', 'ICT-7' },
        { 'Asia/Pontianak', 'WIB-7' },
-       { 'Asia/Pyongyang', 'KST-9' },
+       { 'Asia/Pyongyang', 'KST-8:30' },
        { 'Asia/Qatar', 'AST-3' },
        { 'Asia/Qyzylorda', 'QYZT-6' },
        { 'Asia/Rangoon', 'MMT-6:30' },
@@ -322,7 +322,7 @@ TZ = {
        { 'Europe/Bucharest', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
        { 'Europe/Budapest', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Busingen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
-       { 'Europe/Chisinau', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+       { 'Europe/Chisinau', 'EET-2EEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Copenhagen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Dublin', 'GMT0IST,M3.5.0/1,M10.5.0' },
        { 'Europe/Gibraltar', '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 24429ac..f156f36 100644 (file)
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -41,7 +41,6 @@ OFFSET = {
        pmst  = -10800, -- PMST
        pmdt  =  -7200, -- PMDT
        uyt   = -10800, -- UYT
-       uyst  =  -7200, -- UYST
        fnt   =  -7200, -- FNT
        srt   = -10800, -- SRT
        clt   = -10800, -- CLT
@@ -95,7 +94,7 @@ OFFSET = {
        novt  =  21600, -- NOVT
        omst  =  21600, -- OMST
        orat  =  18000, -- ORAT
-       kst   =  32400, -- KST
+       kst   =  30600, -- KST
        qyzt  =  21600, -- QYZT
        mmt   =  23400, -- MMT
        sakt  =  36000, -- SAKT