From a561d3045c91b59dffd1aa7b496168cac9ff19e4 Mon Sep 17 00:00:00 2001 From: Dirk Brenken Date: Thu, 7 Jun 2018 21:14:06 +0200 Subject: [PATCH] luci-app-adblock: sync with adblock 3.5.3 * small fixes & cosmetics Signed-off-by: Dirk Brenken --- .../luasrc/model/cbi/adblock/overview_tab.lua | 4 ++-- .../luasrc/view/adblock/blocklist.htm | 20 ++++++++++++------- .../luasrc/view/adblock/query.htm | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua index 3f39622920..353aa6ac92 100644 --- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua +++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/overview_tab.lua @@ -171,7 +171,7 @@ bl.template = "adblock/blocklist" name = bl:option(Flag, "enabled", translate("Enabled")) name.rmempty = false -ssl = bl:option(DummyValue, "adb_src", translate("SSL req.")) +ssl = bl:option(DummyValue, "adb_src", translate("SSL req.")) function ssl.cfgvalue(self, section) local source = self.map:get(section, "adb_src") if source and source:match("https://") then @@ -183,7 +183,7 @@ end des = bl:option(DummyValue, "adb_src_desc", translate("Description")) -cat = bl:option(DynamicList, "adb_src_cat", translate("Categories")) +cat = bl:option(DynamicList, "adb_src_cat", translate("Archive Categories")) cat.datatype = "uciname" cat.optional = true diff --git a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm index 424a72f6fd..e75c89b820 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/blocklist.htm @@ -22,25 +22,31 @@ end -%> diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm index 8bbc92664d..8bbed3a53e 100644 --- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm +++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm @@ -35,7 +35,7 @@ This is free software, licensed under the Apache License, Version 2.0 else { input.style.display = 'none'; - output.innerHTML = '<%:Invalid domain specified!%>'; + output.innerHTML = '<%:Blocklist not found!%>'; } } ); -- 2.30.2