luci-app-https-dns-proxy: improve i18n

Signed-off-by: Stan Grishin <stangri@melmac.net>

1 files changed, 18 insertions, 21 deletions

diff --git a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
index d914bf09a3..14e1b54343 100644
--- a/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
+++ b/applications/luci-app-https-dns-proxy/luasrc/model/cbi/https-dns-proxy.lua
@@ -49,24 +49,22 @@ function get_provider_name(value)
 	return translate("Unknown Provider")
 end
 
-local tmpfsStatus, tmpfsStatusCode
+local packageStatus, packageStatusCode
 local ubusStatus = util.ubus("service", "list", { name = packageName })
-local tmpfsVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'")))
+local packageVersion = tostring(util.trim(sys.exec("opkg list-installed " .. packageName .. " | awk '{print $3}'"))) or ""
 
-if not tmpfsVersion or tmpfsVersion == "" then
-	tmpfsStatusCode = -1
-	tmpfsVersion = ""
-	tmpfsStatus = packageName .. " " .. translate("is not installed or not found")
+if packageVersion == "" then
+	packageStatusCode = -1
+	packageStatus = translatef("%s is not installed or not found", packageName)
 else  
-	tmpfsVersion = " [" .. packageName .. " " .. tmpfsVersion .. "]"
 	if not ubusStatus or not ubusStatus[packageName] then
-		tmpfsStatusCode = 0
-		tmpfsStatus = translate("Stopped")
-		if not luci.sys.init.enabled(packageName) then
-			tmpfsStatus = tmpfsStatus .. " (" .. translate("disabled") .. ")"
+		packageStatusCode = 0
+		packageStatus = translate("Stopped")
+		if not sys.init.enabled(packageName) then
+			packageStatus = packageStatus .. " (" .. translate("disabled") .. ")"
 		end
 	else
-		tmpfsStatusCode, tmpfsStatus = 1, ""
+		packageStatusCode, packageStatus = 1, ""
 		for n = 1,1000 do
 			if ubusStatus and ubusStatus[packageName] and 
 				 ubusStatus[packageName]["instances"] and 
@@ -83,7 +81,7 @@ else
 				end
 				la = la or "127.0.0.1"
 				lp = lp or n + 5053
-				tmpfsStatus = tmpfsStatus .. translate("Running") .. ": " .. get_provider_name(url) .. " " .. translate("DoH") .. " " .. translate("at") .. " " .. la .. ":" .. lp .. "\n"
+				packageStatus = packageStatus .. translatef("Running: %s DoH at %s:%s", get_provider_name(url), la, lp) .. "\n"
 			else
 				break
 			end
@@ -93,27 +91,26 @@ end
 
 m = Map("https-dns-proxy", translate("DNS Over HTTPS Proxy Settings"))
 
-h = m:section(TypedSection, "_dummy", translate("Service Status") .. tmpfsVersion)
+h = m:section(TypedSection, "_dummy", translatef("Service Status [%s %s]", packageName, packageVersion))
 h.template = "cbi/nullsection"
 ss = h:option(DummyValue, "_dummy", translate("Service Status"))
-if tmpfsStatusCode == -1 then
+if packageStatusCode == -1 then
 	ss.template = packageName .. "/status"
-	ss.value = tmpfsStatus
+	ss.value = packageStatus
 else
-		if tmpfsStatusCode == 0 then
+		if packageStatusCode == 0 then
 			ss.template = packageName .. "/status"
 		else
 			ss.template = packageName .. "/status-textarea"
 		end
-	ss.value = tmpfsStatus
+	ss.value = packageStatus
 	buttons = h:option(DummyValue, "_dummy")
 	buttons.template = packageName .. "/buttons"
 end
 
 create_helper_text()
-s3 = m:section(TypedSection, "https-dns-proxy", translate("Instances"), translate("When you add/remove any instances below, they will be used to override the 'DNS forwardings' section of ")
-		.. [[ <a href="]] .. dispatcher.build_url("admin/network/dhcp") .. [[">]]
-		.. translate("DHCP and DNS") .. [[</a>]] .. "." .. helperText)
+s3 = m:section(TypedSection, "https-dns-proxy", translate("Instances"), 
+	translatef("When you add/remove any instances below, they will be used to override the 'DNS forwardings' section of <a href=\"%s\">DHCP and DNS</a>.", dispatcher.build_url("admin/network/dhcp")) .. helperText)
 s3.template = "cbi/tblsection"
 s3.sortable  = false
 s3.anonymous = true