From: Andre Heider Date: Tue, 22 Nov 2022 19:10:07 +0000 (+0100) Subject: luci-base: use "hwmodes_text" to describe wireless radios X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d53ea72a88a2f9fb7ddee66eea562838f2d5c9f0;p=project%2Fluci.git luci-base: use "hwmodes_text" to describe wireless radios This is a preformatted string like "ac/ax/b/g/n" for presentation. Signed-off-by: Andre Heider --- diff --git a/modules/luci-base/htdocs/luci-static/resources/network.js b/modules/luci-base/htdocs/luci-static/resources/network.js index e0013c8ec0..2568017c26 100644 --- a/modules/luci-base/htdocs/luci-static/resources/network.js +++ b/modules/luci-base/htdocs/luci-static/resources/network.js @@ -3396,13 +3396,14 @@ WifiDevice = baseclass.extend(/** @lends LuCI.network.WifiDevice.prototype */ { getI18n: function() { var hw = this.ubus('dev', 'iwinfo', 'hardware'), type = L.isObject(hw) ? hw.name : null; + var modes = this.ubus('dev', 'iwinfo', 'hwmodes_text'); if (this.ubus('dev', 'iwinfo', 'type') == 'wl') type = 'Broadcom'; - return '%s 802.11%s Wireless Controller (%s)'.format( + return '%s %s Wireless Controller (%s)'.format( type || 'Generic', - this.getHWModes().sort(L.naturalCompare).join(''), + modes ? '802.11' + modes : 'unknown', this.getName()); },