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

Merge pull request #3996 from stangri/19.07-luci-app-vpn-policy-routing

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

2
applications/luci-app-vpn-policy-routing/Makefile
View file

@ -10,7 +10,7 @@ LUCI_TITLE:=VPN Policy-Based Routing Service Web UI
LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service. LUCI_DESCRIPTION:=Provides Web UI for vpn-policy-routing service.
LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing LUCI_DEPENDS:=+luci-compat +luci-mod-admin-full +vpn-policy-routing
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_RELEASE:=71 PKG_RELEASE:=72
include ../../luci.mk include ../../luci.mk

5
applications/luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua
View file

@ -1,7 +1,10 @@
module("luci.controller.vpn-policy-routing", package.seeall) module("luci.controller.vpn-policy-routing", package.seeall)
function index() function index()
if nixio.fs.access("/etc/config/vpn-policy-routing") then if nixio.fs.access("/etc/config/vpn-policy-routing") then
entry({"admin", "vpn"}, firstchild(), _("VPN"), 60).dependent=false local e = entry({"admin", "vpn"}, firstchild(), _("VPN"), 60)
e.dependent = false
e.acl_depends = { "luci-app-vpn-policy-routing" }
entry({"admin", "vpn", "vpn-policy-routing"}, cbi("vpn-policy-routing"), _("VPN Policy Routing")) entry({"admin", "vpn", "vpn-policy-routing"}, cbi("vpn-policy-routing"), _("VPN Policy Routing"))
entry({"admin", "vpn", "vpn-policy-routing", "action"}, call("vpn_policy_routing_action"), nil).leaf = true entry({"admin", "vpn", "vpn-policy-routing", "action"}, call("vpn_policy_routing_action"), nil).leaf = true
end end

12
applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua
View file

@ -156,13 +156,13 @@ verb:value("2", translate("Verbose output"))
verb.default = 2 verb.default = 2
se = config:taboption("basic", ListValue, "strict_enforcement", translate("Strict enforcement"), se = config:taboption("basic", ListValue, "strict_enforcement", translate("Strict enforcement"),
translatef("See the <a href=\"%s\" target=\"_blank\">README</a> for details.", readmeURL .. "#strict-enforcement")) translatef("See the %sREADME%s for details.", "<a href=\"" .. readmeURL .. "#strict-enforcement" .. "\" target=\"_blank\">", "</a>"))
se:value("0", translate("Do not enforce policies when their gateway is down")) se:value("0", translate("Do not enforce policies when their gateway is down"))
se:value("1", translate("Strictly enforce policies when their gateway is down")) se:value("1", translate("Strictly enforce policies when their gateway is down"))
se.default = 1 se.default = 1
dest_ipset = config:taboption("basic", ListValue, "dest_ipset", translate("The ipset option for remote policies"), dest_ipset = config:taboption("basic", ListValue, "dest_ipset", translate("The ipset option for remote policies"),
translatef("Please check the <a href=\"%s\" target=\"_blank\">README</a> before changing this option.", readmeURL .. "#service-configuration-settings")) translatef("Please check the %sREADME%s before changing this option.", "<a href=\"" .. readmeURL .. "#service-configuration-settings" .. "\" target=\"_blank\">", "</a>"))
dest_ipset:value("", translate("Disabled")) dest_ipset:value("", translate("Disabled"))
dest_ipset:value("ipset", translate("Use ipset command")) dest_ipset:value("ipset", translate("Use ipset command"))
dest_ipset:value("dnsmasq.ipset", translate("Use DNSMASQ ipset")) dest_ipset:value("dnsmasq.ipset", translate("Use DNSMASQ ipset"))
@ -170,7 +170,7 @@ dest_ipset.default = ""
dest_ipset.rmempty = true dest_ipset.rmempty = true
src_ipset = config:taboption("basic", ListValue, "src_ipset", translate("The ipset option for local policies"), src_ipset = config:taboption("basic", ListValue, "src_ipset", translate("The ipset option for local policies"),
translatef("Please check the <a href=\"%s\" target=\"_blank\">README</a> before changing this option.", readmeURL .. "#service-configuration-settings")) translatef("Please check the %sREADME%s before changing this option.", "<a href=\"" .. readmeURL .. "#service-configuration-settings" .. "\" target=\"_blank\">", "</a>"))
src_ipset:value("0", translate("Disabled")) src_ipset:value("0", translate("Disabled"))
src_ipset:value("1", translate("Use ipset command")) src_ipset:value("1", translate("Use ipset command"))
@ -180,7 +180,7 @@ ipv6:value("1", translate("Enabled"))
-- Advanced Options -- Advanced Options
config:tab("advanced", translate("Advanced Configuration"), config:tab("advanced", translate("Advanced Configuration"),
translatef("%sWARNING:%s Please make sure to check the <a href=\"%s\" target=\"_blank\">README</a> before changing anything in this section! Change any of the settings below with extreme caution!%s" , "<br/>&nbsp;&nbsp;&nbsp;&nbsp;<b>", "</b>", readmeURL .. "#service-configuration-settings", "<br/><br/>")) translatef("%sWARNING:%s Please make sure to check the %sREADME%s before changing anything in this section! Change any of the settings below with extreme caution!%s" , "<br/>&nbsp;&nbsp;&nbsp;&nbsp;<b>", "</b>", "<a href=\"" .. readmeURL .. "#service-configuration-settings" .. "\" target=\"_blank\">", "</a>", "<br/><br/>"))
supportedIface = config:taboption("advanced", DynamicList, "supported_interface", translate("Supported Interfaces"), translate("Allows to specify the list of interface names (in lower case) to be explicitly supported by the service. Can be useful if your OpenVPN tunnels have dev option other than tun* or tap*.")) supportedIface = config:taboption("advanced", DynamicList, "supported_interface", translate("Supported Interfaces"), translate("Allows to specify the list of interface names (in lower case) to be explicitly supported by the service. Can be useful if your OpenVPN tunnels have dev option other than tun* or tap*."))
supportedIface.optional = false supportedIface.optional = false
@ -344,7 +344,7 @@ uci:foreach("network", "interface", function(s)
end) end)
dscp = m:section(NamedSection, "config", "vpn-policy-routing", translate("DSCP Tagging"), dscp = m:section(NamedSection, "config", "vpn-policy-routing", translate("DSCP Tagging"),
translatef("Set DSCP tags (in range between 1 and 63) for specific interfaces. See the <a href=\"%s\" target=\"_blank\">README</a> for details.", readmeURL .. "#dscp-tag-based-policies")) translatef("Set DSCP tags (in range between 1 and 63) for specific interfaces. See the %sREADME%s for details.", "<a href=\"" .. readmeURL .. "#dscp-tag-based-policies" .. "\" target=\"_blank\">", "</a>"))
uci:foreach("network", "interface", function(s) uci:foreach("network", "interface", function(s)
local name=s['.name'] local name=s['.name']
if is_supported_interface(s) then if is_supported_interface(s) then
@ -356,7 +356,7 @@ end)
-- Includes -- Includes
inc = m:section(TypedSection, "include", translate("Custom User File Includes"), inc = m:section(TypedSection, "include", translate("Custom User File Includes"),
translatef("Run the following user files after setting up but before restarting DNSMASQ. See the <a href=\"%s\" target=\"_blank\">README</a> for details.", readmeURL .. "#custom-user-files")) translatef("Run the following user files after setting up but before restarting DNSMASQ. See the %sREADME%s for details.", "<a href=\"" .. readmeURL .. "#custom-user-files" .. "\" target=\"_blank\">", "</a>"))
inc.template = "cbi/tblsection" inc.template = "cbi/tblsection"
inc.sortable = true inc.sortable = true
inc.anonymous = true inc.anonymous = true

4
applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm
View file

@ -11,8 +11,8 @@ This is free software, licensed under the Apache License, Version 2.0
</textarea> </textarea>
<div> <div>
<%- local readmeURL = "https://github.com/openwrt/packages/tree/master/net/vpn-policy-routing/files/README.md#a-word-about-default-routing" -%> <%- local readmeURL = "https://github.com/openwrt/packages/tree/master/net/vpn-policy-routing/files/README.md" -%>
<%=translatef("Checkmark represents the default gateway. See the <a href=\"%s\" target=\"_blank\">README</a> for details.", readmeURL)%> <%=translatef("Checkmark represents the default gateway. See the %sREADME%s for details.", "<a href=\"" .. readmeURL .. "#a-word-about-default-routing" .. "\" target=\"_blank\">", "</a>")%>
</div> </div>
<%+cbi/valuefooter%> <%+cbi/valuefooter%>

21
applications/luci-app-vpn-policy-routing/po/templates/vpn-policy-routing.pot
View file

@ -15,9 +15,9 @@ msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:183 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:183
msgid "" msgid ""
"%sWARNING:%s Please make sure to check the <a href=\"%s\" target=\"_blank" "%sWARNING:%s Please make sure to check the %sREADME%s before changing "
"\">README</a> before changing anything in this section! Change any of the " "anything in this section! Change any of the settings below with extreme "
"settings below with extreme caution!%s" "caution!%s"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:200 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:200
@ -70,8 +70,7 @@ msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm:15 #: applications/luci-app-vpn-policy-routing/luasrc/view/vpn-policy-routing/status-gateways.htm:15
msgid "" msgid ""
"Checkmark represents the default gateway. See the <a href=\"%s\" target=" "Checkmark represents the default gateway. See the %sREADME%s for details."
"\"_blank\">README</a> for details."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:275 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:275
@ -216,9 +215,7 @@ msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:165 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:165
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:173 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:173
msgid "" msgid "Please check the %sREADME%s before changing this option."
"Please check the <a href=\"%s\" target=\"_blank\">README</a> before changing "
"this option."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:258
@ -244,7 +241,7 @@ msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:359 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:359
msgid "" msgid ""
"Run the following user files after setting up but before restarting DNSMASQ. " "Run the following user files after setting up but before restarting DNSMASQ. "
"See the <a href=\"%s\" target=\"_blank\">README</a> for details." "See the %sREADME%s for details."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:42 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:42
@ -252,7 +249,7 @@ msgid "Running"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:159 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:159
msgid "See the <a href=\"%s\" target=\"_blank\">README</a> for details." msgid "See the %sREADME%s for details."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:195 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:195
@ -287,7 +284,7 @@ msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:347 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:347
msgid "" msgid ""
"Set DSCP tags (in range between 1 and 63) for specific interfaces. See the " "Set DSCP tags (in range between 1 and 63) for specific interfaces. See the "
"<a href=\"%s\" target=\"_blank\">README</a> for details." "%sREADME%s for details."
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:247 #: applications/luci-app-vpn-policy-routing/luasrc/model/cbi/vpn-policy-routing.lua:247
@ -407,7 +404,7 @@ msgstr ""
msgid "VPN" msgid "VPN"
msgstr "" msgstr ""
#: applications/luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua:5 #: applications/luci-app-vpn-policy-routing/luasrc/controller/vpn-policy-routing.lua:8
msgid "VPN Policy Routing" msgid "VPN Policy Routing"
msgstr "" msgstr ""