From 6c6559ad0547dc8a53331e9703a4a54281a2488a Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 7 Jun 2021 12:43:36 +0200 Subject: [PATCH] treewide: consolidate {IPv4,IPv6,MAC} {address,gateway} spellings - Turn IPv4-Address into IPv4 address - Turn IPv4-Gateway into IPv4 gateway - Turn IPv6-Address into IPv6 address - Turn IPv6-Gateway into IPv6 gateway - Turn MAC-Address into MAC address Signed-off-by: Jo-Philipp Wich (backported from commit 88b9d843882cf52a6acf4d08a878fd005120edd4) --- .../htdocs/luci-static/resources/view/network/dhcp.js | 8 ++++---- .../luci-static/resources/view/network/wireless.js | 4 ++-- .../resources/view/status/include/30_network.js | 2 +- .../resources/view/status/include/40_dhcp.js | 6 +++--- .../resources/view/status/include/60_wifi.js | 2 +- .../htdocs/luci-static/resources/view/status/routes.js | 10 +++++----- .../htdocs/luci-static/resources/protocol/3g.js | 2 +- .../htdocs/luci-static/resources/protocol/ncm.js | 2 +- .../htdocs/luci-static/resources/protocol/l2tp.js | 2 +- .../htdocs/luci-static/resources/protocol/ppp.js | 2 +- .../htdocs/luci-static/resources/protocol/pppoa.js | 2 +- .../htdocs/luci-static/resources/protocol/pppoe.js | 2 +- .../htdocs/luci-static/resources/protocol/pptp.js | 2 +- .../htdocs/luci-static/resources/protocol/pppossh.js | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index 0d1420772e..4dd90cc326 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -34,8 +34,8 @@ CBILeaseStatus = form.DummyValue.extend({ E('table', { 'id': 'lease_status_table', 'class': 'table' }, [ E('tr', { 'class': 'tr table-titles' }, [ E('th', { 'class': 'th' }, _('Hostname')), - E('th', { 'class': 'th' }, _('IPv4-Address')), - E('th', { 'class': 'th' }, _('MAC-Address')), + E('th', { 'class': 'th' }, _('IPv4 address')), + E('th', { 'class': 'th' }, _('MAC address')), E('th', { 'class': 'th' }, _('Lease time remaining')) ]), E('tr', { 'class': 'tr placeholder' }, [ @@ -53,7 +53,7 @@ CBILease6Status = form.DummyValue.extend({ E('table', { 'id': 'lease6_status_table', 'class': 'table' }, [ E('tr', { 'class': 'tr table-titles' }, [ E('th', { 'class': 'th' }, _('Host')), - E('th', { 'class': 'th' }, _('IPv6-Address')), + E('th', { 'class': 'th' }, _('IPv6 address')), E('th', { 'class': 'th' }, _('DUID')), E('th', { 'class': 'th' }, _('Lease time remaining')) ]), @@ -409,7 +409,7 @@ return view.extend({ o = s.taboption('leases', form.SectionValue, '__leases__', form.GridSection, 'host', null, _('Static leases are used to assign fixed IP addresses and symbolic hostnames to DHCP clients. They are also required for non-dynamic interface configurations where only hosts with a corresponding lease are served.') + '
' + - _('Use the Add Button to add a new lease entry. The MAC-Address identifies the host, the IPv4-Address specifies the fixed address to use, and the Hostname is assigned as a symbolic name to the requesting host. The optional Lease time can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.')); + _('Use the Add Button to add a new lease entry. The MAC address identifies the host, the IPv4 address specifies the fixed address to use, and the Hostname is assigned as a symbolic name to the requesting host. The optional Lease time can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.')); ss = o.subsection; 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 04b312b1a7..8f3f7a24ed 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 @@ -1078,7 +1078,7 @@ return view.extend({ bssid.depends('mode', 'sta'); bssid.depends('mode', 'sta-wds'); - o = ss.taboption('macfilter', form.ListValue, 'macfilter', _('MAC-Address Filter')); + o = ss.taboption('macfilter', form.ListValue, 'macfilter', _('MAC Address Filter')); o.depends('mode', 'ap'); o.depends('mode', 'ap-wds'); o.value('', _('disable')); @@ -2144,7 +2144,7 @@ return view.extend({ var table = E('table', { 'class': 'table assoclist', 'id': 'wifi_assoclist_table' }, [ E('tr', { 'class': 'tr table-titles' }, [ E('th', { 'class': 'th nowrap' }, _('Network')), - E('th', { 'class': 'th hide-xs' }, _('MAC-Address')), + E('th', { 'class': 'th hide-xs' }, _('MAC address')), E('th', { 'class': 'th' }, _('Host')), E('th', { 'class': 'th' }, _('Signal / Noise')), E('th', { 'class': 'th' }, _('RX Rate / TX Rate')) diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js index 3359ca82cc..1a0f7037f9 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js @@ -53,7 +53,7 @@ function renderbox(ifc, ipv6) { E('div', {}, renderBadge( L.resource('icons/%s.png').format(dev ? dev.getType() : 'ethernet_disabled'), null, _('Device'), dev ? dev.getI18n() : '-', - _('MAC-Address'), dev.getMAC()) + _('MAC address'), dev.getMAC()) ) ]) ]); diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js index e06b555e83..9b40e23b5e 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js @@ -84,8 +84,8 @@ return baseclass.extend({ var table = E('table', { 'class': 'table lases' }, [ E('tr', { 'class': 'tr table-titles' }, [ E('th', { 'class': 'th' }, _('Hostname')), - E('th', { 'class': 'th' }, _('IPv4-Address')), - E('th', { 'class': 'th' }, _('MAC-Address')), + E('th', { 'class': 'th' }, _('IPv4 address')), + E('th', { 'class': 'th' }, _('MAC address')), E('th', { 'class': 'th' }, _('Lease time remaining')), E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease')) ]) @@ -123,7 +123,7 @@ return baseclass.extend({ var table6 = E('table', { 'class': 'table leases6' }, [ E('tr', { 'class': 'tr table-titles' }, [ E('th', { 'class': 'th' }, _('Host')), - E('th', { 'class': 'th' }, _('IPv6-Address')), + E('th', { 'class': 'th' }, _('IPv6 address')), E('th', { 'class': 'th' }, _('DUID')), E('th', { 'class': 'th' }, _('Lease time remaining')), E('th', { 'class': 'th cbi-section-actions' }, _('Static Lease')) diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js index 18172aae94..7cb3e78e7a 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js @@ -226,7 +226,7 @@ return baseclass.extend({ var assoclist = E('table', { 'class': 'table assoclist' }, [ E('tr', { 'class': 'tr table-titles' }, [ E('th', { 'class': 'th nowrap' }, _('Network')), - E('th', { 'class': 'th hide-xs' }, _('MAC-Address')), + E('th', { 'class': 'th hide-xs' }, _('MAC address')), E('th', { 'class': 'th' }, _('Host')), E('th', { 'class': 'th' }, '%s / %s'.format(_('Signal'), _('Noise'))), E('th', { 'class': 'th' }, '%s / %s'.format(_('RX Rate'), _('TX Rate'))) diff --git a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js index ac512bb849..6051b74c3b 100644 --- a/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js +++ b/modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js @@ -152,8 +152,8 @@ return view.extend({ var neigh4tbl = E('table', { 'class': 'table' }, [ E('tr', { 'class': 'tr table-titles' }, [ - E('th', { 'class': 'th' }, [ _('IPv4-Address') ]), - E('th', { 'class': 'th' }, [ _('MAC-Address') ]), + E('th', { 'class': 'th' }, [ _('IPv4 address') ]), + E('th', { 'class': 'th' }, [ _('MAC address') ]), E('th', { 'class': 'th' }, [ _('Interface') ]) ]) ]); @@ -162,7 +162,7 @@ return view.extend({ E('tr', { 'class': 'tr table-titles' }, [ E('th', { 'class': 'th' }, [ _('Network') ]), E('th', { 'class': 'th' }, [ _('Target') ]), - E('th', { 'class': 'th' }, [ _('IPv4-Gateway') ]), + E('th', { 'class': 'th' }, [ _('IPv4 gateway') ]), E('th', { 'class': 'th' }, [ _('Metric') ]), E('th', { 'class': 'th' }, [ _('Table') ]), E('th', { 'class': 'th' }, [ _('Protocol') ]), @@ -171,8 +171,8 @@ return view.extend({ var neigh6tbl = E('table', { 'class': 'table' }, [ E('tr', { 'class': 'tr table-titles' }, [ - E('th', { 'class': 'th' }, [ _('IPv6-Address') ]), - E('th', { 'class': 'th' }, [ _('MAC-Address') ]), + E('th', { 'class': 'th' }, [ _('IPv6 address') ]), + E('th', { 'class': 'th' }, [ _('MAC address') ]), E('th', { 'class': 'th' }, [ _('Interface') ]) ]) ]); diff --git a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js index 620b4032df..ee4927a027 100644 --- a/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js +++ b/protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js @@ -103,7 +103,7 @@ return network.registerProtocol('3g', { o.placeholder = '*99***1#'; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js index 13dee21b15..0daa7c16c1 100644 --- a/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js +++ b/protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js @@ -95,7 +95,7 @@ return network.registerProtocol('ncm', { o.placeholder = '*99***1#'; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js index 4cf4d82701..59eb0b8be3 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js @@ -46,7 +46,7 @@ return network.registerProtocol('l2tp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js index 49ac8c4f89..d97d4bc29b 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js @@ -91,7 +91,7 @@ return network.registerProtocol('ppp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js index ef2b18d62c..79562994cf 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js @@ -77,7 +77,7 @@ return network.registerProtocol('pppoa', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js index 0279830899..057e17fe81 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js @@ -51,7 +51,7 @@ return network.registerProtocol('pppoe', { o.placeholder = _('auto'); if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js index 9ae683a296..a8d344fbe5 100644 --- a/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js +++ b/protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js @@ -64,7 +64,7 @@ return network.registerProtocol('pptp', { o.password = true; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.ListValue, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.value('auto', _('Automatic')); o.value('0', _('Disabled')); diff --git a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js index 54035eb23e..52cf481a5e 100644 --- a/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js +++ b/protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js @@ -90,7 +90,7 @@ return network.registerProtocol('pppossh', { o.datatype = 'ipaddr("nomask")'; if (L.hasSystemFeature('ipv6')) { - o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('Obtain IPv6-Address'), _('Enable IPv6 negotiation on the PPP link')); + o = s.taboption('advanced', form.Flag, 'ppp_ipv6', _('Obtain IPv6 address'), _('Enable IPv6 negotiation on the PPP link')); o.ucioption = 'ipv6'; o.default = o.disabled; } -- 2.30.2