From 7104d543e8ad7ed826a9da7f05594c609560e52f Mon Sep 17 00:00:00 2001 From: Michael Gray Date: Wed, 14 Feb 2018 21:25:27 +1100 Subject: [PATCH 1/4] Fix NTP server pools not updating with region selection --- package/gargoyle/files/www/js/time.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gargoyle/files/www/js/time.js b/package/gargoyle/files/www/js/time.js index 8aba632de6..3065e7a2bf 100644 --- a/package/gargoyle/files/www/js/time.js +++ b/package/gargoyle/files/www/js/time.js @@ -217,9 +217,9 @@ function timezoneChanged() definitionTimezones = timezoneData[3]; newTimezoneDefinition = getSelectedValue("timezone"); - if( getSelectedValue("region") == timezoneRegions[ definitionTimezones[previousTimezoneDefinition] ]) + if(timezoneRegions[definitionTimezones[newTimezoneDefinition]] != timezoneRegions[definitionTimezones[previousTimezoneDefinition]]) { - setSelectedValue("region", timezoneRegions[ definitionTimezones[newTimezoneDefinition] ]); + setSelectedValue("region", timezoneRegions[definitionTimezones[newTimezoneDefinition]]); updateServerList(); } From 10595ef15b4ff2dcccca0dd0b5bd5a28b038e06a Mon Sep 17 00:00:00 2001 From: Michael Gray Date: Thu, 15 Feb 2018 19:49:22 +1100 Subject: [PATCH 2/4] Accomodate the 4 major timezones used in Brazil --- package/gargoyle/files/www/data/timezones.txt | 2 +- .../files/www/i18n/English-EN/time.js | 8 ++++---- .../files/www/i18n/French-FR/time.js | 8 ++++---- .../files/www/i18n/German-DE/time.js | 8 ++++---- .../files/www/i18n/Norwegian-NO/time.js | 8 ++++---- .../files/www/i18n/Polish-PL/time.js | 8 ++++---- .../files/www/i18n/Portuguese-BR/time.js | 8 ++++---- .../files/www/i18n/Russian-RU/time.js | 8 ++++---- .../files/www/i18n/SimplifiedChinese-ZH-CN/time.js | 8 ++++---- .../files/www/i18n/Slovak-SK/time.js | 8 ++++---- .../files/www/i18n/Spanish-ES/time.js | 8 ++++---- 11 files changed, 41 insertions(+), 41 deletions(-) diff --git a/package/gargoyle/files/www/data/timezones.txt b/package/gargoyle/files/www/data/timezones.txt index 75ea856876..a65af45b00 100644 --- a/package/gargoyle/files/www/data/timezones.txt +++ b/package/gargoyle/files/www/data/timezones.txt @@ -11,7 +11,7 @@ "UTC-05:00 TiZ.EST5" "EST5EDT,M3.2.0/2,M11.1.0/2" "us" "UTC-04:00 TiZ.UTC4" "UTC4" "south-america" "UTC-04:00 TiZ.AST4" "AST4ADT,M3.2.0/2,M11.1.0/2" "us" -"UTC-04:00 TiZ.BRW" "BRWST4BRWDT,M10.3.0/0,M2.5.0/0" "south-america" +"UTC-04:00 TiZ.AMT" "AMT4AMST,M11.1.0/0,M2.3.0/0" "south-america" "UTC-03:30 TiZ.NST3" "NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01" "north-america" "UTC-03:00 TiZ.WGST" "WGST3WGDT,M3.5.6/22,M10.5.6/23" "north-america" "UTC-03:00 TiZ.BRT" "BRT3BRST,M11.1.0/0,M2.3.0/0" "south-america" diff --git a/package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-EN/time.js b/package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-EN/time.js index b298833f99..c4f8cffd72 100644 --- a/package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-EN/time.js +++ b/package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-EN/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Mexico"; TiZ.CST6="Central Time"; TiZ.UTC5="Colombia, Panama"; TiZ.EST5="Eastern Time"; -TiZ.UTC4="Bolivia, Venezuela"; +TiZ.UTC4="Bolivia, Brazil (Manaus), Venezuela"; TiZ.AST4="Atlantic Time"; -TiZ.BRW="Brazil West"; +TiZ.AMT="Brazil (Cuiaba)"; TiZ.NST3="Newfoundland"; TiZ.WGST="Greenland"; -TiZ.BRT="Brazil East"; -TiZ.UTC3="Argentina, Guyana"; +TiZ.BRT="Brazil (Brasilia)"; +TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana"; TiZ.UTC2="Mid-Atlantic"; TiZ.STD1="Azores"; TiZ.UTC0="Gambia, Liberia, Morocco"; diff --git a/package/plugin-gargoyle-i18n-French-FR/files/www/i18n/French-FR/time.js b/package/plugin-gargoyle-i18n-French-FR/files/www/i18n/French-FR/time.js index 26e9418792..d242c03f41 100644 --- a/package/plugin-gargoyle-i18n-French-FR/files/www/i18n/French-FR/time.js +++ b/package/plugin-gargoyle-i18n-French-FR/files/www/i18n/French-FR/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Mexico"; TiZ.CST6="Central Time"; TiZ.UTC5="Colombia, Panama"; TiZ.EST5="Eastern Time"; -TiZ.UTC4="Bolivia, Venezuela"; +TiZ.UTC4="Bolivia, Brazil (Manaus), Venezuela"; TiZ.AST4="Atlantic Time"; -TiZ.BRW="Brazil West"; +TiZ.AMT="Brazil (Cuiaba)"; TiZ.NST3="Newfoundland"; TiZ.WGST="Greenland"; -TiZ.BRT="Brazil East"; -TiZ.UTC3="Argentina, Guyana"; +TiZ.BRT="Brazil (Brasilia)"; +TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana"; TiZ.UTC2="Mid-Atlantic"; TiZ.STD1="Azores"; TiZ.UTC0="Gambia, Liberia, Morocco"; diff --git a/package/plugin-gargoyle-i18n-German-DE/files/www/i18n/German-DE/time.js b/package/plugin-gargoyle-i18n-German-DE/files/www/i18n/German-DE/time.js index f5c726474f..ca8864fa2c 100644 --- a/package/plugin-gargoyle-i18n-German-DE/files/www/i18n/German-DE/time.js +++ b/package/plugin-gargoyle-i18n-German-DE/files/www/i18n/German-DE/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Mexiko"; TiZ.CST6="Central Time"; TiZ.UTC5="Colombia, Panama"; TiZ.EST5="Eastern Time"; -TiZ.UTC4="Bolivia, Venezuela"; +TiZ.UTC4="Bolivia, Brasilien (Manaus), Venezuela"; TiZ.AST4="Atlantic Time"; -TiZ.BRW="Brasilien West"; +TiZ.AMT="Brasilien (Cuiaba)"; TiZ.NST3="Neufundland"; TiZ.WGST="Grönland"; -TiZ.BRT="Brasilien Ost"; -TiZ.UTC3="Argentinien, Guyana"; +TiZ.BRT="Brasilien (Brasilia)"; +TiZ.UTC3="Argentinien, Brasilien (Fortaleza), Guyana"; TiZ.UTC2="Mid-Atlantic"; TiZ.STD1="Azoren"; TiZ.UTC0="Gambia, Liberia, Marokko"; diff --git a/package/plugin-gargoyle-i18n-Norwegian-NO/files/www/i18n/Norwegian-NO/time.js b/package/plugin-gargoyle-i18n-Norwegian-NO/files/www/i18n/Norwegian-NO/time.js index 1a8f96da69..eace3f469e 100644 --- a/package/plugin-gargoyle-i18n-Norwegian-NO/files/www/i18n/Norwegian-NO/time.js +++ b/package/plugin-gargoyle-i18n-Norwegian-NO/files/www/i18n/Norwegian-NO/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Mexico"; TiZ.CST6="Central Time"; TiZ.UTC5="Colombia, Panama"; TiZ.EST5="Eastern Time"; -TiZ.UTC4="Bolivia, Venezuela"; +TiZ.UTC4="Bolivia, Brazil (Manaus), Venezuela"; TiZ.AST4="Atlantic Time"; -TiZ.BRW="Brazil West"; +TiZ.AMT="Brazil (Cuiaba)"; TiZ.NST3="Newfoundland"; TiZ.WGST="Greenland"; -TiZ.BRT="Brazil East"; -TiZ.UTC3="Argentina, Guyana"; +TiZ.BRT="Brazil (Brasilia)"; +TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana"; TiZ.UTC2="Mid-Atlantic"; TiZ.STD1="Azores"; TiZ.UTC0="Gambia, Liberia, Morocco"; diff --git a/package/plugin-gargoyle-i18n-Polish-PL/files/www/i18n/Polish-PL/time.js b/package/plugin-gargoyle-i18n-Polish-PL/files/www/i18n/Polish-PL/time.js index a16e112726..c350522fd0 100644 --- a/package/plugin-gargoyle-i18n-Polish-PL/files/www/i18n/Polish-PL/time.js +++ b/package/plugin-gargoyle-i18n-Polish-PL/files/www/i18n/Polish-PL/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Meksyk"; TiZ.CST6="Czas centralny"; TiZ.UTC5="Kolumbia, Panama"; TiZ.EST5="Czas wschodni"; -TiZ.UTC4="Boliwia, Wenezuela"; +TiZ.UTC4="Boliwia, Brazylia (Manaus), Wenezuela"; TiZ.AST4="Czas atlantycki"; -TiZ.BRW="Brazylia (zachód)"; +TiZ.AMT="Brazylia (Cuiaba)"; TiZ.NST3="Nowa Fundlandia"; TiZ.WGST="Grenlandia"; -TiZ.BRT="Brazylia (wschód)"; -TiZ.UTC3="Argentyna, Gujana Francuska"; +TiZ.BRT="Brazylia (Brasilia)"; +TiZ.UTC3="Argentyna, Brazylia (Fortaleza), Gujana Francuska"; TiZ.UTC2="Środkowoatlanydzki"; TiZ.STD1="Azory"; TiZ.UTC0="Gambia, Liberia, Maroko"; diff --git a/package/plugin-gargoyle-i18n-Portuguese-BR/files/www/i18n/Portuguese-BR/time.js b/package/plugin-gargoyle-i18n-Portuguese-BR/files/www/i18n/Portuguese-BR/time.js index 4690113563..5e8b612a8d 100644 --- a/package/plugin-gargoyle-i18n-Portuguese-BR/files/www/i18n/Portuguese-BR/time.js +++ b/package/plugin-gargoyle-i18n-Portuguese-BR/files/www/i18n/Portuguese-BR/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Mexico"; TiZ.CST6="Central Time"; TiZ.UTC5="Colombia, Panama"; TiZ.EST5="Eastern Time"; -TiZ.UTC4="Bolivia, Venezuela"; +TiZ.UTC4="Bolivia, Brazil (Manaus), Venezuela"; TiZ.AST4="Atlantic Time"; -TiZ.BRW="Brazil West"; +TiZ.AMT="Brazil (Cuiaba)"; TiZ.NST3="Newfoundland"; TiZ.WGST="Greenland"; -TiZ.BRT="Brazil East"; -TiZ.UTC3="Argentina, Guyana"; +TiZ.BRT="Brazil (Brasilia)"; +TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana"; TiZ.UTC2="Mid-Atlantic"; TiZ.STD1="Azores"; TiZ.UTC0="Gambia, Liberia, Morocco"; diff --git a/package/plugin-gargoyle-i18n-Russian-RU/files/www/i18n/Russian-RU/time.js b/package/plugin-gargoyle-i18n-Russian-RU/files/www/i18n/Russian-RU/time.js index 81dfc27f70..a2b714a05f 100644 --- a/package/plugin-gargoyle-i18n-Russian-RU/files/www/i18n/Russian-RU/time.js +++ b/package/plugin-gargoyle-i18n-Russian-RU/files/www/i18n/Russian-RU/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Мексика"; TiZ.CST6="Центральное время"; TiZ.UTC5="Колумбия, Панама"; TiZ.EST5="Возточное время"; -TiZ.UTC4="Боливия, Венисуэлла"; +TiZ.UTC4="Боливия, Бразилия (Манаус), Венисуэлла"; TiZ.AST4="Атлантическое время"; -TiZ.BRW="Западная Бразилия"; +TiZ.AMT="Бразилия (Куяба)"; TiZ.NST3="Ньюфаундленд"; TiZ.WGST="Гринландия"; -TiZ.BRT="Восточная Бразилия"; -TiZ.UTC3="Аргентина, Гвинея"; +TiZ.BRT="Бразилия (Бразилиа)"; +TiZ.UTC3="Аргентина, Бразилия (Форталеза), Гвинея"; TiZ.UTC2="Центральноатлантическое время"; TiZ.STD1="Азорские о-ва"; TiZ.UTC0="Гамбия, Либерия, Морокко"; diff --git a/package/plugin-gargoyle-i18n-SimplifiedChinese-ZH-CN/files/www/i18n/SimplifiedChinese-ZH-CN/time.js b/package/plugin-gargoyle-i18n-SimplifiedChinese-ZH-CN/files/www/i18n/SimplifiedChinese-ZH-CN/time.js index 655bef68e9..6a90747a86 100644 --- a/package/plugin-gargoyle-i18n-SimplifiedChinese-ZH-CN/files/www/i18n/SimplifiedChinese-ZH-CN/time.js +++ b/package/plugin-gargoyle-i18n-SimplifiedChinese-ZH-CN/files/www/i18n/SimplifiedChinese-ZH-CN/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="墨西哥"; TiZ.CST6="美国中部时间"; TiZ.UTC5="哥伦比亚，巴拿马"; TiZ.EST5="美国东部时间"; -TiZ.UTC4="玻利维亚，委内瑞拉"; +TiZ.UTC4="玻利维亚，巴西（马瑙斯）, 委内瑞拉"; TiZ.AST4="大西洋时间"; -TiZ.BRW="巴西西部"; +TiZ.AMT="巴西（库亚巴）"; TiZ.NST3="纽芬兰"; TiZ.WGST="格陵兰岛"; -TiZ.BRT="巴西东部"; -TiZ.UTC3="阿根廷，圭亚那"; +TiZ.BRT="巴西（巴西利亚）"; +TiZ.UTC3="阿根廷，巴西（福塔莱萨）, 圭亚那"; TiZ.UTC2="中大西洋"; TiZ.STD1="亚速尔群岛"; TiZ.UTC0="冈比亚，利比里亚，摩洛哥"; diff --git a/package/plugin-gargoyle-i18n-Slovak-SK/files/www/i18n/Slovak-SK/time.js b/package/plugin-gargoyle-i18n-Slovak-SK/files/www/i18n/Slovak-SK/time.js index 4b72c4ed0b..5f2297b1cc 100644 --- a/package/plugin-gargoyle-i18n-Slovak-SK/files/www/i18n/Slovak-SK/time.js +++ b/package/plugin-gargoyle-i18n-Slovak-SK/files/www/i18n/Slovak-SK/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Mexiko"; TiZ.CST6="Centrálny čas"; TiZ.UTC5="Kolumbia, Panama"; TiZ.EST5="Východný čas"; -TiZ.UTC4="Bolívia, Venezuela"; +TiZ.UTC4="Bolívia, Brazília (Manaus), Venezuela"; TiZ.AST4="Atlantický čas"; -TiZ.BRW="Brazília západ"; +TiZ.AMT="Brazília (Cuiaba)"; TiZ.NST3="Newfoundland"; TiZ.WGST="Grónsko"; -TiZ.BRT="Brazília východ"; -TiZ.UTC3="Argentína, Guyana"; +TiZ.BRT="Brazília (Brasilia)"; +TiZ.UTC3="Argentína, Brazília (Fortaleza), Guyana"; TiZ.UTC2="Stredný-Atlantik"; TiZ.STD1="Azory"; TiZ.UTC0="Gambia, Libéria, Maroko"; diff --git a/package/plugin-gargoyle-i18n-Spanish-ES/files/www/i18n/Spanish-ES/time.js b/package/plugin-gargoyle-i18n-Spanish-ES/files/www/i18n/Spanish-ES/time.js index a41fbc8487..6fe9e60535 100644 --- a/package/plugin-gargoyle-i18n-Spanish-ES/files/www/i18n/Spanish-ES/time.js +++ b/package/plugin-gargoyle-i18n-Spanish-ES/files/www/i18n/Spanish-ES/time.js @@ -30,13 +30,13 @@ TiZ.UTC6="Tiempo del Centro (México)"; TiZ.CST6="Tiempo del Centro (EEUU)"; TiZ.UTC5="Tiempo del Sureste (México), Colombia, Panamá"; TiZ.EST5="Tiempo del Sureste (EEUU)"; -TiZ.UTC4="Bolivia, Venezuela"; +TiZ.UTC4="Bolivia, Brasil (Manaus), Venezuela"; TiZ.AST4="Tiempo del Atlántico"; -TiZ.BRW="Brasil Oeste"; +TiZ.AMT="Brasil (Cuiaba)"; TiZ.NST3="Terranova"; TiZ.WGST="Groenlandia"; -TiZ.BRT="Brazil Este"; -TiZ.UTC3="Argentina, Guyana"; +TiZ.BRT="Brazil (Brasilia)"; +TiZ.UTC3="Argentina, Brazil (Fortaleza), Guyana"; TiZ.UTC2="Mitad del Atlántico"; TiZ.STD1="Las Azores"; TiZ.UTC0="Gambia, Liberia, Marruecos"; From ed1e64565082cff4c19dc17a55887168445dcd4c Mon Sep 17 00:00:00 2001 From: Michael Gray Date: Thu, 15 Feb 2018 20:01:18 +1100 Subject: [PATCH 3/4] Distinguish Australian states from other countries --- .../files/www/i18n/English-EN/time.js | 12 ++++++------ .../files/www/i18n/French-FR/time.js | 12 ++++++------ .../files/www/i18n/German-DE/time.js | 12 ++++++------ .../files/www/i18n/Norwegian-NO/time.js | 12 ++++++------ .../files/www/i18n/Polish-PL/time.js | 12 ++++++------ .../files/www/i18n/Portuguese-BR/time.js | 12 ++++++------ .../files/www/i18n/Russian-RU/time.js | 12 ++++++------ .../files/www/i18n/SimplifiedChinese-ZH-CN/time.js | 12 ++++++------ .../files/www/i18n/Slovak-SK/time.js | 12 ++++++------ .../files/www/i18n/Spanish-ES/time.js | 12 ++++++------ 10 files changed, 60 insertions(+), 60 deletions(-) diff --git a/package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-EN/time.js b/package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-EN/time.js index c4f8cffd72..3a951317a4 100644 --- a/package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-EN/time.js +++ b/package/plugin-gargoyle-i18n-English-EN/files/www/i18n/English-EN/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi"; TiZ.UTCm6="Bangladesh, Russia"; TiZ.UTCm7="Thailand, Russia"; TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russia"; -TiZ.AWSTm8="Australia, Western Australia"; -TiZ.UTCm8c45="Australia, Eucla, Eyre Highway"; +TiZ.AWSTm8="Australia (Western Australia)"; +TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)"; TiZ.UTCm9="Japan, Korea"; -TiZ.ACSTm9c3="Australia, Northern Territory"; -TiZ.ACDT="Australia, South Australia"; -TiZ.AESTm10="Australia, Queensland"; -TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania"; +TiZ.ACSTm9c3="Australia (Northern Territory)"; +TiZ.ACDT="Australia (South Australia)"; +TiZ.AESTm10="Australia (Queensland)"; +TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)"; TiZ.UTCm10="Guam, Russia"; TiZ.UTCm11="Solomon Islands"; TiZ.UTCm12="Fiji"; diff --git a/package/plugin-gargoyle-i18n-French-FR/files/www/i18n/French-FR/time.js b/package/plugin-gargoyle-i18n-French-FR/files/www/i18n/French-FR/time.js index d242c03f41..86241c0b77 100644 --- a/package/plugin-gargoyle-i18n-French-FR/files/www/i18n/French-FR/time.js +++ b/package/plugin-gargoyle-i18n-French-FR/files/www/i18n/French-FR/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi"; TiZ.UTCm6="Bangladesh, Russia"; TiZ.UTCm7="Thailand, Russia"; TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russia"; -TiZ.AWSTm8="Australia, Western Australia"; -TiZ.UTCm8c45="Australia, Eucla, Eyre Highway"; +TiZ.AWSTm8="Australia (Western Australia)"; +TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)"; TiZ.UTCm9="Japan, Korea"; -TiZ.ACSTm9c3="Australia, Northern Territory"; -TiZ.ACDT="Australia, South Australia"; -TiZ.AESTm10="Australia, Queensland"; -TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania"; +TiZ.ACSTm9c3="Australia (Northern Territory)"; +TiZ.ACDT="Australia (South Australia)"; +TiZ.AESTm10="Australia (Queensland)"; +TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)"; TiZ.UTCm10="Guam, Russia"; TiZ.UTCm11="Solomon Islands"; TiZ.UTCm12="Fiji"; diff --git a/package/plugin-gargoyle-i18n-German-DE/files/www/i18n/German-DE/time.js b/package/plugin-gargoyle-i18n-German-DE/files/www/i18n/German-DE/time.js index ca8864fa2c..c41f06d9ee 100644 --- a/package/plugin-gargoyle-i18n-German-DE/files/www/i18n/German-DE/time.js +++ b/package/plugin-gargoyle-i18n-German-DE/files/www/i18n/German-DE/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi"; TiZ.UTCm6="Bangladesh, Russland"; TiZ.UTCm7="Thailand, Russland"; TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russland"; -TiZ.AWSTm8="Australien, West Australia"; -TiZ.UTCm8c45="Australia, Eucla, Eyre Highway"; +TiZ.AWSTm8="Australia (Western Australia)"; +TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)"; TiZ.UTCm9="Japan, Korea"; -TiZ.ACSTm9c3="Australia, Northern Territory"; -TiZ.ACDT="Australia, South Australia"; -TiZ.AESTm10="Australia, Queensland"; -TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania"; +TiZ.ACSTm9c3="Australia (Northern Territory)"; +TiZ.ACDT="Australia (South Australia)"; +TiZ.AESTm10="Australia (Queensland)"; +TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)"; TiZ.UTCm10="Guam, Russia"; TiZ.UTCm11="Solomon Islands"; TiZ.UTCm12="Fiji"; diff --git a/package/plugin-gargoyle-i18n-Norwegian-NO/files/www/i18n/Norwegian-NO/time.js b/package/plugin-gargoyle-i18n-Norwegian-NO/files/www/i18n/Norwegian-NO/time.js index eace3f469e..32918c36c5 100644 --- a/package/plugin-gargoyle-i18n-Norwegian-NO/files/www/i18n/Norwegian-NO/time.js +++ b/package/plugin-gargoyle-i18n-Norwegian-NO/files/www/i18n/Norwegian-NO/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi"; TiZ.UTCm6="Bangladesh, Russia"; TiZ.UTCm7="Thailand, Russia"; TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russia"; -TiZ.AWSTm8="Australia, Western Australia"; -TiZ.UTCm8c45="Australia, Eucla, Eyre Highway"; +TiZ.AWSTm8="Australia (Western Australia)"; +TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)"; TiZ.UTCm9="Japan, Korea"; -TiZ.ACSTm9c3="Australia, Northern Territory"; -TiZ.ACDT="Australia, South Australia"; -TiZ.AESTm10="Australia, Queensland"; -TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania"; +TiZ.ACSTm9c3="Australia (Northern Territory)"; +TiZ.ACDT="Australia (South Australia)"; +TiZ.AESTm10="Australia (Queensland)"; +TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)"; TiZ.UTCm10="Guam, Russia"; TiZ.UTCm11="Solomon Islands"; TiZ.UTCm12="Fiji"; diff --git a/package/plugin-gargoyle-i18n-Polish-PL/files/www/i18n/Polish-PL/time.js b/package/plugin-gargoyle-i18n-Polish-PL/files/www/i18n/Polish-PL/time.js index c350522fd0..1a34751124 100644 --- a/package/plugin-gargoyle-i18n-Polish-PL/files/www/i18n/Polish-PL/time.js +++ b/package/plugin-gargoyle-i18n-Polish-PL/files/www/i18n/Polish-PL/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombaj, Kalkuta, Madras, Nowe Delhi"; TiZ.UTCm6="Bangladesz, Rosja"; TiZ.UTCm7="Tajlandia, Rosja"; TiZ.UTCm8="Chiny, Hong Kong, Singapur, Tajwan, Rosja"; -TiZ.AWSTm8="Australia, Australia Południowa"; -TiZ.UTCm8c45="Australia, Eucla, Eyre Highway"; +TiZ.AWSTm8="Australia (Australia Południowa)"; +TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)"; TiZ.UTCm9="Japonia, Korea"; -TiZ.ACSTm9c3="Australia, Terytorium Północne"; -TiZ.ACDT="Australia, Australia Południowa"; -TiZ.AESTm10="Australia, Queensland"; -TiZ.AEDT="Australia, Nowa Południowa Walia, Wiktoria, Tasmania"; +TiZ.ACSTm9c3="Australia (Terytorium Północne)"; +TiZ.ACDT="Australia (Australia Południowa)"; +TiZ.AESTm10="Australia (Queensland)"; +TiZ.AEDT="Australia (Nowa Południowa Walia, Wiktoria, Tasmania)"; TiZ.UTCm10="Guam, Rosja"; TiZ.UTCm11="Wyspy Salomona"; TiZ.UTCm12="Fidżi"; diff --git a/package/plugin-gargoyle-i18n-Portuguese-BR/files/www/i18n/Portuguese-BR/time.js b/package/plugin-gargoyle-i18n-Portuguese-BR/files/www/i18n/Portuguese-BR/time.js index 5e8b612a8d..cc7609da1e 100644 --- a/package/plugin-gargoyle-i18n-Portuguese-BR/files/www/i18n/Portuguese-BR/time.js +++ b/package/plugin-gargoyle-i18n-Portuguese-BR/files/www/i18n/Portuguese-BR/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, New Delhi"; TiZ.UTCm6="Bangladesh, Russia"; TiZ.UTCm7="Thailand, Russia"; TiZ.UTCm8="China, Hong Kong, Singapore, Taiwan, Russia"; -TiZ.AWSTm8="Australia, Western Australia"; -TiZ.UTCm8c45="Australia, Eucla, Eyre Highway"; +TiZ.AWSTm8="Australia (Western Australia)"; +TiZ.UTCm8c45="Australia (Eucla, Eyre Highway)"; TiZ.UTCm9="Japan, Korea"; -TiZ.ACSTm9c3="Australia, Northern Territory"; -TiZ.ACDT="Australia, South Australia"; -TiZ.AESTm10="Australia, Queensland"; -TiZ.AEDT="Australia, New South Wales, Victoria, Tasmania"; +TiZ.ACSTm9c3="Australia (Northern Territory)"; +TiZ.ACDT="Australia (South Australia)"; +TiZ.AESTm10="Australia (Queensland)"; +TiZ.AEDT="Australia (New South Wales, Victoria, Tasmania)"; TiZ.UTCm10="Guam, Russia"; TiZ.UTCm11="Solomon Islands"; TiZ.UTCm12="Fiji"; diff --git a/package/plugin-gargoyle-i18n-Russian-RU/files/www/i18n/Russian-RU/time.js b/package/plugin-gargoyle-i18n-Russian-RU/files/www/i18n/Russian-RU/time.js index a2b714a05f..dacce4fe37 100644 --- a/package/plugin-gargoyle-i18n-Russian-RU/files/www/i18n/Russian-RU/time.js +++ b/package/plugin-gargoyle-i18n-Russian-RU/files/www/i18n/Russian-RU/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Бомбей, Калькутта, Мадрас, Нью Дэли"; TiZ.UTCm6="Бангладеш, Россия"; TiZ.UTCm7="Тайланд, Россия"; TiZ.UTCm8="Китай, Гонконг, Сингапур, Тайвань, Россия"; -TiZ.AWSTm8="Австралия, Западная Австралия"; -TiZ.UTCm8c45="Австралия, п-ов Эйр"; +TiZ.AWSTm8="Австралия (Западная Австралия)"; +TiZ.UTCm8c45="Австралия (п-ов Эйр)"; TiZ.UTCm9="Япония, Корея"; -TiZ.ACSTm9c3="Австралия, Северные територии"; -TiZ.ACDT="Австралия, Южная Австралия"; -TiZ.AESTm10="Австралия, Квинсленд"; -TiZ.AEDT="Австралия, Новый Южный Уэльс, Виктория, Тасмания"; +TiZ.ACSTm9c3="Австралия (Северные територии)"; +TiZ.ACDT="Австралия (Южная Австралия)"; +TiZ.AESTm10="Австралия (Квинсленд)"; +TiZ.AEDT="Австралия (Новый Южный Уэльс, Виктория, Тасмания)"; TiZ.UTCm10="Гуам, Россия"; TiZ.UTCm11="Соломоновы о-ва"; TiZ.UTCm12="Фиджи"; diff --git a/package/plugin-gargoyle-i18n-SimplifiedChinese-ZH-CN/files/www/i18n/SimplifiedChinese-ZH-CN/time.js b/package/plugin-gargoyle-i18n-SimplifiedChinese-ZH-CN/files/www/i18n/SimplifiedChinese-ZH-CN/time.js index 6a90747a86..9eb21ae4bd 100644 --- a/package/plugin-gargoyle-i18n-SimplifiedChinese-ZH-CN/files/www/i18n/SimplifiedChinese-ZH-CN/time.js +++ b/package/plugin-gargoyle-i18n-SimplifiedChinese-ZH-CN/files/www/i18n/SimplifiedChinese-ZH-CN/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="孟买，加尔各答，马德拉斯，新德里"; TiZ.UTCm6="孟加拉，俄罗斯"; TiZ.UTCm7="泰国，俄罗斯"; TiZ.UTCm8="中国，香港，新加坡，台湾，俄罗斯"; -TiZ.AWSTm8="澳大利亚，西澳大利亚"; -TiZ.UTCm8c45="澳大利亚，尤克拉，艾尔高速公路"; +TiZ.AWSTm8="澳大利亚 (西澳大利亚)"; +TiZ.UTCm8c45="澳大利亚 (尤克拉，艾尔高速公路)"; TiZ.UTCm9="日本，韩国"; -TiZ.ACSTm9c3="澳大利亚，北部地区"; -TiZ.ACDT="澳大利亚，南澳大利亚"; -TiZ.AESTm10="澳大利亚，昆士兰州"; -TiZ.AEDT="澳大利亚，新南威尔士州，维多利亚，塔斯马尼亚"; +TiZ.ACSTm9c3="澳大利亚 (北部地区)"; +TiZ.ACDT="澳大利亚 (南澳大利亚)"; +TiZ.AESTm10="澳大利亚 (昆士兰州)"; +TiZ.AEDT="澳大利亚 (新南威尔士州，维多利亚，塔斯马尼亚)"; TiZ.UTCm10="关岛，俄罗斯"; TiZ.UTCm11="所罗门群岛"; TiZ.UTCm12="斐济"; diff --git a/package/plugin-gargoyle-i18n-Slovak-SK/files/www/i18n/Slovak-SK/time.js b/package/plugin-gargoyle-i18n-Slovak-SK/files/www/i18n/Slovak-SK/time.js index 5f2297b1cc..5c0cc40304 100644 --- a/package/plugin-gargoyle-i18n-Slovak-SK/files/www/i18n/Slovak-SK/time.js +++ b/package/plugin-gargoyle-i18n-Slovak-SK/files/www/i18n/Slovak-SK/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombaj, Kalkata, Madras, New Delhi"; TiZ.UTCm6="Bangladéš, Rusko"; TiZ.UTCm7="Thajsko, Rusko"; TiZ.UTCm8="Čína, Hong Kong, Singapúr, Taiwan, Rusko"; -TiZ.AWSTm8="Austrália, Západná Austrália"; -TiZ.UTCm8c45="Austrália, Eucla, Eyre Highway"; +TiZ.AWSTm8="Austrália (Západná Austrália)"; +TiZ.UTCm8c45="Austrália (Eucla, Eyre Highway)"; TiZ.UTCm9="Japonsko, Kórea"; -TiZ.ACSTm9c3="Austrália, Severné Teritórium"; -TiZ.ACDT="Austrália, Južná Austrália"; -TiZ.AESTm10="Austrália, Queensland"; -TiZ.AEDT="Austrália, New South Wales, Victoria, Tasmánia"; +TiZ.ACSTm9c3="Austrália (Severné Teritórium)"; +TiZ.ACDT="Austrália (Južná Austrália)"; +TiZ.AESTm10="Austrália (Queensland)"; +TiZ.AEDT="Austrália (New South Wales, Victoria, Tasmánia)"; TiZ.UTCm10="Guam, Rusko"; TiZ.UTCm11="Šalamúnove ostrovy"; TiZ.UTCm12="Fidži"; diff --git a/package/plugin-gargoyle-i18n-Spanish-ES/files/www/i18n/Spanish-ES/time.js b/package/plugin-gargoyle-i18n-Spanish-ES/files/www/i18n/Spanish-ES/time.js index 6fe9e60535..1cfaf0b48e 100644 --- a/package/plugin-gargoyle-i18n-Spanish-ES/files/www/i18n/Spanish-ES/time.js +++ b/package/plugin-gargoyle-i18n-Spanish-ES/files/www/i18n/Spanish-ES/time.js @@ -53,13 +53,13 @@ TiZ.UTCm5c3="Bombay, Calcutta, Madras, Nueva Delhi"; TiZ.UTCm6="Bangladesh, Rusia"; TiZ.UTCm7="Tailandia, Rusia"; TiZ.UTCm8="China, Hong Kong, Singapur, Taiwan, Rusia"; -TiZ.AWSTm8="Australia, Australia Occidental"; -TiZ.UTCm8c45="Australia, Eucla, La Carretera de Eyre"; +TiZ.AWSTm8="Australia (Australia Occidental)"; +TiZ.UTCm8c45="Australia (Eucla, La Carretera de Eyre)"; TiZ.UTCm9="Japón, Corea"; -TiZ.ACSTm9c3="Australia, Territorio del Norte"; -TiZ.ACDT="Australia, Australia del Sur"; -TiZ.AESTm10="Australia, Queensland"; -TiZ.AEDT="Australia, Nueva Gales del Sur, Victoria, Tasmania"; +TiZ.ACSTm9c3="Australia (Territorio del Norte)"; +TiZ.ACDT="Australia (Australia del Sur)"; +TiZ.AESTm10="Australia (Queensland)"; +TiZ.AEDT="Australia (Nueva Gales del Sur, Victoria, Tasmania)"; TiZ.UTCm10="Guam, Rusia"; TiZ.UTCm11="Islas Salomón"; TiZ.UTCm12="Fiyi"; From 38db3d9cc22c06aa7c196feb6195996b4b6b14fa Mon Sep 17 00:00:00 2001 From: Michael Gray Date: Sat, 17 Feb 2018 12:42:20 +1100 Subject: [PATCH 4/4] Fix regression in restrictions from 05ea52f --- package/gargoyle/files/www/js/restrictions.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gargoyle/files/www/js/restrictions.js b/package/gargoyle/files/www/js/restrictions.js index f92658f429..99acfcd932 100644 --- a/package/gargoyle/files/www/js/restrictions.js +++ b/package/gargoyle/files/www/js/restrictions.js @@ -304,8 +304,8 @@ function editRule() } - editRuleType = editRuleType == "restriction_rule" ? "restriction_edit_rule.sh" : "whitelist_edit_rule.sh"; - editRuleWindow = openPopupWindow(editRuleType, "edit", 560, 600); + var editRuleWinType = editRuleType == "restriction_rule" ? "restriction_edit_rule.sh" : "whitelist_edit_rule.sh"; + editRuleWindow = openPopupWindow(editRuleWinType, "edit", 560, 600); saveButton = createInput("button", editRuleWindow.document); closeButton = createInput("button", editRuleWindow.document);