stuff
This commit is contained in:
parent
f55c8f8d4e
commit
8b18c33ce5
1 changed files with 14 additions and 14 deletions
|
@ -20,21 +20,21 @@ def plural(num=0, text=''):
|
||||||
def format_time(seconds, accuracy=3, simple=False):
|
def format_time(seconds, accuracy=3, simple=False):
|
||||||
if simple:
|
if simple:
|
||||||
periods = [
|
periods = [
|
||||||
('y', 60*60*24*365),
|
('y', 60*60*24*365),
|
||||||
('m', 60*60*24*30),
|
('m', 60*60*24*30),
|
||||||
('d', 60*60*24),
|
('d', 60*60*24),
|
||||||
('h', 60*60),
|
('h', 60*60),
|
||||||
('m', 60),
|
('m', 60),
|
||||||
('s', 1)
|
('s', 1)
|
||||||
]
|
]
|
||||||
else:
|
else:
|
||||||
periods = [
|
periods = [
|
||||||
(' year', 60*60*24*365),
|
(' year', 60*60*24*365),
|
||||||
(' month', 60*60*24*30),
|
(' month', 60*60*24*30),
|
||||||
(' day', 60*60*24),
|
(' day', 60*60*24),
|
||||||
(' hour', 60*60),
|
(' hour', 60*60),
|
||||||
(' minute', 60),
|
(' minute', 60),
|
||||||
(' second', 1)
|
(' second', 1)
|
||||||
]
|
]
|
||||||
|
|
||||||
strings = []
|
strings = []
|
||||||
|
@ -45,9 +45,9 @@ def format_time(seconds, accuracy=3, simple=False):
|
||||||
period_value, seconds = divmod(seconds,period_seconds)
|
period_value, seconds = divmod(seconds,period_seconds)
|
||||||
i += 1
|
i += 1
|
||||||
if period_value == 1 or simple:
|
if period_value == 1 or simple:
|
||||||
strings.append("%s%s" % (period_value, period_name))
|
strings.append("{}{}".format(period_value, period_name))
|
||||||
else:
|
else:
|
||||||
strings.append("%s%ss" % (period_value, period_name))
|
strings.append("{}{}s".format(period_value, period_name))
|
||||||
else:
|
else:
|
||||||
break
|
break
|
||||||
|
|
||||||
|
|
Reference in a new issue