summaryrefslogtreecommitdiffhomepage
path: root/modules/luci-mod-network
diff options
context:
space:
mode:
Diffstat (limited to 'modules/luci-mod-network')
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js2
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js2
-rw-r--r--modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js2
-rw-r--r--modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua4
4 files changed, 5 insertions, 5 deletions
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
index 145f5807a0..40624e741e 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
@@ -81,7 +81,7 @@ L.poll(5, L.url('admin/network/iface_status', networks.join(',')), null,
desc = desc ? '%s (%s)'.format(desc, ifc.desc) : ifc.desc;
L.itemlist(d, [
- _('Protocol'), '%h'.format(desc || '?'),
+ _('Protocol'), desc || '?',
_('Uptime'), ifc.is_up ? '%t'.format(ifc.uptime) : null,
_('MAC'), (!ifc.is_dynamic && !ifc.is_alias && ifc.macaddr) ? ifc.macaddr : null,
_('RX'), (!ifc.is_dynamic && !ifc.is_alias) ? '%.2mB (%d %s)'.format(ifc.rx_bytes, ifc.rx_packets, _('Pkts.')) : null,
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js
index 7e14d999bd..108a141f88 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js
@@ -39,7 +39,7 @@ requestAnimationFrame(function() {
L.itemlist(info, [
_('Mode'), iw.mode,
- _('SSID'), '%h'.format(iw.ssid || '?'),
+ _('SSID'), iw.ssid || '?',
_('BSSID'), is_assoc ? iw.bssid : null,
_('Encryption'), is_assoc ? iw.encryption || _('None') : null,
_('Channel'), is_assoc ? '%d (%.3f %s)'.format(iw.channel, iw.frequency || 0, _('GHz')) : null,
diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
index bdeb23d235..57e6bbb04c 100644
--- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
+++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
@@ -70,7 +70,7 @@ L.poll(5, L.url('admin/network/wireless_status', networks.join(',')), null,
}, [ E('img', { src: icon }), ' %d%%'.format(p) ]));
L.itemlist(info, [
- _('SSID'), '%h'.format(iw.ssid || '?'),
+ _('SSID'), iw.ssid || '?',
_('Mode'), iw.mode,
_('BSSID'), iw.is_assoc ? iw.bssid : null,
_('Encryption'), iw.is_assoc ? iw.encryption || _('None') : null,
diff --git a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
index 69cd5fe544..1ac79d8ee7 100644
--- a/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
+++ b/modules/luci-mod-network/luasrc/model/cbi/admin_network/wifi.lua
@@ -1112,8 +1112,8 @@ if hwtype == "mac80211" then
ieee80211w = s:taboption("encryption", ListValue, "ieee80211w",
translate("802.11w Management Frame Protection"),
translate("Requires the 'full' version of wpad/hostapd " ..
- "and support from the wifi driver <br />(as of Feb 2017: " ..
- "ath9k and ath10k, in LEDE also mwlwifi and mt76)"))
+ "and support from the wifi driver <br />(as of Jan 2019: " ..
+ "ath9k, ath10k, mwlwifi and mt76)"))
ieee80211w.default = ""
ieee80211w.rmempty = true
ieee80211w:value("", translate("Disabled (default)"))