diff options
| author | Manuel Munz <freifunk@somakoma.de> | 2011-04-04 12:04:42 +0000 |
|---|---|---|
| committer | Manuel Munz <freifunk@somakoma.de> | 2011-04-04 12:04:42 +0000 |
| commit | 5a1e9354b41155b9604362c9a1ef8d7a899ba2b2 (patch) | |
| tree | a8c7c442fc7c0d8e748875fb85ca57f0dbbf8cd8 /modules/freifunk | |
| parent | 288a63f919ccbf443254359318b6cd7628d6959d (diff) | |
modules/freifunk: Hardcoding timezone was not a good idea
Diffstat (limited to 'modules/freifunk')
| -rw-r--r-- | modules/freifunk/luasrc/controller/freifunk/freifunk.lua | 2 | ||||
| -rw-r--r-- | modules/freifunk/luasrc/view/freifunk/public_status.htm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua index 9f7632f6c..a536fea0a 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -294,7 +294,7 @@ function public_status_json() end rv[#rv+1] = { - time = os.date("%a, %d %b %Y %H:%M:%S UTC"), + time = os.date("%a, %d %b %Y, %H:%M:%S"), uptime = twa.date_format(tonumber(sys.uptime())), load = string.format("%.2f, %.2f, %.2f", load1, load5, load15), mem = mem, diff --git a/modules/freifunk/luasrc/view/freifunk/public_status.htm b/modules/freifunk/luasrc/view/freifunk/public_status.htm index fe56034e4..3cb57082e 100644 --- a/modules/freifunk/luasrc/view/freifunk/public_status.htm +++ b/modules/freifunk/luasrc/view/freifunk/public_status.htm @@ -6,7 +6,7 @@ local twa = require "luci.tools.webadmin" -- System local system, model, memtotal, memcached, membuffers, memfree, bogomips = sys.sysinfo() local uptime = twa.date_format(tonumber(sys.uptime())) -local_time = os.date("%a, %d %b %Y %H:%M:%S UTC") +local_time = os.date("%a, %d %b %Y, %H:%M:%S") local load1, load5, load15 = sys.loadavg() local load = string.format("%.2f, %.2f, %.2f", load1, load5, load15) |