From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Mon, 8 May 2017 16:49:58 +0000 (+0300)
Subject: Merge pull request #1158 from angusding/patch-4
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=aba7981deaffe1871d279196e7a43e3af255d748;hp=d3861e7f8deb581cb34c6f789457153b43457ff4

Merge pull request #1158 from angusding/patch-4

luci.mk: Update language name for Chinese
---

diff --git a/build/zoneinfo2lua.pl b/build/zoneinfo2lua.pl
index d3f040326..1a0bee1c6 100755
--- a/build/zoneinfo2lua.pl
+++ b/build/zoneinfo2lua.pl
@@ -46,6 +46,34 @@ while( ! eof ZTAB ) {
 
 close ZTAB;
 
+# Add Etc/GMT zones from manually as they are not in zone.tab
+$TZ{"Etc/GMT"} = "GMT0";
+$TZ{"Etc/GMT-1"} = "<+01>-1";
+$TZ{"Etc/GMT-2"} = "<+02>-2";
+$TZ{"Etc/GMT-3"} = "<+03>-3";
+$TZ{"Etc/GMT-4"} = "<+04>-4";
+$TZ{"Etc/GMT-5"} = "<+05>-5";
+$TZ{"Etc/GMT-6"} = "<+06>-6";
+$TZ{"Etc/GMT-7"} = "<+07>-7";
+$TZ{"Etc/GMT-8"} = "<+08>-8";
+$TZ{"Etc/GMT-9"} = "<+09>-9";
+$TZ{"Etc/GMT-10"} = "<+10>-10";
+$TZ{"Etc/GMT-11"} = "<+11>-11";
+$TZ{"Etc/GMT-12"} = "<+12>-12";
+$TZ{"Etc/GMT-13"} = "<+13>-13";
+$TZ{"Etc/GMT-14"} = "<+14>-14";
+$TZ{"Etc/GMT+1"} = "<-01>1";
+$TZ{"Etc/GMT+2"} = "<-02>2";
+$TZ{"Etc/GMT+3"} = "<-03>3";
+$TZ{"Etc/GMT+4"} = "<-04>4";
+$TZ{"Etc/GMT+5"} = "<-05>5";
+$TZ{"Etc/GMT+6"} = "<-06>6";
+$TZ{"Etc/GMT+7"} = "<-07>7";
+$TZ{"Etc/GMT+8"} = "<-08>8";
+$TZ{"Etc/GMT+9"} = "<-09>9";
+$TZ{"Etc/GMT+10"} = "<-10>10";
+$TZ{"Etc/GMT+11"} = "<-11>11";
+$TZ{"Etc/GMT+12"} = "<-12>12";
 
 open(O, "> $tzdout/tzdata.lua") || die "open($tzdout/tzdata.lua): $!\n";
 
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 2d32b39b1..419c191f2 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -318,6 +318,33 @@ TZ = {
 	{ 'Australia/Melbourne', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
 	{ 'Australia/Perth', 'AWST-8' },
 	{ 'Australia/Sydney', 'AEST-10AEDT,M10.1.0,M4.1.0/3' },
+	{ 'Etc/GMT', 'GMT0' },
+	{ 'Etc/GMT+1', '<-01>1' },
+	{ 'Etc/GMT+10', '<-10>10' },
+	{ 'Etc/GMT+11', '<-11>11' },
+	{ 'Etc/GMT+12', '<-12>12' },
+	{ 'Etc/GMT+2', '<-02>2' },
+	{ 'Etc/GMT+3', '<-03>3' },
+	{ 'Etc/GMT+4', '<-04>4' },
+	{ 'Etc/GMT+5', '<-05>5' },
+	{ 'Etc/GMT+6', '<-06>6' },
+	{ 'Etc/GMT+7', '<-07>7' },
+	{ 'Etc/GMT+8', '<-08>8' },
+	{ 'Etc/GMT+9', '<-09>9' },
+	{ 'Etc/GMT-1', '<+01>-1' },
+	{ 'Etc/GMT-10', '<+10>-10' },
+	{ 'Etc/GMT-11', '<+11>-11' },
+	{ 'Etc/GMT-12', '<+12>-12' },
+	{ 'Etc/GMT-13', '<+13>-13' },
+	{ 'Etc/GMT-14', '<+14>-14' },
+	{ 'Etc/GMT-2', '<+02>-2' },
+	{ 'Etc/GMT-3', '<+03>-3' },
+	{ 'Etc/GMT-4', '<+04>-4' },
+	{ 'Etc/GMT-5', '<+05>-5' },
+	{ 'Etc/GMT-6', '<+06>-6' },
+	{ 'Etc/GMT-7', '<+07>-7' },
+	{ 'Etc/GMT-8', '<+08>-8' },
+	{ 'Etc/GMT-9', '<+09>-9' },
 	{ 'Europe/Amsterdam', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Andorra', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Astrakhan', '<+04>-4' },