Module: check_mk
Branch: master
Commit: 04ab6ce7be25c7a4acd3fdbcc74744131f545118
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=04ab6ce7be25c7…
Author: Mathias Kettner <mk(a)mathias-kettner.de>
Date: Thu Oct 9 11:02:36 2014 +0200
valuespec Age: nicer value_to_text output
---
web/htdocs/valuespec.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py
index 6ad2027..20c92f0 100644
--- a/web/htdocs/valuespec.py
+++ b/web/htdocs/valuespec.py
@@ -197,7 +197,20 @@ class Age(ValueSpec):
days, rest = divmod(value, 60*60*24)
hours, rest = divmod(rest, 60*60)
minutes, seconds = divmod(rest, 60)
- return "%sd %sh %sm %ss" % (days, hours, minutes, seconds)
+ parts = []
+ for title, count in [
+ ( _("days"), days, ),
+ ( _("hours"), hours, ),
+ ( _("minutes"), minutes, ),
+ ( _("seconds"), seconds, )]:
+ if count:
+ parts.append("%d %s" % (count, title))
+
+ if parts:
+ return " ".join(parts)
+ else:
+ return _("no time")
+
def validate_datatype(self, value, varprefix):
if type(value) != int: