Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3999 from stangri/18.06-luci-app-simple-adblock

Browse source 
[18.06] luci-app-simple-adblock: bugfix: remove escaped double-quotes from translateable resources
This commit is contained in:
Stan 2020-05-02 09:21:01 -07:00 committed by GitHub
commit bbf8e1e76d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-simple-adblock/Makefile
View file

@ -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

2
applications/luci-app-simple-adblock/luasrc/controller/simple-adblock.lua
View file

@ -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

2
applications/luci-app-simple-adblock/luasrc/model/cbi/simple-adblock.lua
View file

@ -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

3
applications/luci-app-simple-adblock/po/templates/simple-adblock.pot
View file

@ -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 <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