dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed prettydate, thanks Anthony

Browse Source
This commit is contained in:
mdipierro
2012-08-16 11:06:04 -05:00
parent 06cba402cb
commit f78f27982b
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-16 10:54:35) dev Version 2.00.0 (2012-08-16 11:06:01) dev
gluon/tools.py
+6 -2
View File
@@ -4251,10 +4251,14 @@ def completion(callback):
return _completion return _completion
def prettydate(d,T=lambda x:x): def prettydate(d,T=lambda x:x):
try: if isinstance(d,datetime.datetime):
dt = datetime.datetime.now() - d dt = datetime.datetime.now() - d
except: elif isinstance(d,datetime.date):
dt = datetime.date.today() - d
elif not d:
return '' return ''
else:
return '[invalid date]'
if dt.days >= 2*365: if dt.days >= 2*365:
return T('%d years ago') % int(dt.days / 365) return T('%d years ago') % int(dt.days / 365)
elif dt.days >= 365: elif dt.days >= 365: