Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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>
This commit is contained in:
Evan Benn 2023-12-08 12:02:33 +11:00
parent ab95f8a618
commit 22101eb50a
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
modules/luci-base/htdocs/luci-static/resources/network.js
View file

@ -3823,8 +3823,8 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */
* Query the current operation mode from runtime information. * Query the current operation mode from runtime information.
* *
* @returns {string} * @returns {string}
* Returns the human readable mode name as reported by `ubus` runtime * Returns the human readable mode name as reported by iwinfo or uci mode.
* state. Possible returned values are: * Possible returned values are:
* - `Master` * - `Master`
* - `Ad-Hoc` * - `Ad-Hoc`
* - `Client` * - `Client`
@ -3843,7 +3843,7 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */
case 'ap': return 'Master'; case 'ap': return 'Master';
case 'sta': return 'Client'; case 'sta': return 'Client';
case 'adhoc': return 'Ad-Hoc'; case 'adhoc': return 'Ad-Hoc';
case 'mesh': return 'Mesh'; case 'mesh': return 'Mesh Point';
case 'monitor': return 'Monitor'; case 'monitor': return 'Monitor';
default: return mode; default: return mode;
} }
@ -3861,12 +3861,17 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */
var mode = this.getActiveMode(); var mode = this.getActiveMode();
switch (mode) { switch (mode) {
case 'Master': return _('Master'); case 'Master': return _('Master');
case 'Client': return _('Client'); case 'Ad-Hoc': return _('Ad-Hoc');
case 'Ad-Hoc': return _('Ad-Hoc'); case 'Client': return _('Client');
case 'Mash': return _('Mesh'); case 'Monitor': return _('Monitor');
case 'Monitor': return _('Monitor'); case 'Master(VLAN)': return _('Master (VLAN)');
default: return mode; 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;
} }
}, },

2
modules/luci-compat/luasrc/model/network.lua
View file

@ -1761,7 +1761,7 @@ function wifinet.active_mode(self)
if m == "ap" then m = "Master" if m == "ap" then m = "Master"
elseif m == "sta" then m = "Client" elseif m == "sta" then m = "Client"
elseif m == "adhoc" then m = "Ad-Hoc" 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" elseif m == "monitor" then m = "Monitor"
end end