diff options
| author | Stan <stangri@melmac.net> | 2020-05-02 09:20:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 09:20:41 -0700 |
| commit | 6bb97fe8fbd2355d2a5cf3043f907b523d73f3f3 (patch) | |
| tree | 30b44694c7d2207f3d6a659b3944bdfdd909d195 /applications/luci-app-simple-adblock | |
| parent | fd32c8c443c62e6e98f869892e99dbaf7c56d125 (diff) | |
| parent | 8e8fc673650318112526e463c9bd9b8d47623782 (diff) | |
Merge pull request #3997 from stangri/master-luci-app-simple-adblock
luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources
Diffstat (limited to 'applications/luci-app-simple-adblock')
3 files changed, 3 insertions, 9 deletions
diff --git a/applications/luci-app-simple-adblock/Makefile b/applications/luci-app-simple-adblock/Makefile index 62ec4b71d1..93719a4195 100644 --- a/applications/luci-app-simple-adblock/Makefile +++ b/applications/luci-app-simple-adblock/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=Simple Adblock Web UI LUCI_DESCRIPTION:=Provides Web UI for simple-adblock service. LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +simple-adblock LUCI_PKGARCH:=all -PKG_RELEASE:=45 +PKG_RELEASE:=46 include ../../luci.mk diff --git a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua index 1095d5edc2..a7c7edcd1c 100644 --- a/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua +++ b/applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua @@ -191,7 +191,7 @@ if fs.access(sysfs_path) then end if #leds ~= 0 then o4 = s:taboption("basic", Value, "led", translate("LED to indicate status"), - translatef("Pick the LED not already used in <a href=\"%s\">System LED Configuration</a>.", dispatcher.build_url("admin", "system", "leds"))) + translatef("Pick the LED not already used in %sSystem LED Configuration%s.", "<a href=\"" .. dispatcher.build_url("admin", "system", "leds") .. "\">", "</a>")) o4.rmempty = false o4:value("", translate("none")) for k, v in ipairs(leds) do diff --git a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot index c9d2009534..07fbc79d61 100644 --- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot +++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot @@ -167,10 +167,6 @@ msgstr "" msgid "Forces Router DNS use on local devices, also known as DNS Hijacking." msgstr "" -#: applications/luci-app-simple-adblock/root/usr/share/rpcd/acl.d/luci-app-simple-adblock.json:3 -msgid "Grant UCI access for luci-app-simple-adblock" -msgstr "" - #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:232 msgid "IPv6 Support" msgstr "" @@ -227,8 +223,7 @@ msgid "" msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:194 -msgid "" -"Pick the LED not already used in <a href=\"%s\">System LED Configuration</a>." +msgid "Pick the LED not already used in %sSystem LED Configuration%s." msgstr "" #: applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua:207 @@ -259,7 +254,6 @@ msgid "Service Status [%s]" msgstr "" #: applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua:4 -#: applications/luci-app-simple-adblock/root/usr/share/luci/menu.d/luci-app-simple-adblock.json:3 msgid "Simple AdBlock" msgstr "" |