Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #2528 -- Fixed 'time' template filter for midnight time value. …

…Thanks, django@dougma.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@3563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 74f5d2b9b0c37e4ccbd5f303c4ab3d6400a95c59 1 parent 6f8e9be
@adrianholovaty adrianholovaty authored
View
4 django/template/defaultfilters.py
@@ -339,7 +339,7 @@ def date(value, arg=None):
def time(value, arg=None):
"Formats a time according to the given format"
from django.utils.dateformat import time_format
- if not value:
+ if value in (None, ''):
return ''
if arg is None:
arg = settings.TIME_FORMAT
@@ -437,7 +437,7 @@ def pluralize(value, arg='s'):
is used instead. If the provided argument contains a comma, the text before
the comma is used for the singular case.
"""
- if not ',' in arg:
+ if not ',' in arg:
arg = ',' + arg
bits = arg.split(',')
if len(bits) > 2:
View
3  tests/othertests/defaultfilters.py
@@ -231,6 +231,9 @@
>>> time(datetime.time(13), "h")
'01'
+>>> time(datetime.time(0), "h")
+'12'
+
# real testing is done in timesince.py, where we can provide our own 'now'
>>> timesince(datetime.datetime.now() - datetime.timedelta(1))
'1 day'
Please sign in to comment.
Something went wrong with that request. Please try again.