mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-28 08:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #25758 -- Defaulted to current language FORMATs in date/time filters

Browse Source 
Thanks Ali Lozano for the report and the initial patch, and Tim Graham for
the review.
This commit is contained in:
Claude Paroz
2016-01-30 14:25:56 +01:00
parent c47364ef0c
commit be9bd3348d
3 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
django/template/defaultfilters.py
View File

@@ -7,7 +7,6 @@ from decimal import ROUND_HALF_UP, Context, Decimal, InvalidOperation
from functools import wraps
from pprint import pformat
from django.conf import settings
from django.utils import formats, six
from django.utils.dateformat import format, time_format
from django.utils.encoding import force_text, iri_to_uri
@@ -727,8 +726,6 @@ def date(value, arg=None):
"""Formats a date according to the given format."""
if value in (None, ''):
return ''
if arg is None:
arg = settings.DATE_FORMAT
try:
return formats.date_format(value, arg)
except AttributeError:
@@ -743,8 +740,6 @@ def time(value, arg=None):
"""Formats a time according to the given format."""
if value in (None, ''):
return ''
if arg is None:
arg = settings.TIME_FORMAT
try:
return formats.time_format(value, arg)
except AttributeError: