From 86be633213caae911e4542cd61d00206a7bfdb80 Mon Sep 17 00:00:00 2001 From: Steven Smith Date: Sat, 24 Aug 2013 17:15:54 +0800 Subject: [PATCH] Update timeformat.py --- plugins/util/timeformat.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/util/timeformat.py b/plugins/util/timeformat.py index 12b22d8..185fd36 100644 --- a/plugins/util/timeformat.py +++ b/plugins/util/timeformat.py @@ -6,9 +6,9 @@ def timeformat(seconds): minutes = seconds / 60 seconds -= 60 * minutes if days != 0: - return "%s, %02d:%02d:%02d" % (str(days) + " days" if days > 1 else str(days) + " day", hours, minutes, seconds) + return "%sd %sh %sm %ss" % (days, hours, minutes, seconds) elif hours == 0 and minutes != 0: - return "%02d:%02d" % (minutes, seconds) + return "%sm %ss" % (minutes, seconds) elif hours == 0 and minutes == 0: - return "%02d" % seconds - return "%02d:%02d:%02d" % (hours, minutes, seconds) + return "%ss" % seconds + return "%sh %sm %ss" % (hours, minutes, seconds)