diff options
| author | Curtis Maloney <curtis@tinbrain.net> | 2013-09-21 13:54:48 +1000 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2013-09-21 06:42:11 -0400 |
| commit | 43a2ec7999dcb0c9b09552b9b44741e89f87bc33 (patch) | |
| tree | 26778c1cf4852b4db9f8d03028fbac61f9751cac /docs/ref | |
| parent | a991b01167ea187f8b1e249f7d5a56d26440e386 (diff) | |
Fixed #21133 --Clarifed documentation about strftime formatting.
Diffstat (limited to 'docs/ref')
| -rw-r--r-- | docs/ref/class-based-views/mixins-date-based.txt | 5 | ||||
| -rw-r--r-- | docs/ref/templates/builtins.txt | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/docs/ref/class-based-views/mixins-date-based.txt b/docs/ref/class-based-views/mixins-date-based.txt index 48faf28a44..06eec90a8b 100644 --- a/docs/ref/class-based-views/mixins-date-based.txt +++ b/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 --------- diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index cc1ca46e9f..45c880156b 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -1251,6 +1251,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: ================ ======================================== ===================== |