applications/luci-olsr: add translations, move Ip6AddrType further up in option list, add possibility to remove the option

5 files changed, 13 insertions, 7 deletions

diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.lua b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
index 4ebcf0e2e..4e652c85d 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.de.lua
+++ b/applications/luci-olsr/luasrc/i18n/olsr.de.lua
@@ -57,6 +57,7 @@ olsrd_interface_midinterval = 'MID-Intervall'
 olsrd_interface_midvaliditytime = 'MID-Gültigkeit'
 olsrd_interface_tcinterval = 'TC-Intervall'
 olsrd_interface_tcvaliditytime = 'TC-Gültigkeit'
+olsrd_interface_ip6addrtype = 'IPv6 Adresstyp'
 olsrd_ipcconnect = 'IPC-Einstellungen'
 olsrd_ipcconnect_desc = 'IPC-Verbindungen ermöglichen die Fernsteuerung des lokalen OLSR-Prozesses durch externe Programme'
 olsrd_ipcconnect_host = 'Erlaubte Hostadressen'
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.de.xml b/applications/luci-olsr/luasrc/i18n/olsr.de.xml
index 3d8b5a211..6b003aa90 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.de.xml
+++ b/applications/luci-olsr/luasrc/i18n/olsr.de.xml
@@ -83,6 +83,7 @@
 <i18n:msg xml:id="olsrd_interface_midvaliditytime">MID-Gültigkeit</i18n:msg>
 <i18n:msg xml:id="olsrd_interface_tcinterval">TC-Intervall</i18n:msg>
 <i18n:msg xml:id="olsrd_interface_tcvaliditytime">TC-Gültigkeit</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_ip6addrtype">IPv6 Adresstyp</i18n:msg>
 
 
 <!-- * IPCCONNECT SETUP * -->
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.lua b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
index b8621d3f7..dc1e4423f 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.en.lua
+++ b/applications/luci-olsr/luasrc/i18n/olsr.en.lua
@@ -57,6 +57,7 @@ olsrd_interface_midinterval = 'MID interval'
 olsrd_interface_midvaliditytime = 'MID validity time'
 olsrd_interface_tcinterval = 'TC interval'
 olsrd_interface_tcvaliditytime = 'TC validity time'
+olsrd_interface_ip6addrtype = 'IPv6 address type'
 olsrd_ipcconnect = 'IPC settings'
 olsrd_ipcconnect_desc = 'IPC connections enable you to remote-control the local OLSRd instance using external programs'
 olsrd_ipcconnect_host = 'Allowed host addresses'
diff --git a/applications/luci-olsr/luasrc/i18n/olsr.en.xml b/applications/luci-olsr/luasrc/i18n/olsr.en.xml
index 4dc7d5c94..a8da243f2 100644
--- a/applications/luci-olsr/luasrc/i18n/olsr.en.xml
+++ b/applications/luci-olsr/luasrc/i18n/olsr.en.xml
@@ -83,6 +83,7 @@
 <i18n:msg xml:id="olsrd_interface_midvaliditytime">MID validity time</i18n:msg>
 <i18n:msg xml:id="olsrd_interface_tcinterval">TC interval</i18n:msg>
 <i18n:msg xml:id="olsrd_interface_tcvaliditytime">TC validity time</i18n:msg>
+<i18n:msg xml:id="olsrd_interface_ip6addrtype">IPv6 address type</i18n:msg>
 
 
 <!-- * IPCCONNECT SETUP * -->
diff --git a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index 4da1c4060..09d183507 100644
--- a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@ -105,6 +105,15 @@ network = i:option(ListValue, "interface", translate("network"))
 luci.tools.webadmin.cbi_add_networks(network)
 
 i:option(Value, "Ip4Broadcast").optional = true
+
+ip6t = i:option(ListValue, "Ip6AddrType")
+ip6t:value("", translate("cbi_select"))
+ip6t:value("auto")
+ip6t:value("site-local")
+ip6t:value("unique-local")
+ip6t:value("global")
+ip6t.optional = true
+
 i:option(Value, "HelloInterval").optional = true
 i:option(Value, "HelloValidityTime").optional = true
 i:option(Value, "TcInterval").optional = true
@@ -114,13 +123,6 @@ i:option(Value, "MidValidityTime").optional = true
 i:option(Value, "HnaInterval").optional = true
 i:option(Value, "HnaValidityTime").optional = true
 
-ip6t = i:option(ListValue, "Ip6AddrType")
-ip6t:value("auto")
-ip6t:value("site-local")
-ip6t:value("unique-local")
-ip6t:value("global")
-ip6t.optional = true
-
 adc = i:option(Flag, "AutoDetectChanges")
 adc.enabled  = "yes"
 adc.disabled = "no"