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

luci-0.10: Merge r6854

Browse source
This commit is contained in:
Manuel Munz 2011-02-11 18:50:30 +00:00
parent 9796ac0572
commit 2e17e1254b
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applications/luci-ffwizard/Makefile
View file

@ -1,4 +1,4 @@
PO =
PO = ffwizard
include ../../build/config.mk
include ../../build/module.mk

7
applications/luci-ffwizard/luasrc/controller/ffwizard.lua
View file

@ -18,8 +18,11 @@ $Id$
module "luci.controller.ffwizard"
function index()
entry({"admin", "freifunk", "ffwizard"}, form("freifunk/ffwizard"), "Freifunkassistent", 40)
assign({"mini", "freifunk", "ffwizard"}, {"admin", "freifunk", "ffwizard"}, "Freifunkassistent", 40)
require("luci.i18n").loadc("ffwizard")
local i18n = luci.i18n.translate
entry({"admin", "freifunk", "ffwizard"}, form("freifunk/ffwizard"), i18n("Wizard"), 40)
assign({"mini", "freifunk", "ffwizard"}, {"admin", "freifunk", "ffwizard"}, i18n("Wizard"), 40)
entry({"admin", "freifunk", "ffwizard_error"}, template("freifunk/ffwizard_error"))
assign({"mini", "freifunk", "ffwizard_error"}, {"admin", "freifunk", "ffwizard_error"})

16
applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua
View file

@ -36,11 +36,11 @@ local lat = uci:get_first("system", "system", "latitude")
local lon = uci:get_first("system", "system", "longitude")
local suffix = uci:get_first(community, "community", "suffix") or "olsr"
luci.i18n.loadc("freifunk")
luci.i18n.loadc("ffwizard")
-- Check if all necessary variables are available
if not (community ~= "profile_na" and lat and lon) then
luci.http.redirect(luci.dispatcher.build_url(unpack(luci.dispatcher.context.requested.path), "freifunk", "ffwizard_error"))
luci.http.redirect(luci.dispatcher.build_url("admin", "freifunk", "ffwizard_error"))
return
end
@ -117,7 +117,7 @@ function cbi_meship6(dev)
end
function cbi_netconf(dev)
local d = f:field(Flag, "device_" .. dev , " <b>" .. dev:upper() .. "</b>", "Configure this interface.")
local d = f:field(Flag, "device_" .. dev , " <b>" .. dev:upper() .. "</b>", translate("Configure this interface."))
d:depends("netconfig", "1")
d.rmempty = false
function d.cfgvalue(self, section)
@ -321,7 +321,7 @@ function wanproto.write(self, section, value)
uci:set("network", "wan", "proto", value)
uci:save("network")
end
wanip = f:field(Value, "wanipaddr", translate("Ip address"))
wanip = f:field(Value, "wanipaddr", translate("IP address"))
wanip:depends("wanproto", "static")
function wanip.cfgvalue(self, section)
return uci:get("network", "wan", "ipaddr")
@ -381,7 +381,7 @@ function wanpwd.write(self, section, value)
uci:save("network")
end
wansec = f:field(Flag, "wansec", translate("Protect LAN"), translate("Check this to protect your LAN from other nodes or clients" .. " (" .. translate("recommended") .. ")."))
wansec = f:field(Flag, "wansec", translate("Protect LAN"), translate("Check this to protect your LAN from other nodes or clients") .. " (" .. translate("recommended") .. ").")
wansec.default = "1"
wansec.rmempty = false
wansec:depends("wanproto", "static")
@ -437,7 +437,7 @@ if has_l2gvpn then
end
if has_hb then
hb = f:field(Flag, "hb", translate("Heartbeat"), translate("Allow to transfer anonymous statistics about this node" .. " (" .. translate("recommended") .. ")."))
hb = f:field(Flag, "hb", translate("Heartbeat"), translate("Allow to transfer anonymous statistics about this node") .. " (" .. translate("recommended") .. ").")
hb.rmempty = false
hb:depends("netconfig", "1")
function hb.cfgvalue(self, section)
@ -457,9 +457,9 @@ function f.handle(self, state, data)
if data.pw1 then
local stat = luci.sys.user.setpasswd("root", data.pw1) == 0
if stat then
f.message = translate("a_s_changepw_changed")
f.message = translate("Password successfully changed")
else
f.errmessage = translate("unknownerror")
f.errmessage = translate("Unknown Error")
end
end
data.pw1 = nil