diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2020-05-02 18:55:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-02 18:55:44 +0300 |
| commit | fee9cc828f9ffdb8eb69d404bd9a84e81fb67888 (patch) | |
| tree | 96ea3899d128d70d842162c8ea5149a6e5f297be /applications | |
| parent | 59953d3a7db07729aceac77fd91b012c579439a1 (diff) | |
| parent | 06deeb3c654959c50f5f252750d96b79bf0fb29c (diff) | |
Merge pull request #3991 from stangri/master-luci-app-https-dns-proxy
luci-app-https-dns-proxy: bugfix: remove escaped double-quotes from translateable resources
Diffstat (limited to 'applications')
3 files changed, 3 insertions, 7 deletions
diff --git a/applications/luci-app-https-dns-proxy/Makefile b/applications/luci-app-https-dns-proxy/Makefile index 2dc56367cf..6a1ac29841 100644 --- a/applications/luci-app-https-dns-proxy/Makefile +++ b/applications/luci-app-https-dns-proxy/Makefile @@ -10,7 +10,7 @@ LUCI_TITLE:=DNS Over HTTPS Proxy Web UI LUCI_DESCRIPTION:=Provides Web UI for DNS Over HTTPS Proxy LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +https-dns-proxy LUCI_PKGARCH:=all -PKG_RELEASE:=5 +PKG_RELEASE:=6 include ../../luci.mk diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua index 4b3314e91a..c57de38724 100644 --- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua +++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua @@ -110,7 +110,7 @@ end create_helper_text() 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.sortable = false s3.anonymous = true diff --git a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot index a72353bf51..f4dde25764 100644 --- a/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot +++ b/applications/luci-app-https-dns-proxy/po/templates/https-dns-proxy.pot @@ -77,10 +77,6 @@ msgstr "" msgid "Google" 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 msgid "Instances" msgstr "" @@ -168,7 +164,7 @@ msgstr "" #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:113 msgid "" "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 "" #: applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua:34 |