Ticket #15267: django_now_template_tag.diff

django/template/defaulttags.py

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