Merge pull request #2253 from dibdot/travelmate

luci-app-travelmate: sync with travelmate 1.3.0

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 82dc55f9585421ceeaa723b58fe3323ead3634b4..c6f4477dff3bc0cf60178900ae65b33d2f71f10a 100644 (file)
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -16,14 +16,14 @@ TZ = {
        { 'Africa/Brazzaville', 'WAT-1' },
        { 'Africa/Bujumbura', 'CAT-2' },
        { 'Africa/Cairo', 'EET-2' },
-       { 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' },
+       { 'Africa/Casablanca', '<+01>-1' },
        { 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Africa/Conakry', 'GMT0' },
        { 'Africa/Dakar', 'GMT0' },
        { 'Africa/Dar es Salaam', 'EAT-3' },
        { 'Africa/Djibouti', 'EAT-3' },
        { 'Africa/Douala', 'WAT-1' },
-       { 'Africa/El Aaiun', 'WET0WEST,M3.5.0,M10.5.0/3' },
+       { 'Africa/El Aaiun', '<+01>-1' },
        { 'Africa/Freetown', 'GMT0' },
        { 'Africa/Gaborone', 'CAT-2' },
        { 'Africa/Harare', 'CAT-2' },

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index 20f57dc1b29d5e4f4ed08e6eef825e13c09878f3..e63e2a6958c0bcf05cac2409648d79aec3168829 100644 (file)
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -9,7 +9,6 @@ OFFSET = {
        wat   =   3600, -- WAT
        cat   =   7200, -- CAT
        eet   =   7200, -- EET
-       wet   =      0, -- WET
        sast  =   7200, -- SAST
        hst   = -36000, -- HST
        hdt   = -32400, -- HDT
@@ -36,6 +35,7 @@ OFFSET = {
        wita  =  28800, -- WITA
        kst   =  32400, -- KST
        jst   =  32400, -- JST
+       wet   =      0, -- WET
        acst  =  34200, -- ACST
        acdt  =  37800, -- ACDT
        aest  =  36000, -- AEST