From 605a063e80a11fe65bbd1a3308f16931fa6ba7f0 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Sun, 20 May 2012 11:40:25 +0100 Subject: [PATCH] Fix naturaltimediff to work in Django 1.4 timezones --- app/eve_api/templatetags/naturaltimediff.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/eve_api/templatetags/naturaltimediff.py b/app/eve_api/templatetags/naturaltimediff.py index 657155a..c79d871 100644 --- a/app/eve_api/templatetags/naturaltimediff.py +++ b/app/eve_api/templatetags/naturaltimediff.py @@ -1,4 +1,5 @@ from django import template +from django.utils.timezone import now register = template.Library() @@ -15,7 +16,7 @@ def naturaltimediff(value): from datetime import datetime if isinstance(value, datetime): - delta = datetime.now() - value + delta = now() - value if delta.days > 6: return value.strftime("%b %d") # May 15 if delta.days > 1: