diff options
| -rw-r--r-- | i18n/english/luasrc/i18n/default.en.lua | 9 | ||||
| -rw-r--r-- | i18n/german/luasrc/i18n/default.de.lua | 9 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua | 13 |
3 files changed, 24 insertions, 7 deletions
diff --git a/i18n/english/luasrc/i18n/default.en.lua b/i18n/english/luasrc/i18n/default.en.lua index a64d757ee1..7b3a024409 100644 --- a/i18n/english/luasrc/i18n/default.en.lua +++ b/i18n/english/luasrc/i18n/default.en.lua @@ -8,6 +8,7 @@ basicsettings = "Basic Settings" changes = "Changes" channel = "Channel" +cidr6 = "CIDR-Notation: address/prefix" code = "Code" config = "Configuration" configfile = "Configuration file" @@ -29,7 +30,8 @@ error = "Error" filesystem = "Filesystem" filter = "Filter" -gateway = "Gateway" +gateway = "IPv4-Gateway" +gateway6 = "IPv6-Gateway" general = "General" hostname = "Hostname" @@ -38,7 +40,8 @@ install = "Install" installed = "installed" interface = "Interface" interfaces = "Interfaces" -ipaddress = "IP-Address" +ipaddress = "IPv4-Address" +ip6address = "IPv6-Address" legend = "Legend" library = "Library" @@ -57,7 +60,7 @@ metric = "Metric" mode = "Mode" name = "Name" -netmask = "Netmask" +netmask = "IPv4-Netmask" network = "Network" networks = "Networks" notinstalled = "not installed" diff --git a/i18n/german/luasrc/i18n/default.de.lua b/i18n/german/luasrc/i18n/default.de.lua index 16ab66c6a5..d69ee51baf 100644 --- a/i18n/german/luasrc/i18n/default.de.lua +++ b/i18n/german/luasrc/i18n/default.de.lua @@ -8,6 +8,7 @@ basicsettings = "Grundeinstellungen" changes = "Änderungen" channel = "Kanal" +cidr6 = "CIDR-Notation: Adresse/Prefix" code = "Code" config = "Konfiguration" configfile = "Konfigurationsdatei" @@ -29,7 +30,8 @@ error = "Fehler" filesystem = "Dateisystem" filter = "Filter" -gateway = "Gateway" +gateway = "IPv4-Gateway" +gateway6 = "IPv6-Gateway" general = "Allgemeines" hostname = "Hostname" @@ -38,7 +40,8 @@ install = "Installieren" installed = "installiert" interface = "Schnittstelle" interfaces = "Schnittstellen" -ipaddress = "IP-Adresse" +ipaddress = "IPv4-Adresse" +ip6address = "IPv6-Adresse" legend = "Legende" library = "Bibliothek" @@ -58,7 +61,7 @@ metric = "Metrik" mode = "Modus" name = "Name" -netmask = "Netzmaske" +netmask = "IPv4-Netzmaske" network = "Netzwerk" networks = "Netzwerke" notinstalled = "nicht installiert" diff --git a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua index b8a7dd34ae..014de7ddf7 100644 --- a/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -36,9 +36,12 @@ for i,d in ipairs(luci.sys.net.devices()) do end end -s:option(Value, "ipaddr", translate("ipaddress")) +ipaddr = s:option(Value, "ipaddr", translate("ipaddress")) +ipaddr.rmempty = true +ipaddr:depends("proto", "static") nm = s:option(Value, "netmask", translate("netmask")) +nm.rmempty = true nm:depends("proto", "static") nm:value("255.255.255.0") nm:value("255.255.0.0") @@ -48,6 +51,14 @@ gw = s:option(Value, "gateway", translate("gateway")) gw:depends("proto", "static") gw.rmempty = true +ip6addr = s:option(Value, "ip6addr", translate("ip6address"), translate("cidr6")) +ip6addr.rmempty = true +ip6addr:depends("proto", "static") + +ip6gw = s:option(Value, "ip6gw", translate("gateway6")) +ip6gw:depends("proto", "static") +ip6gw.rmempty = true + dns = s:option(Value, "dns", translate("dnsserver")) dns:depends("proto", "static") dns.optional = true |