X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=modules%2Fadmin-full%2Fluasrc%2Fmodel%2Fcbi%2Fadmin_system%2Fsystem.lua;h=a2bbf29b6732fbce17011db27c1b33adb53f6103;hp=da51b452d1f59020e7774f1fa98a368adcc6d53e;hb=103e532246f60ae9f3368fc3be454695ad21cd6e;hpb=d8eb5b292d92b7f26c1b6e554eba4505e923ad35

diff --git a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
index da51b452d..a2bbf29b6 100644
--- a/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
+++ b/modules/admin-full/luasrc/model/cbi/admin_system/system.lua
@@ -15,40 +15,42 @@ $Id$
 require("luci.sys")
 require("luci.sys.zoneinfo")
 require("luci.tools.webadmin")
+require("luci.fs")
 
-m = Map("system", translate("system"), translate("a_s_desc"))
+m = Map("system", translate("System"), translate("Here you can configure the basic aspects of your device like its hostname or the timezone."))
 
 s = m:section(TypedSection, "system", "")
 s.anonymous = true
+s.addremove = false
 
 local system, model, memtotal, memcached, membuffers, memfree = luci.sys.sysinfo()
 local uptime = luci.sys.uptime()
 
-s:option(DummyValue, "_system", translate("system")).value = system
-s:option(DummyValue, "_cpu", translate("m_i_processor")).value = model
+s:option(DummyValue, "_system", translate("System")).value = system
+s:option(DummyValue, "_cpu", translate("Processor")).value = model
 
 local load1, load5, load15 = luci.sys.loadavg()
-s:option(DummyValue, "_la", translate("load")).value =
+s:option(DummyValue, "_la", translate("Load")).value =
  string.format("%.2f, %.2f, %.2f", load1, load5, load15)
 
-s:option(DummyValue, "_memtotal", translate("m_i_memory")).value =
+s:option(DummyValue, "_memtotal", translate("Memory")).value =
  string.format("%.2f MB (%.0f%% %s, %.0f%% %s, %.0f%% %s)",
   tonumber(memtotal) / 1024,
   100 * memcached / memtotal,
-  tostring(translate("mem_cached", "")),
+  tostring(translate("cached")),
   100 * membuffers / memtotal,
-  tostring(translate("mem_buffered", "")),
+  tostring(translate("buffered")),
   100 * memfree / memtotal,
-  tostring(translate("mem_free", ""))
+  tostring(translate("free"))
 )
 
-s:option(DummyValue, "_systime", translate("m_i_systemtime")).value =
+s:option(DummyValue, "_systime", translate("Local Time")).value =
  os.date("%c")
 
-s:option(DummyValue, "_uptime", translate("m_i_uptime")).value =
+s:option(DummyValue, "_uptime", translate("Uptime")).value =
  luci.tools.webadmin.date_format(tonumber(uptime))
 
-hn = s:option(Value, "hostname", translate("hostname"))
+hn = s:option(Value, "hostname", translate("Hostname"))
 
 function hn.write(self, section, value)
 	Value.write(self, section, value)
@@ -56,7 +58,7 @@ function hn.write(self, section, value)
 end
 
 
-tz = s:option(ListValue, "zonename", translate("timezone"))
+tz = s:option(ListValue, "zonename", translate("Timezone"))
 tz:value("UTC")
 
 for i, zone in ipairs(luci.sys.zoneinfo.TZ) do
@@ -71,7 +73,9 @@ function tz.write(self, section, value)
 	end
 
 	AbstractValue.write(self, section, value)
-	self.map.uci:set("system", section, "timezone", lookup_zone(value) or "GMT0")
+	local timezone = lookup_zone(value) or "GMT0"
+	self.map.uci:set("system", section, "timezone", timezone)
+	luci.fs.writefile("/etc/TZ", timezone .. "\n")
 end
 
 s:option(Value, "log_size", nil, "kiB").optional = true