ChCh
/
CloudBot
Archived
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Conflicts:
	plugins/youtube.py - fixed
This commit is contained in:
Luke Rogers 2013-12-01 00:42:56 +13:00
parent 8b18c33ce5 cdf8922f4d
commit b489b9d3c7
1 changed files with 4 additions and 0 deletions
Show Stats 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):
if simple:
periods = [
('c', 60*60*24*365*100),
('de', 60*60*24*365*10),
('y', 60*60*24*365),
('m', 60*60*24*30),
('d', 60*60*24),
@ -29,6 +31,8 @@ def format_time(seconds, accuracy=3, simple=False):
]
else:
periods = [
(' century', 60*60*24*365*100),
(' decade', 60*60*24*365*10),
(' year', 60*60*24*365),
(' month', 60*60*24*30),
(' day', 60*60*24),