Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

treewide: consolidate {IPv4,IPv6,MAC} {address,gateway} spellings

Browse source 
- 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 <jo@mein.io>
(backported from commit 88b9d84388)
This commit is contained in:
Jo-Philipp Wich 2021-06-07 12:43:36 +02:00
parent 003f367e8d
commit 6c6559ad05
14 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js
View file

@ -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.') + '<br />' +
_('Use the <em>Add</em> Button to add a new lease entry. The <em>MAC-Address</em> identifies the host, the <em>IPv4-Address</em> specifies the fixed address to use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. The optional <em>Lease time</em> can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.'));
_('Use the <em>Add</em> Button to add a new lease entry. The <em>MAC address</em> identifies the host, the <em>IPv4 address</em> specifies the fixed address to use, and the <em>Hostname</em> is assigned as a symbolic name to the requesting host. The optional <em>Lease time</em> can be used to set non-standard host-specific lease time, e.g. 12h, 3d or infinite.'));
ss = o.subsection;

4
modules/luci-mod-network/htdocs/luci-static/resources/view/network/wireless.js
View file

@ -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'))

2
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/30_network.js
View file

@ -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())
)
])
]);

6
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/40_dhcp.js
View file

@ -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'))

2
modules/luci-mod-status/htdocs/luci-static/resources/view/status/include/60_wifi.js
View file

@ -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')))

10
modules/luci-mod-status/htdocs/luci-static/resources/view/status/routes.js
View file

@ -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') ])
])
]);

2
protocols/luci-proto-3g/htdocs/luci-static/resources/protocol/3g.js
View file

@ -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'));

2
protocols/luci-proto-ncm/htdocs/luci-static/resources/protocol/ncm.js
View file

@ -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'));

2
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/l2tp.js
View file

@ -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'));

2
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/ppp.js
View file

@ -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'));

2
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoa.js
View file

@ -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'));

2
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pppoe.js
View file

@ -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'));

2
protocols/luci-proto-ppp/htdocs/luci-static/resources/protocol/pptp.js
View file

@ -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'));

2
protocols/luci-proto-pppossh/htdocs/luci-static/resources/protocol/pppossh.js
View file

@ -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;
}