Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

[1.6.x] Fixed #21133 -- Clarifed documentation about strftime formatt…

…ing.

Backport of 43a2ec7 from master
  • Loading branch information...
commit e94efee946bb440a4ea9fbe89dcb58972a87e8b3 1 parent 0ad178c
@funkybob funkybob authored timgraham committed
View
5 docs/ref/class-based-views/mixins-date-based.txt
@@ -4,6 +4,11 @@ Date-based mixins
.. currentmodule:: django.views.generic.dates
+.. note::
+ All the date formatting attributes in these mixins use
+ :func:`~time.strftime` format characters. Do not try to use the format
+ characters from the :ttag:`now` template tag as they are not compatible.
+
YearMixin
---------
View
4 docs/ref/templates/builtins.txt
@@ -1245,6 +1245,10 @@ Formats a date according to the given format.
Uses a similar format as PHP's ``date()`` function (http://php.net/date)
with some differences.
+.. note::
+ These format characters are not used in Django outside of templates. They
+ were designed to be compatible with PHP to ease transitioning for designers.
+
Available format strings:
================ ======================================== =====================
Please sign in to comment.
Something went wrong with that request. Please try again.