diff options
| author | Jannis Leidel <jannis@leidel.info> | 2011-04-22 12:02:55 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2011-04-22 12:02:55 +0000 |
| commit | e744fec8f9c47c8d45045d36df202deb4b6c3b9f (patch) | |
| tree | b4c4571ab1aafd47eb45d179626aa789d8161c44 /django | |
| parent | ea248f0107eb3bed5a4a0fb65d6065e5691bea0a (diff) | |
Fixed #11321 -- Handle timezones correctly in conjunction with naturalday filter. Thanks, aarond10 and seocam.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/humanize/templatetags/humanize.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/django/contrib/humanize/templatetags/humanize.py b/django/contrib/humanize/templatetags/humanize.py index 0c6d389e34..5f3e2a7aed 100644 --- a/django/contrib/humanize/templatetags/humanize.py +++ b/django/contrib/humanize/templatetags/humanize.py @@ -84,6 +84,7 @@ def naturalday(value, arg=None): formatted according to settings.DATE_FORMAT. """ try: + tzinfo = getattr(value, 'tzinfo', None) value = date(value.year, value.month, value.day) except AttributeError: # Passed value wasn't a date object @@ -91,7 +92,8 @@ def naturalday(value, arg=None): except ValueError: # Date arguments out of range return value - delta = value - date.today() + today = datetime.now(tzinfo).replace(microsecond=0, second=0, minute=0, hour=0) + delta = value - today.date() if delta.days == 0: return _(u'today') elif delta.days == 1: |