innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

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

Backport of 43a2ec7999 from master
This commit is contained in:
Curtis Maloney 2013-09-21 13:54:48 +10:00 committed by Tim Graham
parent 0ad178c43d
commit e94efee946
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/ref/class-based-views/mixins-date-based.txt
View File

@ -4,6 +4,11 @@ Date-based mixins
.. currentmodule:: django.views.generic.dates .. 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 YearMixin
--------- ---------

4
docs/ref/templates/builtins.txt
View File

@ -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) Uses a similar format as PHP's ``date()`` function (http://php.net/date)
with some differences. 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: Available format strings:
================ ======================================== ===================== ================ ======================================== =====================