From e31e4e236f72d0f84a850613413ec71a78ad3192 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Fri, 7 Aug 2015 02:04:07 -0500 Subject: [PATCH] prettydate can do UTC, fixes #1036 --- gluon/tools.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gluon/tools.py b/gluon/tools.py index 95f803d1..17f6d644 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -5523,11 +5523,12 @@ def completion(callback): return _completion -def prettydate(d, T=lambda x: x): +def prettydate(d, T=lambda x: x, utc=False): + now = datetime.datetime.utcnow() if utc else datetime.datetime.now() if isinstance(d, datetime.datetime): - dt = datetime.datetime.now() - d + dt = now - d elif isinstance(d, datetime.date): - dt = datetime.date.today() - d + dt = now.date() - d elif not d: return '' else: