From 74f5d2b9b0c37e4ccbd5f303c4ab3d6400a95c59 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sat, 12 Aug 2006 05:09:12 +0000 Subject: 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 --- django/template/defaultfilters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/template') diff --git a/django/template/defaultfilters.py b/django/template/defaultfilters.py index c75f371ec8..a2e9d2f405 100644 --- a/django/template/defaultfilters.py +++ b/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: -- cgit v1.3