Ticket #9366: datefilters.diff

django/template/defaultfilters.py

@@ -9 +9 @@
 
 from django.template import Variable, Library
 from django.conf import settings
-from django.utils.translation import ugettext, ungettext
+from django.utils.translation import ugettext, ungettext, get_date_formats
 from django.utils.encoding import force_unicode, iri_to_uri
 from django.utils.safestring import mark_safe, SafeData
 
@@ -627 +627 @@
     if not value:
         return u''
     if arg is None:
-        arg = settings.DATE_FORMAT
+        arg = get_date_formats()[0]
     return format(value, arg)
 date.is_safe = False
 
+def datetime(value, arg=None):
+    """Formats a date and time according to the given format."""
+    from django.utils.dateformat import format
+    if not value:
+        return u''
+    if arg is None:
+        arg = get_date_formats()[1]
+    return format(value, arg)
+datetime.is_safe = False
+
 def time(value, arg=None):
     """Formats a time according to the given format."""
     from django.utils.dateformat import time_format
     if value in (None, u''):
         return u''
     if arg is None:
-        arg = settings.TIME_FORMAT
+        arg = get_date_formats()[2]
     return time_format(value, arg)
 time.is_safe = False
 
@@ -808 +818 @@
 register.filter(center)
 register.filter(cut)
 register.filter(date)
+register.filter(datetime)
 register.filter(default)
 register.filter(default_if_none)
 register.filter(dictsort)