luci-app-mwan3: Add more translate strings

Signed-off-by: Hsing-wang Liao <kuoruan@gmail.com>

9 files changed, 32 insertions, 33 deletions

diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
index 604a4fa84..aeabc6361 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -111,7 +111,7 @@ mwan_interface = m5:section(TypedSection, "interface", translate("Interfaces"),
 	"Interfaces may not share the same name as configured members, policies or rules"))
 	mwan_interface.addremove = true
 	mwan_interface.dynamic = false
-	mwan_interface.sectionhead = "Interface"
+	mwan_interface.sectionhead = translate("Interface")
 	mwan_interface.sortable = false
 	mwan_interface.template = "cbi/tblsection"
 	mwan_interface.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "interface", "%s")
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
index 3bccbd942..efbe8f790 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/member.lua
@@ -13,7 +13,7 @@ mwan_member = m5:section(TypedSection, "member", translate("Members"),
 	"Members may not share the same name as configured interfaces, policies or rules"))
 	mwan_member.addremove = true
 	mwan_member.dynamic = false
-	mwan_member.sectionhead = "Member"
+	mwan_member.sectionhead = translate("Member")
 	mwan_member.sortable = true
 	mwan_member.template = "cbi/tblsection"
 	mwan_member.extedit = ds.build_url("admin", "network", "mwan", "configuration", "member", "%s")
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
index 08c3f69de..6640564d5 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
@@ -42,7 +42,7 @@ mwan_policy = m5:section(TypedSection, "policy", translate("Policies"),
 	"Policies may not share the same name as configured interfaces, members or rules"))
 	mwan_policy.addremove = true
 	mwan_policy.dynamic = false
-	mwan_policy.sectionhead = "Policy"
+	mwan_policy.sectionhead = translate("Policy")
 	mwan_policy.sortable = true
 	mwan_policy.template = "cbi/tblsection"
 	mwan_policy.extedit = ds.build_url("admin", "network", "mwan", "configuration", "policy", "%s")
@@ -65,7 +65,6 @@ use_member = mwan_policy:option(DummyValue, "use_member", translate("Members ass
 		else
 			return "—"
 		end
-		
 	end
 
 last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last resort"))
@@ -73,11 +72,11 @@ last_resort = mwan_policy:option(DummyValue, "last_resort", translate("Last reso
 	function last_resort.cfgvalue(self, s)
 		local action = self.map:get(s, "last_resort")
 		if action == "blackhole" then
-			return "blackhole (drop)"
+			return translate("blackhole (drop)")
 		elseif action == "default" then
-			return "default (use main routing table)"
+			return translate("default (use main routing table)")
 		else
-			return "unreachable (reject)"
+			return translate("unreachable (reject)")
 		end
 	end
 
diff --git a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
index 412f369eb..0f4c5950a 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/rule.lua
@@ -47,7 +47,7 @@ mwan_rule = m5:section(TypedSection, "rule", translate("Traffic Rules"),
 	mwan_rule.addremove = true
 	mwan_rule.anonymous = false
 	mwan_rule.dynamic = false
-	mwan_rule.sectionhead = "Rule"
+	mwan_rule.sectionhead = translate("Rule")
 	mwan_rule.sortable = true
 	mwan_rule.template = "cbi/tblsection"
 	mwan_rule.extedit = dsp.build_url("admin", "network", "mwan", "configuration", "rule", "%s")
@@ -93,10 +93,10 @@ sticky = mwan_rule:option(DummyValue, "sticky", translate("Sticky"))
 	function sticky.cfgvalue(self, s)
 		if self.map:get(s, "sticky") == "1" then
 			stickied = 1
-			return "Yes"
+			return translate("Yes")
 		else
 			stickied = nil
-			return "No"
+			return translate("No")
 		end
 	end
 
@@ -133,7 +133,7 @@ errors = mwan_rule:option(DummyValue, "errors", translate("Errors"))
 		if not string.find(error_protocol_list, " " .. s .. " ") then
 			return ""
 		else
-			return "<span title=\"No protocol specified\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
+			return "<span title=\"" .. translate("No protocol specified") .. "\"><img src=\"/luci-static/resources/cbi/reset.gif\" alt=\"error\"></img></span>"
 		end
 	end
 
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
index 6f350ccf4..e4a14adad 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_diagnostics.htm
@@ -33,14 +33,14 @@
 			{
 				output.innerHTML =
 					'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' +
-					"Waiting for MWAN to " + task + "..."
+					String.format("<%:Waiting for MWAN to %s...%>", task)
 				;
 			}
 			else
 			{
 				output.innerHTML =
 					'<img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="padding: 20px; vertical-align: middle;" /> ' +
-					"Waiting for diagnostic results..."
+					"<%:Waiting for diagnostic results...%>"
 				;
 			}
 
@@ -56,7 +56,7 @@
 				}
 				else
 				{
-					output.innerHTML = '<pre id="diag_output_css"><strong>No diagnostic results returned</strong></pre>';
+					output.innerHTML = '<pre id="diag_output_css"><strong><%:No diagnostic results returned%></strong></pre>';
 				}
 			}
 		);
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
index 21f516b7c..4174ef4b2 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/advanced_troubleshooting.htm
@@ -37,7 +37,7 @@
 			}
 			else
 			{
-				tshoot.innerHTML = '<strong>Error collecting troubleshooting information</strong>';
+				tshoot.innerHTML = '<strong><%:Error collecting troubleshooting information%></strong>';
 			}
 		}
 	);
@@ -46,7 +46,7 @@
 <div id="troubleshoot">
 	<fieldset class="cbi-section">
 		<legend><%:Troubleshooting Data%></legend>
-		<div id="troubleshoot_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+		<div id="troubleshoot_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
 	</fieldset>
 </div>
 
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm b/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
index 84b124502..7cef0630e 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/openwrt_overview_status.htm
@@ -13,19 +13,19 @@
 					switch (mArray.wans[i].status)
 					{
 						case 'online':
-							stat = 'Online (tracking active)';
+							stat = '<%:Online (tracking active)%>';
 							cssc = 'wanon';
 							break;
 						case 'notMonitored':
-							stat = 'Online (tracking off)';
+							stat = '<%:Online (tracking off)%>';
 							cssc = 'wanon';
 							break;
 						case 'offline':
-							stat = 'Offline';
+							stat = '<%:Offline%>';
 							cssc = 'wanoff';
 							break;
 						case 'notEnabled':
-							stat = 'Disabled';
+							stat = '<%:Disabled%>';
 							cssc = 'wanoff';
 							break;
 					}
@@ -38,7 +38,7 @@
 			}
 			else
 			{
-				status.innerHTML = '<strong>No MWAN interfaces found</strong>';
+				status.innerHTML = '<strong><%:No MWAN interfaces found%></strong>';
 			}
 		}
 	);
@@ -46,7 +46,7 @@
 
 <fieldset id="interface_field" class="cbi-section">
 	<legend><%:MWAN Interface Live Status%></legend>
-	<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+	<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
 </fieldset>
 
 <style type="text/css">
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
index bbb617b28..6a800c3f9 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_detailed.htm
@@ -17,7 +17,7 @@
 			}
 			else
 			{
-				status.innerHTML = '<strong>No detailed status information available</strong>';
+				status.innerHTML = '<strong><%:No detailed status information available%></strong>';
 			}
 		}
 	);
@@ -26,7 +26,7 @@
 <div id="mwan_detail_status">
 	<fieldset class="cbi-section">
 		<legend><%:MWAN Detailed Status%></legend>
-		<div id="mwan_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+		<div id="mwan_detail_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
 	</fieldset>
 </div>
 
diff --git a/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm b/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
index f4c8b1224..2929a6df6 100644
--- a/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
+++ b/applications/luci-app-mwan3/luasrc/view/mwan/overview_interface.htm
@@ -21,19 +21,19 @@
 					switch (mArray.wans[i].status)
 					{
 						case 'online':
-							status = 'Online (tracking active)';
+							status = '<%:Online (tracking active)%>';
 							css = 'wanon';
 							break;
 						case 'notMonitored':
-							status = 'Online (tracking off)';
+							status = '<%:Online (tracking off)%>';
 							css = 'wanon';
 							break;
 						case 'offline':
-							status = 'Offline';
+							status = '<%:Offline%>';
 							css = 'wanoff';
 							break;
 						case 'notEnabled':
-							status = 'Disabled';
+							status = '<%:Disabled%>';
 							css = 'wanoff';
 							break;
 					}
@@ -46,18 +46,18 @@
 			}
 			else
 			{
-				statusDiv.innerHTML = '<strong>No MWAN interfaces found</strong>';
+				statusDiv.innerHTML = '<strong><%:No MWAN interfaces found%></strong>';
 			}
 
 			var logs = document.getElementById('mwan_statuslog_text');
 			if (mArray.mwanlog)
 			{
-				var mwanLog = 'Last 50 MWAN systemlog entries. Newest entries sorted at the top :';
+				var mwanLog = '<%:Last 50 MWAN systemlog entries. Newest entries sorted at the top :%>';
 				logs.innerHTML = String.format('<pre>%s<br /><br />%s</pre>', mwanLog, mArray.mwanlog[0]);
 			}
 			else
 			{
-				logs.innerHTML = '<strong>No MWAN systemlog history found</strong>';
+				logs.innerHTML = '<strong><%:No MWAN systemlog history found%></strong>';
 			}
 		}
 	);
@@ -66,11 +66,11 @@
 <div id="mwan_interface_status">
 	<fieldset id="interface_field" class="cbi-section">
 		<legend><%:MWAN Interface Live Status%></legend>
-		<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+		<div id="mwan_status_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
 	</fieldset>
 	<fieldset class="cbi-section">
 		<legend><%:MWAN Interface Systemlog%></legend>
-		<div id="mwan_statuslog_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /> Collecting data...</div>
+		<div id="mwan_statuslog_text"><img src="<%=resource%>/icons/loading.gif" alt="<%:Loading%>" style="vertical-align:middle" /><%:Collecting data...%></div>
 	</fieldset>
 </div>