Merge pull request #1727 from TDT-AG/pr/20180406-luci-app-mwan3-changes

luci-app-mwan3: fix translation and update defaults

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 8564231..162b388 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/interface.lua
@@ -138,9 +138,9 @@ m5 = Map("mwan3", translate("MWAN - Interfaces"),
        interfaceWarnings(configCheck()))
 
 mwan_interface = m5:section(TypedSection, "interface", nil,
-       translate("MWAN supports up to 250 physical and/or logical interfaces<br />" ..
+       translate("MWAN supports up to 252 physical and/or logical interfaces<br />" ..
        "MWAN requires that all interfaces have a unique metric configured in /etc/config/network<br />" ..
-       "Names must match the interface name found in /etc/config/network (see advanced tab)<br />" ..
+       "Names must match the interface name found in /etc/config/network<br />" ..
        "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" ..
        "Interfaces may not share the same name as configured members, policies or rules"))
 mwan_interface.addremove = true
@@ -170,7 +170,7 @@ track_method.rawhtml = true
 function track_method.cfgvalue(self, s)
        local tracked = self.map:get(s, "track_ip")
        if tracked then
-               return self.map:get(s, "track_method") or "&#8212;"
+               return self.map:get(s, "track_method") or "ping"
        else
                return "&#8212;"
        end
@@ -181,7 +181,7 @@ reliability.rawhtml = true
 function reliability.cfgvalue(self, s)
        local tracked = self.map:get(s, "track_ip")
        if tracked then
-               return self.map:get(s, "reliability") or "&#8212;"
+               return self.map:get(s, "reliability") or "1"
        else
                return "&#8212;"
        end
@@ -196,7 +196,7 @@ function interval.cfgvalue(self, s)
                if intervalValue then
                        return intervalValue .. "s"
                else
-                       return "&#8212;"
+                       return "5s"
                end
        else
                return "&#8212;"
@@ -208,7 +208,7 @@ down.rawhtml = true
 function down.cfgvalue(self, s)
        local tracked = self.map:get(s, "track_ip")
        if tracked then
-               return self.map:get(s, "down") or "&#8212;"
+               return self.map:get(s, "down") or "3"
        else
                return "&#8212;"
        end
@@ -219,7 +219,7 @@ up.rawhtml = true
 function up.cfgvalue(self, s)
        local tracked = self.map:get(s, "track_ip")
        if tracked then
-               return self.map:get(s, "up") or "&#8212;"
+               return self.map:get(s, "up") or "3"
        else
                return "&#8212;"
        end

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 b7a90aa..4543260 100644 (file)
--- a/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
+++ b/applications/luci-app-mwan3/luasrc/model/cbi/mwan/policy.lua
@@ -26,7 +26,7 @@ function policyError(policy_error)
        for i, k in pairs(policy_error) do
                if policy_error[i] == true then
                        warnings = warnings .. string.format("<strong>%s</strong><br />",
-                               translatef("WARNING: Policie %s has exceeding the maximum name of 15 characters", i)
+                               translatef("WARNING: Policy %s has exceeding the maximum name of 15 characters", i)
                                )
                end
        end
@@ -39,9 +39,11 @@ m5 = Map("mwan3", translate("MWAN - Policies"),
 
 mwan_policy = m5:section(TypedSection, "policy", nil,
        translate("Policies are profiles grouping one or more members controlling how MWAN distributes traffic<br />" ..
-       "Member interfaces with lower metrics are used first. Interfaces with the same metric load-balance<br />" ..
+       "Member interfaces with lower metrics are used first<br />" ..
+       "Member interfaces with the same metric will be load-balanced<br />" ..
        "Load-balanced member interfaces distribute more traffic out those with higher weights<br />" ..
-       "Names may contain characters A-Z, a-z, 0-9, _ and no spaces. Names must be 15 characters or less<br />" ..
+       "Names may contain characters A-Z, a-z, 0-9, _ and no spaces<br />" ..
+       "Names must be 15 characters or less<br />" ..
        "Policies may not share the same name as configured interfaces, members or rules"))
 mwan_policy.addremove = true
 mwan_policy.dynamic = false