From 22101eb50af976f5f026b76079d37cb756c7425a Mon Sep 17 00:00:00 2001 From: Evan Benn Date: Fri, 8 Dec 2023 12:02:33 +1100 Subject: [PATCH 1/3] 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 --- .../htdocs/luci-static/resources/network.js | 23 +++++++++++-------- modules/luci-compat/luasrc/model/network.lua | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index fc58c3d758..10695cf967 100644 --- 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 b9ef19b171..1c25f899da 100644 --- 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 From 23931c3778337927945c7c9648ad9d5d9805ce98 Mon Sep 17 00:00:00 2001 From: Evan Benn Date: Fri, 8 Dec 2023 13:14:29 +1100 Subject: [PATCH 2/3] luci-base: Replace mode: Master with Access Point Access Point is the string used on the network wireless setup dialogue. Use Access Point to report the mode on the network wireless and status screens. Signed-off-by: Evan Benn --- modules/luci-base/htdocs/luci-static/resources/network.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index 10695cf967..887c3d57f0 100644 --- a/modules/luci-base/htdocs/luci-static/resources/network.js +++ b/modules/luci-base/htdocs/luci-static/resources/network.js @@ -3861,7 +3861,7 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */ var mode = this.getActiveMode(); switch (mode) { - case 'Master': return _('Master'); + case 'Master': return _('Access Point'); case 'Ad-Hoc': return _('Ad-Hoc'); case 'Client': return _('Client'); case 'Monitor': return _('Monitor'); From e02df6505f63dc1670a3482750b8d6acb34aaceb Mon Sep 17 00:00:00 2001 From: Evan Benn Date: Fri, 8 Dec 2023 13:18:41 +1100 Subject: [PATCH 3/3] luci-base: Use getMode in getActiveMode Signed-off-by: Evan Benn --- modules/luci-base/htdocs/luci-static/resources/network.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index 887c3d57f0..5c48d3c900 100644 --- a/modules/luci-base/htdocs/luci-static/resources/network.js +++ b/modules/luci-base/htdocs/luci-static/resources/network.js @@ -3837,7 +3837,7 @@ WifiNetwork = baseclass.extend(/** @lends LuCI.network.WifiNetwork.prototype */ * - `Unknown` */ getActiveMode: function() { - var mode = this.ubus('net', 'iwinfo', 'mode') || this.ubus('net', 'config', 'mode') || this.get('mode') || 'ap'; + var mode = this.ubus('net', 'iwinfo', 'mode') || this.getMode(); switch (mode) { case 'ap': return 'Master';