From: Sibren Vasse Date: Fri, 11 Jan 2019 16:10:05 +0000 (+0100) Subject: luci-mod-network: fix extraneous escaping X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=refs%2Fpull%2F2421%2Fhead;p=oweals%2Fluci.git luci-mod-network: fix extraneous escaping Signed-off-by: Sibren Vasse --- 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 acca7cf8a..eb35f78ff 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 7e14d999b..108a141f8 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 bdeb23d23..57e6bbb04 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,