projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applications/luci-olsr: add translations, move Ip6AddrType further up in option list...
[project/luci.git]
/
applications
/
luci-olsr
/
luasrc
/
model
/
cbi
/
olsr
/
olsrd.lua
diff --git
a/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
b/applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
index
1ea3d97
..
09d1835
100644
(file)
--- a/
applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ b/
applications/luci-olsr/luasrc/model/cbi/olsr/olsrd.lua
@@
-11,12
+11,12
@@
You may obtain a copy of the License at
$Id$
]]--
$Id$
]]--
+
require("luci.tools.webadmin")
require("luci.tools.webadmin")
-require("luci.fs")
-m = Map("olsrd",
"OLSR"
)
+m = Map("olsrd",
translate("olsrd", "OLSR Daemon")
)
-s = m:section(TypedSection, "olsrd", translate("olsr_general"))
+s = m:section(TypedSection, "olsrd", translate("olsr
d
_general"))
s.dynamic = true
s.anonymous = true
s.dynamic = true
s.anonymous = true
@@
-38,26
+38,26
@@
noint.optional = true
s:option(Value, "Pollrate").optional = true
tcr = s:option(ListValue, "TcRedundancy")
s:option(Value, "Pollrate").optional = true
tcr = s:option(ListValue, "TcRedundancy")
-tcr:value("0", translate("olsr
_general
_tcredundancy_0"))
-tcr:value("1", translate("olsr
_general
_tcredundancy_1"))
-tcr:value("2", translate("olsr
_general
_tcredundancy_2"))
+tcr:value("0", translate("olsr
d_olsrd
_tcredundancy_0"))
+tcr:value("1", translate("olsr
d_olsrd
_tcredundancy_1"))
+tcr:value("2", translate("olsr
d_olsrd
_tcredundancy_2"))
tcr.optional = true
s:option(Value, "MprCoverage").optional = true
lql = s:option(ListValue, "LinkQualityLevel")
lql:value("0", translate("disable"))
tcr.optional = true
s:option(Value, "MprCoverage").optional = true
lql = s:option(ListValue, "LinkQualityLevel")
lql:value("0", translate("disable"))
-lql:value("1", translate("olsr
_general
_linkqualitylevel_1"))
-lql:value("2", translate("olsr
_general
_linkqualitylevel_2"))
+lql:value("1", translate("olsr
d_olsrd
_linkqualitylevel_1"))
+lql:value("2", translate("olsr
d_olsrd
_linkqualitylevel_2"))
lql.optional = true
s:option(Value, "LinkQualityAging").optional = true
lqa = s:option(ListValue, "LinkQualityAlgorithm")
lqa.optional = true
lql.optional = true
s:option(Value, "LinkQualityAging").optional = true
lqa = s:option(ListValue, "LinkQualityAlgorithm")
lqa.optional = true
-lqa:value("etx_fpm", translate("olsr_etx_fpm"))
-lqa:value("etx_float", translate("olsr_etx_float"))
-lqa:value("etx_ff", translate("olsr_etx_ff"))
+lqa:value("etx_fpm", translate("olsr
d
_etx_fpm"))
+lqa:value("etx_float", translate("olsr
d
_etx_float"))
+lqa:value("etx_ff", translate("olsr
d
_etx_ff"))
lqa.optional = true
lqfish = s:option(Flag, "LinkQualityFishEye")
lqa.optional = true
lqfish = s:option(Flag, "LinkQualityFishEye")
@@
-97,14
+97,23
@@
i.anonymous = true
i.addremove = true
i.dynamic = true
i.addremove = true
i.dynamic = true
-ign = i:option(Flag, "ignore")
-ign.enabled = "
1
"
-ign.disabled = "
0
"
+ign = i:option(Flag, "ignore"
, "Enable"
)
+ign.enabled = "
0
"
+ign.disabled = "
1
"
network = i:option(ListValue, "interface", translate("network"))
luci.tools.webadmin.cbi_add_networks(network)
i:option(Value, "Ip4Broadcast").optional = true
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
i:option(Value, "HelloInterval").optional = true
i:option(Value, "HelloValidityTime").optional = true
i:option(Value, "TcInterval").optional = true
@@
-121,6
+130,8
@@
adc.optional = true
ipc = m:section(TypedSection, "IpcConnect")
ipc = m:section(TypedSection, "IpcConnect")
+ipc.anonymous = true
+
conns = ipc:option(Value, "MaxConnections")
conns.isInteger = true
conns = ipc:option(Value, "MaxConnections")
conns.isInteger = true