luci-app-adblock: Fix display issues with translation

Fixed display issues when applying translation.

Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>

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 de24d77fbffa8d2a4e58728d8f7cbbf0b7d6767a..fc6b812d15c38db663c5886e689ea13e5185c839 100644 (file)
--- 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 52db9a6941fcc2ae32ebba6489370017f1974898..955969e1fc6a6006a9f415b019fec5bc1f493dcf 100644 (file)
--- 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 4a5585fd2c536c29d7960abdb2e1ef76d46e401e..ce842a88e8f1cbc2582cd329e71f09cc59bc0653 100644 (file)
--- 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 841a16b4924268f3f8cff85a05feaaaec34e9eff..be606301ec92ccad4b1f7c889c89235574a4347c 100644 (file)
--- 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)" />