Ticket #15263: now_tag.diff

django/template/defaulttags.py

@@ -381 +381 @@
 
     def render(self, context):
         from datetime import datetime
-        from django.utils.dateformat import DateFormat
-        df = DateFormat(datetime.now())
-        return df.format(self.format_string)
+        from django.utils import formats
+        from django.utils import dateformat
+        now = datetime.now()
+        try:
+            return formats.date_format(now, self.format_string)
+        except AttributeError:
+            try:
+                return dateformat.format(now, self.format_string)
+            except AttributeError:
+                return ''
 
 class SpacelessNode(Node):
     def __init__(self, nodelist):

docs/ref/templates/builtins.txt

@@ -680 +680 @@
 
 Display the current date and/or time, according to the given string.
 
-Given format can be one of the predefined ones ``DATE_FORMAT``,
-``DATETIME_FORMAT``, ``SHORT_DATE_FORMAT`` or ``SHORT_DATETIME_FORMAT``,
-or a custom format, same as the :tfilter:`date` filter. Note that predefined
+The format string can be one of the predefined ones - ``DATE_FORMAT``,
+``DATETIME_FORMAT``, ``SHORT_DATE_FORMAT`` or ``SHORT_DATETIME_FORMAT`` -
+or a custom format, as with the :tfilter:`date` filter. Note that predefined
 formats may vary depending on the current locale.
 
 Example::

tests/regressiontests/templates/tests.py

@@ -18 +18 @@
 from django.template import loader
 from django.template.loaders import app_directories, filesystem, cached
 from django.utils import unittest
+from django.utils.formats import date_format
 from django.utils.translation import activate, deactivate, ugettext as _
 from django.utils.safestring import mark_safe
 from django.utils.tzinfo import LocalTimezone
@@ -1379 +1380 @@
             'now02': ('{% now "j "n" Y"%}', {}, template.TemplateSyntaxError),
         #    'now03': ('{% now "j \"n\" Y"%}', {}, str(datetime.now().day) + '"' + str(datetime.now().month) + '"' + str(datetime.now().year)),
         #    'now04': ('{% now "j \nn\n Y"%}', {}, str(datetime.now().day) + '\n' + str(datetime.now().month) + '\n' + str(datetime.now().year))
+            # Check parsing of locale strings
+            'now05': ('{% now "DATE_FORMAT" %}', {},  date_format(datetime.now())),
 
             ### URL TAG ########################################################
             # Successes