X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=applications%2Fluci-app-mwan3%2Fluasrc%2Fmodel%2Fcbi%2Fmwan%2Finterface.lua;h=5ee5fb39f3f30e4f11b76d4453ad130ee212aac5;hb=43867a89689e8928f63b59066be827248a6ce0f7;hp=a8e68a01be84b059112792db9345e0f77906ede2;hpb=180f2d670a933b6d570099833e75a99423fea266;p=project%2Fluci.git
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 a8e68a01b..5ee5fb39f 100644
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -59,24 +59,24 @@ end
function interfaceWarnings() -- display status and warning messages at the top of the page
local warnings = ""
if interfaceNumber <= 250 then
- warnings = "There are currently " .. interfaceNumber .. " of 250 supported interfaces configured"
+ warnings = "" .. translatef("There are currently %d of 250 supported interfaces configured", interfaceNumber) .. ""
else
- warnings = "WARNING: " .. interfaceNumber .. " interfaces are configured exceeding the maximum of 250!"
+ warnings = "" .. translatef("WARNING: %d interfaces are configured exceeding the maximum of 250!", interfaceNumber) .. ""
end
if errorReliabilityList ~= " " then
- warnings = warnings .. "
WARNING: some interfaces have a higher reliability requirement than there are tracking IP addresses!"
+ warnings = warnings .. "
" .. translate("WARNING: Some interfaces have a higher reliability requirement than there are tracking IP addresses!") .. ""
end
if errorRouteList ~= " " then
- warnings = warnings .. "
WARNING: some interfaces have no default route in the main routing table!"
+ warnings = warnings .. "
" .. translate("WARNING: Some interfaces have no default route in the main routing table!") .. ""
end
if errorNetConfigList ~= " " then
- warnings = warnings .. "
WARNING: some interfaces are configured incorrectly or not at all in /etc/config/network!"
+ warnings = warnings .. "
" .. translate("WARNING: Some interfaces are configured incorrectly or not at all in /etc/config/network!") .. ""
end
if errorNoMetricList ~= " " then
- warnings = warnings .. "
WARNING: some interfaces have no metric configured in /etc/config/network!"
+ warnings = warnings .. "
" .. translate("WARNING: Some interfaces have no metric configured in /etc/config/network!") .. ""
end
if errorDuplicateMetricList ~= " " then
- warnings = warnings .. "
WARNING: some interfaces have duplicate metrics configured in /etc/config/network!"
+ warnings = warnings .. "
" .. translate("WARNING: Some interfaces have duplicate metrics configured in /etc/config/network!") .. ""
end
return warnings
end
@@ -99,7 +99,7 @@ interfaceCheck()
m5 = Map("mwan3", translate("MWAN Interface Configuration"),
- translate(interfaceWarnings()))
+ interfaceWarnings())
m5:append(Template("mwan/config_css"))
@@ -111,8 +111,8 @@ 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.sortable = true
+ 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")
function mwan_interface.create(self, section)
@@ -147,6 +147,16 @@ track_ip = mwan_interface:option(DummyValue, "track_ip", translate("Tracking IP"
end
end
+track_method = mwan_interface:option(DummyValue, "track_method", translate("Tracking method"))
+ track_method.rawhtml = true
+ function track_method.cfgvalue(self, s)
+ if tracked then
+ return self.map:get(s, "track_method") or "—"
+ else
+ return "—"
+ end
+ end
+
reliability = mwan_interface:option(DummyValue, "reliability", translate("Tracking reliability"))
reliability.rawhtml = true
function reliability.cfgvalue(self, s)