luci-0.10: Merge r6836

diff --git a/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua b/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua
index 70bc8ad4779570d7377f791f45bc8d1bb77e58b9..b404181dc81b0587010271f1bb7e64564c098a83 100644 (file)
--- a/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua
+++ b/modules/freifunk/luasrc/model/cbi/freifunk/basics.lua
@@ -36,7 +36,7 @@ n = Map("system", translate("Basic system settings"))
 b = n:section(TypedSection, "system")
 b.anonymous = true
 
-hn = b:option(Value, "hostname", "hostname")
+hn = b:option(Value, "hostname", translate("Hostname"))
 hn.rmempty = false
 function hn.validate(self, value)
        if value == nil then
@@ -48,13 +48,13 @@ function hn.validate(self, value)
        end
 end
 
-loc = b:option(Value, "location", "Location")
+loc = b:option(Value, "location", translate("Location"))
 loc.rmempty = false
 
-lat = b:option(Value, "latitude", "latitude")
+lat = b:option(Value, "latitude", translate("Latitude"), translate("e.g.") .. " 48.12345")
 lat.rmempty = false
 
-lon = b:option(Value, "longitude", "longitude")
+lon = b:option(Value, "longitude", translate("Longitude"), translate("e.g.") .. " 10.12345")
 lon.rmempty = false
 
 --[[
@@ -63,6 +63,7 @@ Makes use of resources/OSMLatLon.htm and htdocs/resources/osm.js
 (is that the right place for files like these?)
 ]]--
 
+--[[ this needs to be fixed
 local class = util.class
 local co = "profile_augsburg"
 local syslat = uci:get_first(co, "community", "latitude")
@@ -108,6 +109,6 @@ end
 
 osm.displaytext="OpenStreetMap anzeigen"
 osm.hidetext="OpenStreetMap verbergen"
-
+]]
 
 return m, n