summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-adblock/luasrc
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2017-03-27 13:33:45 +0300
committerGitHub <noreply@github.com>2017-03-27 13:33:45 +0300
commit98f009913c623e9a6f71e68419050732cb226ba7 (patch)
tree55b48006ebc7b1093098448f5201417006da4981 /applications/luci-app-adblock/luasrc
parent65a089d6798e60a807fa250c5789dee52bb735f5 (diff)
parentd3fecae59ebbf4e95e7ca824f0600f801164d03c (diff)
Merge pull request #1084 from musashino205/adblk-fix-translation
luci-app-adblock: Fix display issues with translation
Diffstat (limited to 'applications/luci-app-adblock/luasrc')
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua2
-rw-r--r--applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua2
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/logread.htm2
-rw-r--r--applications/luci-app-adblock/luasrc/view/adblock/query.htm2
4 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
index de24d77fbf..fc6b812d15 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/blacklist_tab.lua
@@ -16,7 +16,7 @@ m = SimpleForm("input", nil)
m:append(Template("adblock/config_css"))
s = m:section(SimpleSection, nil,
- translate("This form allows you to modify the content of the adblock blacklist (" .. adbinput .. ").<br />")
+ translatef("This form allows you to modify the content of the adblock blacklist (%s).<br />", adbinput)
.. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards & regex are not."))
f = s:option(TextValue, "data")
diff --git a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
index 52db9a6941..955969e1fc 100644
--- a/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
+++ b/applications/luci-app-adblock/luasrc/model/cbi/adblock/whitelist_tab.lua
@@ -16,7 +16,7 @@ m = SimpleForm("input", nil)
m:append(Template("adblock/config_css"))
s = m:section(SimpleSection, nil,
- translate("This form allows you to modify the content of the adblock whitelist (" .. adbinput .. ").<br />")
+ translatef("This form allows you to modify the content of the adblock whitelist (%s).<br />", adbinput)
.. translate("Please add only one domain per line. Comments introduced with '#' are allowed - ip addresses, wildcards & regex are not."))
f = s:option(TextValue, "data")
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm
index 4a5585fd2c..ce842a88e8 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/logread.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/logread.htm
@@ -8,7 +8,7 @@ This is free software, licensed under the Apache License, Version 2.0
<div class="cbi-map">
<fieldset class="cbi-section">
- <div class="cbi-section-descr">This form shows the syslog output, pre-filtered for adblock related messages only.</div>
+ <div class="cbi-section-descr"><%:This form shows the syslog output, pre-filtered for adblock related messages only.%></div>
<textarea id="logread_id" style="width: 100%; height: 450px; border: 1px solid #cccccc; padding: 5px; font-size: 12px; font-family: monospace; resize: none;" readonly="readonly" wrap="off" rows="<%=content:cmatch("\n")+2%>"><%=content:pcdata()%></textarea>
</fieldset>
</div>
diff --git a/applications/luci-app-adblock/luasrc/view/adblock/query.htm b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
index 841a16b492..be606301ec 100644
--- a/applications/luci-app-adblock/luasrc/view/adblock/query.htm
+++ b/applications/luci-app-adblock/luasrc/view/adblock/query.htm
@@ -48,7 +48,7 @@ This is free software, licensed under the Apache License, Version 2.0
<form method="post" action="<%=REQUEST_URI%>">
<div class="cbi-map">
<fieldset class="cbi-section">
- <div class="cbi-section-descr">This form allows you to query active block lists for certain domains, e.g. for whitelisting.</div>
+ <div class="cbi-section-descr"><%:This form allows you to query active block lists for certain domains, e.g. for whitelisting.%></div>
<div style="width:33%; float:left;">
<input style="margin: 5px 0" type="text" value="www.lede-project.org" name="input" />
<input type="button" value="<%:Query%>" class="cbi-button cbi-button-apply" onclick="update_status(this.form.input)" />