From 0c35ed08e5bd5d73a3f960ac9b31977d1a0e6737 Mon Sep 17 00:00:00 2001 From: Stan Grishin Date: Sat, 2 May 2020 16:01:06 +0000 Subject: [PATCH] luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources Signed-off-by: Stan Grishin --- applications/luci-app-simple-adblock/Makefile | 2 +- .../luasrc/controller/simple-adblock.lua | 2 +- .../luasrc/model/cbi/simple-adblock.lua | 2 +- .../luci-app-simple-adblock/po/templates/simple-adblock.pot | 3 +-- 4 files changed, 4 insertions(+), 5 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/controller/simple-adblock.lua b/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua index 22c75e4c81..1dbfd1d40c 100644 --- a/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua +++ b/applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua @@ -1,7 +1,7 @@ module("luci.controller.simple-adblock", package.seeall) function index() if nixio.fs.access("/etc/config/simple-adblock") then - entry({"admin", "services", "simple-adblock"}, cbi("simple-adblock"), _("Simple AdBlock")) + entry({"admin", "services", "simple-adblock"}, cbi("simple-adblock"), _("Simple AdBlock")).acl_depends = { "luci-app-simple-adblock" } entry({"admin", "services", "simple-adblock", "action"}, call("simple_adblock_action"), nil).leaf = true end end 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 System LED Configuration.", dispatcher.build_url("admin", "system", "leds"))) + translatef("Pick the LED not already used in %sSystem LED Configuration%s.", "", "")) 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 a51f0a2f09..07fbc79d61 100644 --- a/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot +++ b/applications/luci-app-simple-adblock/po/templates/simple-adblock.pot @@ -223,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 System LED Configuration." +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 -- 2.30.2