[Pkg-mozext-commits] [requestpolicy] 88/280: redir.notif.bar: show origin URL on header-redir
David Prévot
taffit at moszumanska.debian.org
Sat May 2 20:30:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository requestpolicy.
commit cb26dba072da08387480106c08eafc6a42a684ba
Author: Martin Kimmerle <dev at 256k.de>
Date: Wed Dec 31 14:26:37 2014 +0100
redir.notif.bar: show origin URL on header-redir
In case a URL redirection through a HTTP header has been blocked
by RP, from now on the notification bar shows the URL of the
destination *and* the origin.
---
src/content/ui/overlay.js | 16 +++++++++++-----
src/locale/de/requestpolicy.properties | 1 +
src/locale/en-US/requestpolicy.properties | 1 +
src/locale/eo/requestpolicy.properties | 1 +
src/locale/es-MX/requestpolicy.properties | 1 +
src/locale/eu/requestpolicy.properties | 1 +
src/locale/fr/requestpolicy.properties | 1 +
src/locale/it/requestpolicy.properties | 1 +
src/locale/ja/requestpolicy.properties | 1 +
src/locale/ko-KR/requestpolicy.properties | 1 +
src/locale/lv-LV/requestpolicy.properties | 1 +
src/locale/nl/requestpolicy.properties | 1 +
src/locale/pt-BR/requestpolicy.properties | 1 +
src/locale/ru-RU/requestpolicy.properties | 1 +
src/locale/sk-SK/requestpolicy.properties | 1 +
src/locale/sv-SE/requestpolicy.properties | 1 +
src/locale/tr/requestpolicy.properties | 1 +
src/locale/uk-UA/requestpolicy.properties | 1 +
src/locale/zh-CN/requestpolicy.properties | 1 +
src/locale/zh-TW/requestpolicy.properties | 1 +
20 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/content/ui/overlay.js b/src/content/ui/overlay.js
index 9b21d76..81c6171 100644
--- a/src/content/ui/overlay.js
+++ b/src/content/ui/overlay.js
@@ -454,6 +454,7 @@ requestpolicy.overlay = (function() {
// Line: 260
// redirectOriginUri is optional and is not necessary for <meta> redirects.
+ isOriginUndefined = redirectOriginUri === undefined;
redirectOriginUri = redirectOriginUri || self.getTopLevelDocumentUri();
if (isFennec) {
@@ -466,11 +467,16 @@ requestpolicy.overlay = (function() {
var notificationBox = gBrowser.getNotificationBox(browser);
var notificationValue = "request-policy-meta-redirect";
- // TODO: different label when redirectNotification is specified.
- // e.g. „An url redirection from X to Y has been blocked.“
- var notificationLabel = StringUtils.$str("redirectNotification",
- [cropUri(redirectTargetUri, 50)],
- 1);
+ // prepare the notification's label
+ let notificationLabel;
+ if (isOriginUndefined) {
+ notificationLabel = StringUtils.$str("redirectNotification",
+ [cropUri(redirectTargetUri, 50)], 1);
+ } else {
+ notificationLabel = StringUtils.$str("redirectNotificationWithOrigin",
+ [cropUri(redirectOriginUri, 50), cropUri(redirectTargetUri, 50)], 2);
+ }
+
var addRuleMenuName = "requestpolicyRedirectAddRuleMenu";
var addRulePopup = document.getElementById(addRuleMenuName);
diff --git a/src/locale/de/requestpolicy.properties b/src/locale/de/requestpolicy.properties
index 19632fc..3380905 100644
--- a/src/locale/de/requestpolicy.properties
+++ b/src/locale/de/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Anfragen durch %S können nicht verboten werden
redirectNotification=Diese Webseite möchte nach %S weiterleiten
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Erlauben
allow.accesskey=E
deny=Ablehnen
diff --git a/src/locale/en-US/requestpolicy.properties b/src/locale/en-US/requestpolicy.properties
index 6796897..784718f 100644
--- a/src/locale/en-US/requestpolicy.properties
+++ b/src/locale/en-US/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Requests from %S cannot be blocked
redirectNotification=This webpage has asked to redirect to %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Allow
allow.accesskey=A
deny=Deny
diff --git a/src/locale/eo/requestpolicy.properties b/src/locale/eo/requestpolicy.properties
index 9ced19a..b83ef44 100644
--- a/src/locale/eo/requestpolicy.properties
+++ b/src/locale/eo/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Petojn de %S malpermesi ne eblas
redirectNotification=Tiu ĉi retpaĝo petis pri alidirekto al %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Permesi
allow.accesskey=P
deny=Ne permesi
diff --git a/src/locale/es-MX/requestpolicy.properties b/src/locale/es-MX/requestpolicy.properties
index 8e99db2..f316b90 100644
--- a/src/locale/es-MX/requestpolicy.properties
+++ b/src/locale/es-MX/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Las peticiones desde %S no pueden ser bloqueadas
redirectNotification=Esta pagina ha pedido ser redirigida a %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Permitir
allow.accesskey=A
deny=Negar
diff --git a/src/locale/eu/requestpolicy.properties b/src/locale/eu/requestpolicy.properties
index e05824d..7837668 100644
--- a/src/locale/eu/requestpolicy.properties
+++ b/src/locale/eu/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=%S tik datozen eskaerak ezin dira blokeatu
redirectNotification=Webgune honek %S ra berbideratzeko eskatu du
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Baimendu
allow.accesskey=A
deny=Ukatu
diff --git a/src/locale/fr/requestpolicy.properties b/src/locale/fr/requestpolicy.properties
index 353b3b8..cefa3c4 100644
--- a/src/locale/fr/requestpolicy.properties
+++ b/src/locale/fr/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Arrêter d'empêcher les requêtes vers %S
stopDenyingOriginToDestination=Arrêter d'empêcher les requêtes de %1$S vers %2$S
unrestrictedOrigin=Requests from %S cannot be blocked
redirectNotification=Cette page Web a demandé une redirection vers %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Accepter
allow.accesskey=A
deny=Refuser
diff --git a/src/locale/it/requestpolicy.properties b/src/locale/it/requestpolicy.properties
index 09b4868..2c867ca 100644
--- a/src/locale/it/requestpolicy.properties
+++ b/src/locale/it/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Revoca il blocco delle richieste a %S
stopDenyingOriginToDestination=Revoca il blocco delle richieste da %1$S a %2$S
unrestrictedOrigin=Le richieste da %S non possono essere bloccate
redirectNotification=Questa pagina ha chiesto un reindirizzamento verso %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Permetti
allow.accesskey=P
deny=Nega
diff --git a/src/locale/ja/requestpolicy.properties b/src/locale/ja/requestpolicy.properties
index 65c2a9c..e51f677 100644
--- a/src/locale/ja/requestpolicy.properties
+++ b/src/locale/ja/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=%S からのリクエストはブロックされません
redirectNotification=このWebページは %S へリダイレクトしようとしています
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=許可
allow.accesskey=A
deny=禁止
diff --git a/src/locale/ko-KR/requestpolicy.properties b/src/locale/ko-KR/requestpolicy.properties
index 9f2e552..dfb5cb2 100644
--- a/src/locale/ko-KR/requestpolicy.properties
+++ b/src/locale/ko-KR/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Requests from %S cannot be blocked
redirectNotification=이 웹페이지가 %S(으)로 리다이렉트 됩니다.
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=허용
allow.accesskey=A
deny=거부
diff --git a/src/locale/lv-LV/requestpolicy.properties b/src/locale/lv-LV/requestpolicy.properties
index ae1a859..3d12663 100644
--- a/src/locale/lv-LV/requestpolicy.properties
+++ b/src/locale/lv-LV/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Izbeigt pieprasījumu bloķēšanu uz %S
stopDenyingOriginToDestination=Izbeigt pieprasījumu bloķēšanu no %1$S uz %2$S
unrestrictedOrigin=Pieprasījumi no %S nevar tikt aizliegti
redirectNotification=Šī vietne vēlas pārvirzīt uz %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Atļaut
allow.accesskey=A
deny=Aizliegt
diff --git a/src/locale/nl/requestpolicy.properties b/src/locale/nl/requestpolicy.properties
index 194ef1c..4004fec 100644
--- a/src/locale/nl/requestpolicy.properties
+++ b/src/locale/nl/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Verzoeken van %S kunnen niet worden geblokkeerd
redirectNotification=Deze webpagina wil doorverwijzen naar %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Toestaan
allow.accesskey=T
deny=Weigeren
diff --git a/src/locale/pt-BR/requestpolicy.properties b/src/locale/pt-BR/requestpolicy.properties
index e7cc151..0911363 100644
--- a/src/locale/pt-BR/requestpolicy.properties
+++ b/src/locale/pt-BR/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Pedidos de %S não puderam ser bloqueados
redirectNotification=A página atual quer redirecionar o navegador para %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Permitir
allow.accesskey=P
deny=Bloquear
diff --git a/src/locale/ru-RU/requestpolicy.properties b/src/locale/ru-RU/requestpolicy.properties
index ac7af20..d69702d 100644
--- a/src/locale/ru-RU/requestpolicy.properties
+++ b/src/locale/ru-RU/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Запросы от %S не могут быть заблокированы
redirectNotification=Эта страница запросила перенаправление на %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Разрешить
allow.accesskey=A
deny=Отклонить
diff --git a/src/locale/sk-SK/requestpolicy.properties b/src/locale/sk-SK/requestpolicy.properties
index 9ca4cb0..1bce9dc 100644
--- a/src/locale/sk-SK/requestpolicy.properties
+++ b/src/locale/sk-SK/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Požiadavky z %S nemôžu byť blokované
redirectNotification=Táto stránka požaduje presmerovanie na %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Povoliť
allow.accesskey=P
deny=Zakázať
diff --git a/src/locale/sv-SE/requestpolicy.properties b/src/locale/sv-SE/requestpolicy.properties
index 93eff06..da32ebd 100644
--- a/src/locale/sv-SE/requestpolicy.properties
+++ b/src/locale/sv-SE/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Förfrågningar från %S kan inte blockeras
redirectNotification=Den här webbsidan har bett om omdirigering till %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Tillåt
allow.accesskey=A
deny=Neka
diff --git a/src/locale/tr/requestpolicy.properties b/src/locale/tr/requestpolicy.properties
index 77980d8..3e7591a 100644
--- a/src/locale/tr/requestpolicy.properties
+++ b/src/locale/tr/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Bu istek %S engellenemez
redirectNotification=Yönlendirme istiyor %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=İzin ver
allow.accesskey=A
deny=Yasakla
diff --git a/src/locale/uk-UA/requestpolicy.properties b/src/locale/uk-UA/requestpolicy.properties
index 9cae3ae..7adfe0b 100644
--- a/src/locale/uk-UA/requestpolicy.properties
+++ b/src/locale/uk-UA/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=Requests from %S cannot be blocked
redirectNotification=Ця сторінка намагається переадресуватися на %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=Дозволити
allow.accesskey=A
deny=Заборонити
diff --git a/src/locale/zh-CN/requestpolicy.properties b/src/locale/zh-CN/requestpolicy.properties
index 8a75f80..10e6ceb 100644
--- a/src/locale/zh-CN/requestpolicy.properties
+++ b/src/locale/zh-CN/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=停止阻止所有到 %S 的请求
stopDenyingOriginToDestination=停止阻止从 %1$S 到 %2$S 的请求
unrestrictedOrigin=不能阻止从 %S 的请求
redirectNotification=此网页要求重定向到 %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=允许
allow.accesskey=A
deny=拒绝
diff --git a/src/locale/zh-TW/requestpolicy.properties b/src/locale/zh-TW/requestpolicy.properties
index 8f8123a..58df555 100644
--- a/src/locale/zh-TW/requestpolicy.properties
+++ b/src/locale/zh-TW/requestpolicy.properties
@@ -21,6 +21,7 @@ stopDenyingDestination=Stop blocking requests to %S
stopDenyingOriginToDestination=Stop blocking requests from %1$S to %2$S
unrestrictedOrigin=無法阻擋來自於 %S 的請求
redirectNotification=本網站請求重新導向至 %S
+redirectNotificationWithOrigin=The URL %1$S has asked to redirect to %2$S
allow=允許
allow.accesskey=A
deny=拒絕
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git
More information about the Pkg-mozext-commits
mailing list