X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=applications%2Fluci-ffwizard%2Fluasrc%2Fmodel%2Fcbi%2Ffreifunk%2Fffwizard.lua;h=f915cfa9ab127c9847066341c3035ce1d8004dd4;hp=8a6e078369cd59b14ce4e6c6983f0fcb05338693;hb=f3b5d641f0863170196c1402d87cfe5132af2513;hpb=2006a2a82744c66a71e5a6048df9c35600cd474b

diff --git a/applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua b/applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua
index 8a6e07836..f915cfa9a 100644
--- a/applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua
+++ b/applications/luci-ffwizard/luasrc/model/cbi/freifunk/ffwizard.lua
@@ -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
@@ -1045,15 +1045,6 @@ function main.write(self, section, value)
 			uci:set("system", s['.name'], "zonename", "Europe/Berlin")
 			uci:set("system", s['.name'], "timezone", 'CET-1CEST,M3.5.0,M10.5.0/3')
 		end)
-
-	-- Create time rdate_servers
-	local rdate = uci:get_all("freifunk", "time")
-	uci:delete_all("system", "time")
-	uci:section("system", "time", "rdate_servers", rdate)
-	rdate.server = rdate.rdate_servers
-	rdate.rdate_servers = ""
-	uci:delete_all("system", "rdate", nil)
-	uci:section("system", "rdate", nil, rdate)
 	uci:save("system")
 
 	-- Delete old watchdog settings