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

Merge pull request #3991 from stangri/master-luci-app-https-dns-proxy

Browse source 
luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable resources
This commit is contained in:
Hannu Nyman 2020-05-02 18:55:44 +03:00 committed by GitHub
commit fee9cc828f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-app-https-dns-proxy/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=DNS Over HTTPS Proxy Web UI
LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=5 PKG_RELEASE:=6
include ../../luci.mk include ../../luci.mk

2
applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
View file

@ -110,7 +110,7 @@ end
create_helper_text() create_helper_text()
s3 = m:section(TypedSection, "https-dns-proxy", translate("Instances"), s3 = m:section(TypedSection, "https-dns-proxy", translate("Instances"),
translatef("When you add/remove any instances below, they will be used to override the 'DNS forwardings' section of <a href=\"%s\">DHCP and DNS</a>.", dispatcher.build_url("admin/network/dhcp")) .. helperText) translatef("When you add/remove any instances below, they will be used to override the 'DNS forwardings' section of %sDHCP and DNS%s.", "<a href=\"" .. dispatcher.build_url("admin/network/dhcp") .. "\">", "</a>") .. helperText)
s3.template = "cbi/tblsection" s3.template = "cbi/tblsection"
s3.sortable = false s3.sortable = false
s3.anonymous = true s3.anonymous = true

6
applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot
View file

@ -77,10 +77,6 @@ msgstr ""
msgid "Google" msgid "Google"
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/root/usr/share/rpcd/acl.d/luci-app-https-dns-proxy.json:3
msgid "Grant UCI access for luci-app-https-dns-proxy"
msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:112 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:112
msgid "Instances" msgid "Instances"
msgstr "" msgstr ""
@ -168,7 +164,7 @@ msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:113 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:113
msgid "" msgid ""
"When you add/remove any instances below, they will be used to override the " "When you add/remove any instances below, they will be used to override the "
"'DNS forwardings' section of <a href=\"%s\">DHCP and DNS</a>." "'DNS forwardings' section of %sDHCP and DNS%s."
msgstr "" msgstr ""
#: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:34 #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:34