From 5a1e9354b41155b9604362c9a1ef8d7a899ba2b2 Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Mon, 4 Apr 2011 12:04:42 +0000 Subject: [PATCH] modules/freifunk: Hardcoding timezone was not a good idea --- modules/freifunk/luasrc/controller/freifunk/freifunk.lua | 2 +- 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 9f7632f6c4..a536fea0a4 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 fe56034e4d..3cb57082e2 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) -- 2.30.2