diff --git a/canvasblocker.xpi b/canvasblocker.xpi index a743588..38f6ce5 100644 Binary files a/canvasblocker.xpi and b/canvasblocker.xpi differ diff --git a/lib/lists.js b/lib/lists.js index 895022a..296ec1b 100644 --- a/lib/lists.js +++ b/lib/lists.js @@ -51,7 +51,7 @@ function getDomainRegExpList(domainList){ var lists = { white: [], - ignore: [], + "ignore": [], black: [] }; @@ -78,7 +78,7 @@ exports.appendTo = function appendToList(type, entry){ "use strict"; prefs[type + "List"] += (prefs[type + "List"]? ",": "") + entry; - prefService.set("extensions.CanvasBlocker@kkapsner.de.whiteList", prefs[type + "List"]); + prefService.set("extensions.CanvasBlocker@kkapsner.de." + type + "List", prefs[type + "List"]); updateList(type); }; exports.update = updateList; \ No newline at end of file diff --git a/lib/notifications.js b/lib/notifications.js index ed8d9a1..6c1e297 100644 --- a/lib/notifications.js +++ b/lib/notifications.js @@ -56,7 +56,7 @@ exports.notify = function(window, callingStackMsg){ accessKey: "", callback: function(){ var domain = browser.contentWindow.prompt( - "Input domain to add to ignore list:", + _("inputIgnoreDomain"), notification.domain ); if (domain){ @@ -69,7 +69,7 @@ exports.notify = function(window, callingStackMsg){ accessKey: "", callback: function(){ var url = browser.contentWindow.prompt( - "Input URL RegExp to add to white list:", + _("inputWhitelistDomain"), "^" + notification.url.replace(/([\\\+\*\?\[\^\]\$\(\)\{\}\=\!\|\.])/g, "\\$1") + "$" ); if (url){ @@ -82,7 +82,7 @@ exports.notify = function(window, callingStackMsg){ accessKey: "", callback: function(){ var domain = browser.contentWindow.prompt( - "Input domain to add to white list:", + _("inputWhitelistURL"), notification.domain ); if (domain){ diff --git a/locale/de-DE.properties b/locale/de-DE.properties index 9d3e436..c7a13e0 100644 --- a/locale/de-DE.properties +++ b/locale/de-DE.properties @@ -53,4 +53,8 @@ whitelistDomain = erlaube Domain disableNotifications = Benachrichtigungen deaktivieren ignorelistURL = ignoriere URL -ignorelistDomain = ignoriere Domain \ No newline at end of file +ignorelistDomain = ignoriere Domain + +inputIgnoreDomain = Geben Sie die Domain ein, die ignoriert werden soll: +inputWhitelistDomain = Geben Sie die URL RegExp ein, die erlaubt werden soll: +inputWhitelistURL = Geben Sie die Domain ein, die erlaubt werden soll: \ No newline at end of file diff --git a/locale/en-US.properties b/locale/en-US.properties index e2399a7..9405e58 100644 --- a/locale/en-US.properties +++ b/locale/en-US.properties @@ -54,4 +54,8 @@ whitelistDomain = whitelist domain disableNotifications = disable notifications ignorelistURL = ignore URL -ignorelistDomain = ignore domain \ No newline at end of file +ignorelistDomain = ignore domain + +inputIgnoreDomain = Input domain to add to ignore list: +inputWhitelistDomain = Input URL RegExp to add to white list: +inputWhitelistURL = Input domain to add to white list: \ No newline at end of file