From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Mon, 27 Mar 2017 11:25:49 +0000 (+0300)
Subject: Merge pull request #1083 from dibdot/luci-app-adblock
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=0ca4e3b8837dc176c377e2966a4421fbe5dbf747;hp=f2264da43cd521bd64e687c91bc7b94c3e28e7b3

Merge pull request #1083 from dibdot/luci-app-adblock

luci-app-adblock: small fixes in overview tab
---

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 de24d77fb..fc6b812d1 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 52db9a694..955969e1f 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 4a5585fd2..ce842a88e 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 841a16b49..be606301e 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)" />