diff options
| author | Jo-Philipp Wich <jo@mein.io> | 2019-01-30 08:23:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-30 08:23:53 +0100 |
| commit | 1828af98279369d9eb3ee1e113c7b544a907b3c6 (patch) | |
| tree | 700d82ccc4b53074b6b788ec1c8a09badd85610a | |
| parent | 72163ea5ff46dba8100b6d26c0ad7a752fa070c8 (diff) | |
| parent | 970fa9a4e093e8f36b258bd9b9f032064f6f88bf (diff) | |
Merge pull request #2421 from SibrenVasse/ssid_format
SSID escaping
3 files changed, 3 insertions, 3 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, |