luci-mod-network: fix extraneous escaping 2421/head
authorSibren Vasse <github@sibrenvasse.nl>
Fri, 11 Jan 2019 16:10:05 +0000 (17:10 +0100)
committerSibren Vasse <github@sibrenvasse.nl>
Fri, 11 Jan 2019 16:10:05 +0000 (17:10 +0100)
Signed-off-by: Sibren Vasse <github@sibrenvasse.nl>
modules/luci-mod-network/htdocs/luci-static/resources/view/network/network.js
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wifi_status.js
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js

index acca7cf8a50edc45fbfed13486bf120bb21a5350..eb35f78ff06b70ea8b73795c7c1e7e22bb753b29 100644 (file)
@@ -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,
index 7e14d999bdc79509273e905b07a841a8de095959..108a141f88a29f524d67a8859c7b05e795b0b10c 100644 (file)
@@ -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,
index bdeb23d235d041e3de325827579cc69554d56aba..57e6bbb04cd67b1f8bf59ecbe3fd0de076d1a753 100644 (file)
@@ -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,