ChCh/CloudBot
Archived
11
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'noodle/patch-5' into develop

Browse source 
Conflicts:
	plugins/youtube.py - fixed
This commit is contained in:
Luke Rogers 2013-12-01 00:42:56 +13:00
commit b489b9d3c7
1 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/youtube.py
View file

@ -20,6 +20,8 @@ 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 = [
('c', 60*60*24*365*100),
('de', 60*60*24*365*10),
('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),
@ -29,6 +31,8 @@ def format_time(seconds, accuracy=3, simple=False):
] ]
else: else:
periods = [ periods = [
(' century', 60*60*24*365*100),
(' decade', 60*60*24*365*10),
(' 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),