@@ -17,14 +17,19 @@ def relativedate(ts): else: ess = 's' return '%i minute%s ago' % (delta/60, ess) - elif delta < 24*60*60: + elif delta < 4*60*60: if int(delta/24/60) == 1: ess = '' else: ess = 's' return '%i hour%s ago' % (delta/60/60, ess) elif delta < 7*24*60*60: - return time.strftime('%A at %H:%M %Z', time.localtime(ts)) + if time.localtime(time.time()).tm_yday == time.localtime(ts).tm_yday: + return time.strftime('today at %H:%M %Z', time.localtime(ts)) + elif time.localtime(time.time()).tm_yday == time.localtime(ts).tm_yday+1: + return time.strftime('yesterday at %H:%M %Z', time.localtime(ts)) + else: + return time.strftime('%A at %H:%M %Z', time.localtime(ts)) elif delta < 30*24*60*60: return time.strftime('%A, %B %d', time.localtime(ts)) else: getdehumidpercent.py 83e4dbe0ff916155ae08e7eafda868d19e13f0e8 Ryan Tucker rtucker@gmail.com http://github.com/rtucker/munin-dehumid-status/commit/2673eba1e9877d34944ecb959aa54b2e1c51bd0a 2673eba1e9877d34944ecb959aa54b2e1c51bd0a 2009-10-31T18:40:07-07:00 2009-10-31T18:40:07-07:00 relative date tweaks e02a905b2a0db5d757ecee3a2411390d6ecd77ba Ryan Tucker rtucker@gmail.com