From f27b174f6092c553bdc314d38d91bb2e34130c5a Mon Sep 17 00:00:00 2001 From: Manuel Munz Date: Mon, 4 Apr 2011 12:06:01 +0000 Subject: [PATCH] luci-0.10: Merge r6981 --- 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 d9979c137..da852a368 100644 --- a/modules/freifunk/luasrc/controller/freifunk/freifunk.lua +++ b/modules/freifunk/luasrc/controller/freifunk/freifunk.lua @@ -293,7 +293,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) -- 2.25.1