luci-base: Make uci mode strings match iwinfo mode strings

uci mesh was being displayed as 'Mesh', while iwinfo mesh was being
reported as 'Mesh Point'. Unify those. Update getActiveModeI18n to deal
with all the values iwinfo returns. Fix the incorrect 'Mash'
translation.

Signed-off-by: Evan Benn <evan.benn@morsemicro.com>

diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js
index fc58c3d75844c4d622655a5f932ba8e91361f1e0..10695cf967e8d05cb20eb2d5e5497a41042dcf2b 100644 (file)
--- a/modules/luci-base/htdocs/luci-static/resources/network.js
+++ b/modules/luci-base/htdocs/luci-static/resources/network.js
@@ -3823,8 +3823,8 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */
         * Query the current operation mode from runtime information.
         *
         * @returns {string}
-        * Returns the human readable mode name as reported by `ubus` runtime
-        * state. Possible returned values are:
+        * Returns the human readable mode name as reported by iwinfo or uci mode.
+        * Possible returned values are:
         *  - `Master`
         *  - `Ad-Hoc`
         *  - `Client`
@@ -3843,7 +3843,7 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */
                case 'ap':      return 'Master';
                case 'sta':     return 'Client';
                case 'adhoc':   return 'Ad-Hoc';
-               case 'mesh':    return 'Mesh';
+               case 'mesh':    return 'Mesh Point';
                case 'monitor': return 'Monitor';
                default:        return mode;
                }
@@ -3861,12 +3861,17 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */
                var mode = this.getActiveMode();
 
                switch (mode) {
-               case 'Master':  return _('Master');
-               case 'Client':  return _('Client');
-               case 'Ad-Hoc':  return _('Ad-Hoc');
-               case 'Mash':    return _('Mesh');
-               case 'Monitor': return _('Monitor');
-               default:        return mode;
+               case 'Master':       return _('Master');
+               case 'Ad-Hoc':       return _('Ad-Hoc');
+               case 'Client':       return _('Client');
+               case 'Monitor':      return _('Monitor');
+               case 'Master(VLAN)': return _('Master (VLAN)');
+               case 'WDS':          return _('WDS');
+               case 'Mesh Point':   return _('Mesh Point');
+               case 'P2P Client':   return _('P2P Client');
+               case 'P2P Go':       return _('P2P Go');
+               case 'Unknown':      return _('Unknown');
+               default:             return mode;
                }
        },
 

diff --git a/modules/luci-compat/luasrc/model/network.lua b/modules/luci-compat/luasrc/model/network.lua
index b9ef19b1710d0bac9500e2ddc019ce3a34ea8b61..1c25f899da43f14030687280d771d71a146b875d 100644 (file)
--- a/modules/luci-compat/luasrc/model/network.lua
+++ b/modules/luci-compat/luasrc/model/network.lua
@@ -1761,7 +1761,7 @@ function wifinet.active_mode(self)
        if     m == "ap"      then m = "Master"
        elseif m == "sta"     then m = "Client"
        elseif m == "adhoc"   then m = "Ad-Hoc"
-       elseif m == "mesh"    then m = "Mesh"
+       elseif m == "mesh"    then m = "Mesh Point"
        elseif m == "monitor" then m = "Monitor"
        end