From 28c9ee8a0d21d6893270b3164845a27fb9aeebbd Mon Sep 17 00:00:00 2001 From: SimonBrazell Date: Thu, 30 Jul 2020 22:40:36 +1000 Subject: [PATCH] Closes #82, closes #84. --- _locales/de/messages.json | 20 +++++++++--- _locales/en/messages.json | 20 +++++++++--- _locales/fr/messages.json | 18 +++++++++-- _locales/ru/messages.json | 16 ++++++++-- assets/javascript/localise.js | 24 +++++++------- manifest.json | 2 +- pages/options/options.html | 59 +++++++++++++++++------------------ pages/popup/popup.html | 18 ++++++----- pages/popup/popup.js | 2 +- 9 files changed, 113 insertions(+), 66 deletions(-) diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 2ad3bda..431ed1d 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -75,9 +75,17 @@ "message": "Ausnahmen", "description": "Exceptions tab (options)." }, - "exceptionsDescription": { - "message": "

Gib eine URL oder einen regulären Ausdruck (Regex) ein, die/der von Weiterleitungen ausgeschlossen werden soll.

Alle Anfragen für oder ausgehend von einer URL, die auf die Ausnahme zutrifft, werden von Weiterleitungen ausgeschlossen.

Hinweis – Unterstützt reguläre JavaScript-Ausdrücke (Regex), mit Ausnahme der einschließenden Schrägstriche.

", - "description": "A description of the 'Exceptions' feature (options)." + "exceptionsDescriptionP1": { + "message": "Gib eine URL oder einen regulären Ausdruck (Regex) ein, die/der von Weiterleitungen ausgeschlossen werden soll.", + "description": "A description of the 'Exceptions' feature paragraph 1 (options)." + }, + "exceptionsDescriptionP2": { + "message": "Alle Anfragen für oder ausgehend von einer URL, die auf die Ausnahme zutrifft, werden von Weiterleitungen ausgeschlossen.", + "description": "A description of the 'Exceptions' feature paragraph 2 (options)." + }, + "exceptionsDescriptionP3": { + "message": "Hinweis – Unterstützt reguläre JavaScript-Ausdrücke (Regex), mit Ausnahme der einschließenden Schrägstriche.", + "description": "A description of the 'Exceptions' feature paragraph 3 (options)." }, "addException": { "message": "Ausnahme hinzufügen", @@ -94,5 +102,9 @@ "redirect": { "message": "Redirect", "description": "Extension title - Redirect (pop-up)." + }, + "version": { + "message": "Version", + "description": "Version" } -} \ No newline at end of file +} diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 2a34b8b..2e106a7 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -75,9 +75,17 @@ "message": "Exceptions", "description": "Exceptions tab (options)." }, - "exceptionsDescription": { - "message": "

Enter a URL or Regular Expression to be excluded from redirects.

All requests for or initiating from a URL that matches the exception will be excluded from redirects.

Note - Supports JavaScript regular expressions, excluding the enclosing forward slashes.

", - "description": "A description of the 'Exceptions' feature (options)." + "exceptionsDescriptionP1": { + "message": "Enter a URL or Regular Expression to be excluded from redirects.", + "description": "A description of the 'Exceptions' feature paragraph 1 (options)." + }, + "exceptionsDescriptionP2": { + "message": "All requests for or initiating from a URL that matches the exception will be excluded from redirects.", + "description": "A description of the 'Exceptions' feature paragraph 2 (options)." + }, + "exceptionsDescriptionP3": { + "message": "Note - Supports JavaScript regular expressions, excluding the enclosing forward slashes.", + "description": "A description of the 'Exceptions' feature paragraph 3 (options)." }, "addException": { "message": "Add Exception", @@ -94,5 +102,9 @@ "redirect": { "message": "Redirect", "description": "Extension title - Redirect (pop-up)." + }, + "version": { + "message": "Version", + "description": "Version" } -} \ No newline at end of file +} diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index ef172d1..7d57c8b 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -75,8 +75,16 @@ "message": "Exceptions", "description": "Onglet des Exceptions dans les options." }, - "exceptionsDescription": { - "message": "

Entrez une adresse URL ou une expression régulière qui sera exclue des redirections.

All requests for or initiating from a URL that matches the exception will be excluded from redirects.

Note - Supports JavaScript regular expressions, excluding the enclosing forward slashes.

", + "exceptionsDescriptionP1": { + "message": "Entrez une adresse URL ou une expression régulière qui sera exclue des redirections.", + "description": "Description pour la rubrique 'Exceptions' dans les options." + }, + "exceptionsDescriptionP2": { + "message": "All requests for or initiating from a URL that matches the exception will be excluded from redirects.", + "description": "Description pour la rubrique 'Exceptions' dans les options." + }, + "exceptionsDescriptionP3": { + "message": "Note - Supports JavaScript regular expressions, excluding the enclosing forward slashes.", "description": "Description pour la rubrique 'Exceptions' dans les options." }, "addException": { @@ -94,5 +102,9 @@ "redirect": { "message": "Redirect", "description": "Titre du module complémentaire - Redirection (pop-up)." + }, + "version": { + "message": "Version", + "description": "Version" } -} \ No newline at end of file +} diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index 0b7d996..d46e3fb 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -91,8 +91,16 @@ "message": "Исключения", "description": "Вкладка 'Исключения' (в настройках)." }, - "exceptionsDescription": { - "message": "

Введите URL или регулярное выражение для исключения из перенаправлений.

Все запросы на URL, совпадающие с исключениями, или инициированные с них будут исключены из перенаправлений.

Примечание: Поддерживает регулярные выражения JavaScript, кроме закрывающих обратных слэшей.

", + "exceptionsDescriptionP1": { + "message": "Введите URL или регулярное выражение для исключения из перенаправлений.", + "description": "Описание функции 'Исключения' (в настройках)." + }, + "exceptionsDescriptionP2": { + "message": "Все запросы на URL, совпадающие с исключениями, или инициированные с них будут исключены из перенаправлений.", + "description": "Описание функции 'Исключения' (в настройках)." + }, + "exceptionsDescriptionP3": { + "message": "Примечание: Поддерживает регулярные выражения JavaScript, кроме закрывающих обратных слэшей.", "description": "Описание функции 'Исключения' (в настройках)." }, "addException": { @@ -110,5 +118,9 @@ "redirect": { "message": "Redirect", "description": "Название расширения - Redirect (во всплывающем окне)." + }, + "version": { + "message": "Version", + "description": "Version" } } diff --git a/assets/javascript/localise.js b/assets/javascript/localise.js index e408025..cbe5c19 100644 --- a/assets/javascript/localise.js +++ b/assets/javascript/localise.js @@ -1,19 +1,19 @@ window.browser = window.browser || window.chrome; -function localizeHtmlPage() { - // Localize using __MSG_***__ data tags - var data = document.querySelectorAll('[data-localize]'); +function localisePage() { + var data = document.querySelectorAll("[data-localise]"); - for (var i in data) if (data.hasOwnProperty(i)) { - var obj = data[i]; - var tag = obj.getAttribute('data-localize').toString(); + for (var i in data) + if (data.hasOwnProperty(i)) { + var obj = data[i]; + var tag = obj.getAttribute("data-localise").toString(); - var msg = tag.replace(/__MSG_(\w+)__/g, function (_match, v1) { - return v1 ? browser.i18n.getMessage(v1) : null; - }); + var msg = tag.replace(/__MSG_(\w+)__/g, function (_match, v1) { + return v1 ? browser.i18n.getMessage(v1) : null; + }); - if (msg && msg !== tag) obj.innerHTML = msg; - } + if (msg && msg !== tag) obj.textContent = msg; + } } -localizeHtmlPage(); \ No newline at end of file +localisePage(); diff --git a/manifest.json b/manifest.json index 1e40845..d49fc9b 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_extensionName__", "description": "__MSG_extensionDescription__", - "version": "1.1.37", + "version": "1.1.38", "manifest_version": 2, "background": { "scripts": ["background.js"], diff --git a/pages/options/options.html b/pages/options/options.html index f5947bc..0f38ff0 100644 --- a/pages/options/options.html +++ b/pages/options/options.html @@ -13,21 +13,21 @@ @@ -39,7 +39,7 @@ -

Nitter Redirects

+

Nitter Redirects

-

+

Invidious Redirects

@@ -81,7 +81,7 @@ -

+

Bibliogram Redirects

@@ -103,7 +103,7 @@ -

+

OpenStreetMap Redirects

@@ -121,7 +121,7 @@
-

Nitter Instance

+

Nitter Instance

-

Invidious Instance

+

Invidious Instance

-

Bibliogram Instance

+

Bibliogram Instance

-

OpenStreetMap Instance

+

OpenStreetMap Instance

-

Theme

+

Theme

@@ -238,7 +238,7 @@ -

+

Invidious dark mode always on

@@ -257,7 +257,7 @@
-

Invidious Volume

+

Invidious Volume

-

+

Invidious Player Style

-

+

Invidious Subtitles - language codes (comma-separated)

-

+

Invidious automatically play video on load

@@ -316,7 +316,7 @@ -

+

Persist Invidious preferences (as cookie)

@@ -342,7 +342,7 @@ -

+

Proactively remove Twitter service worker

@@ -362,19 +362,16 @@
-
-

+

+

Enter a URL or Regular Expression to be excluded from redirects.

-

+

All requests for or initiating from a URL that matches your exception will be excluded from redirects.

-

- Note - Supports JavaScript regular expressions, excluding the +

+ Note - Supports JavaScript regular expressions, excluding the enclosing forward slashes.

@@ -383,7 +380,7 @@ -

Add Exception

+

Add Exception

diff --git a/pages/popup/popup.html b/pages/popup/popup.html index 9fa324a..e06159a 100644 --- a/pages/popup/popup.html +++ b/pages/popup/popup.html @@ -15,12 +15,14 @@ alt="Privacy Redirect logo" />

- Privacy
Redirect + Privacy
Redirect

- Version:  + Version: 
@@ -29,7 +31,7 @@ -

Nitter Redirects

+

Nitter Redirects

-

+

Invidious Redirects

@@ -73,7 +75,7 @@ -

+

Bibliogram Redirects

@@ -96,7 +98,7 @@ -

+

OpenStreetMap Redirects

@@ -118,7 +120,7 @@