[luci] [PATCH] applications/luci-firewall: Fix breakage of translation string.
Kentaro Matsuyama
kentaro.matsuyama at gmail.com
Thu Apr 19 17:04:29 CEST 2012
Signed-off-by: Kentaro Matsuyama <kentaro.matsuyama at gmail.com>
---
.../luasrc/model/cbi/firewall/custom.lua | 8 +++---
.../luasrc/model/cbi/firewall/forward-details.lua | 14 +++++-----
.../luasrc/model/cbi/firewall/forwards.lua | 6 ++--
.../luasrc/model/cbi/firewall/rule-details.lua | 22 ++++++++--------
.../luasrc/model/cbi/firewall/rules.lua | 12 ++++----
.../luasrc/model/cbi/firewall/zone-details.lua | 28 ++++++++++----------
6 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua
index 9b53a8a..c00e91e 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/custom.lua
@@ -16,10 +16,10 @@ local fs = require "nixio.fs"
local f = SimpleForm("firewall",
translate("Firewall - Custom Rules"),
- translate("Custom rules allow you to execute arbritary iptables commands \
- which are not otherwise covered by the firewall framework. \
- The commands are executed after each firewall restart, right after \
- the default ruleset has been loaded."))
+ translate("Custom rules allow you to execute arbritary iptables commands " ..
+ "which are not otherwise covered by the firewall framework. " ..
+ "The commands are executed after each firewall restart, right after " ..
+ "the default ruleset has been loaded."))
local o = f:field(Value, "_custom")
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
index c3618ec..72e7dcd 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/forward-details.lua
@@ -22,9 +22,9 @@ arg[1] = arg[1] or ""
m = Map("firewall",
translate("Firewall - Port Forwards"),
- translate("This page allows you to change advanced properties of the port \
- forwarding entry. In most cases there is no need to modify \
- those settings."))
+ translate("This page allows you to change advanced properties of the port " ..
+ "forwarding entry. In most cases there is no need to modify " ..
+ "those settings."))
m.redirect = dsp.build_url("admin/network/firewall/forwards")
@@ -131,8 +131,8 @@ o.template = "cbi/firewall_zonelist"
o = s:option(Value, "dest_ip", translate("Internal IP address"),
- translate("Redirect matched incoming traffic to the specified \
- internal host"))
+ translate("Redirect matched incoming traffic to the specified " ..
+ "internal host"))
o.datatype = "ip4addr"
for i, dataset in ipairs(sys.net.arptable()) do
o:value(dataset["IP address"])
@@ -141,8 +141,8 @@ end
o = s:option(Value, "dest_port",
translate("Internal port"),
- translate("Redirect matched incoming traffic to the given port on \
- the internal host"))
+ translate("Redirect matched incoming traffic to the given port on " ..
+ "the internal host"))
o.placeholder = translate("any")
o.datatype = "portrange"
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua
index 714b08e..b861066 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/forwards.lua
@@ -16,9 +16,9 @@ local ds = require "luci.dispatcher"
local ft = require "luci.tools.firewall"
m = Map("firewall", translate("Firewall - Port Forwards"),
- translate("Port forwarding allows remote computers on the Internet to \
- connect to a specific computer or service within the \
- private LAN."))
+ translate("Port forwarding allows remote computers on the Internet to " ..
+ "connect to a specific computer or service within the " ..
+ "private LAN."))
--
-- Port Forwards
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
index cd34030..b74fa2d 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/rule-details.lua
@@ -25,9 +25,9 @@ arg[1] = arg[1] or ""
m = Map("firewall",
translate("Firewall - Traffic Rules"),
- translate("This page allows you to change advanced properties of the \
- traffic rule entry, such as matched source and destination \
- hosts."))
+ translate("This page allows you to change advanced properties of the " ..
+ "traffic rule entry, such as matched source and destination " ..
+ "hosts."))
m.redirect = dsp.build_url("admin/network/firewall/rules")
@@ -83,8 +83,8 @@ elseif rule_type == "redirect" then
o = s:option(Value, "proto",
translate("Protocol"),
- translate("You may specify multiple by selecting \"-- custom --\" and \
- then entering protocols separated by space."))
+ translate("You may specify multiple by selecting \"-- custom --\" and " ..
+ "then entering protocols separated by space."))
o:value("all", "All protocols")
o:value("tcp udp", "TCP+UDP")
@@ -121,8 +121,8 @@ elseif rule_type == "redirect" then
o = s:option(Value, "src_port",
translate("Source port"),
- translate("Match incoming traffic originating from the given source \
- port or port range on the client host."))
+ translate("Match incoming traffic originating from the given source " ..
+ "port or port range on the client host."))
o.rmempty = true
o.datatype = "neg(portrange)"
o.placeholder = translate("any")
@@ -144,8 +144,8 @@ elseif rule_type == "redirect" then
o = s:option(Value, "dest_port",
translate("Destination port"),
- translate("Match forwarded traffic to the given destination port or \
- port range."))
+ translate("Match forwarded traffic to the given destination port or " ..
+ "port range."))
o.rmempty = true
o.placeholder = translate("any")
@@ -169,8 +169,8 @@ elseif rule_type == "redirect" then
o = s:option(Value, "src_dport", translate("SNAT port"),
- translate("Rewrite matched traffic to the given source port. May be \
- left empty to only rewrite the IP address."))
+ translate("Rewrite matched traffic to the given source port. May be " ..
+ "left empty to only rewrite the IP address."))
o.datatype = "portrange"
o.rmempty = true
o.placeholder = translate('Do not rewrite')
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua
index 290096b..2bdd222 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/rules.lua
@@ -17,9 +17,9 @@ local ft = require "luci.tools.firewall"
m = Map("firewall",
translate("Firewall - Traffic Rules"),
- translate("Traffic rules define policies for packets traveling between \
- different zones, for example to reject traffic between certain hosts \
- or to open WAN ports on the router."))
+ translate("Traffic rules define policies for packets traveling between " ..
+ "different zones, for example to reject traffic between certain hosts " ..
+ "or to open WAN ports on the router."))
--
-- Rules
@@ -176,9 +176,9 @@ ft.opt_enabled(s, Flag, translate("Enable")).width = "1%"
s = m:section(TypedSection, "redirect",
translate("Source NAT"),
- translate("Source NAT is a specific form of masquerading which allows \
- fine grained control over the source IP used for outgoing traffic, \
- for example to map multiple WAN addresses to internal subnets."))
+ translate("Source NAT is a specific form of masquerading which allows " ..
+ "fine grained control over the source IP used for outgoing traffic, " ..
+ "for example to map multiple WAN addresses to internal subnets."))
s.template = "cbi/tblsection"
s.addremove = true
s.anonymous = true
diff --git a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
index a3b1a6e..361f60e 100644
--- a/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
+++ b/applications/luci-firewall/luasrc/model/cbi/firewall/zone-details.lua
@@ -44,13 +44,13 @@ end
s = m:section(NamedSection, zone.sid, "zone",
translatef("Zone %q", zone:name()),
- translatef("This section defines common properties of %q. \
- The <em>input</em> and <em>output</em> options set the default \
- policies for traffic entering and leaving this zone while the \
- <em>forward</em> option describes the policy for forwarded traffic \
- between different networks within the zone. \
- <em>Covered networks</em> specifies which available networks are \
- member of this zone.", zone:name()))
+ translatef("This section defines common properties of %q. " ..
+ "The <em>input</em> and <em>output</em> options set the default " ..
+ "policies for traffic entering and leaving this zone while the " ..
+ "<em>forward</em> option describes the policy for forwarded traffic " ..
+ "between different networks within the zone. " ..
+ "<em>Covered networks</em> specifies which available networks are " ..
+ "member of this zone.", zone:name()))
s.anonymous = true
s.addremove = false
@@ -169,13 +169,13 @@ lim:depends("log", "1")
s2 = m:section(NamedSection, zone.sid, "fwd_out",
translate("Inter-Zone Forwarding"),
- translatef("The options below control the forwarding policies between \
- this zone (%s) and other zones. <em>Destination zones</em> cover \
- forwarded traffic <strong>originating from %q</strong>. \
- <em>Source zones</em> match forwarded traffic from other zones \
- <strong>targeted at %q</strong>. The forwarding rule is \
- <em>unidirectional</em>, e.g. a forward from lan to wan does \
- <em>not</em> imply a permission to forward from wan to lan as well.",
+ translatef("The options below control the forwarding policies between " ..
+ "this zone (%s) and other zones. <em>Destination zones</em> cover " ..
+ "forwarded traffic <strong>originating from %q</strong>. " ..
+ "<em>Source zones</em> match forwarded traffic from other zones " ..
+ "<strong>targeted at %q</strong>. The forwarding rule is " ..
+ "<em>unidirectional</em>, e.g. a forward from lan to wan does " ..
+ "<em>not</em> imply a permission to forward from wan to lan as well.",
zone:name(), zone:name(), zone:name()
))
--
1.7.4.1
More information about the luci
mailing list