1
0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00

Added notes about the two new date format specifiers (`c and u`) added in 1.2. Thanks for the patch, Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13267 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel
2010-05-16 20:48:19 +00:00
parent 34ddcd9939
commit 06ab9eeaf5
2 changed files with 24 additions and 5 deletions

View File

@@ -723,6 +723,10 @@ escaped, because it's not a format character::
This would display as "It is the 4th of September".
.. versionadded:: 1.2
The ``c`` and ``u`` format specification characters were added in Django 1.2.
.. templatetag:: regroup
regroup
@@ -1132,8 +1136,8 @@ Formats a date according to the given format.
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 `now`_ tag. Note that predefined formats may
vary depending on the current locale.
or a custom format, same as the :ttag:`now` tag. Note that predefined formats
may vary depending on the current locale.
For example::
@@ -1780,11 +1784,12 @@ time
Formats a time according to the given format.
Given format can be the predefined one ``TIME_FORMAT``, or a custom format,
same as the `now`_ tag. Note that the predefined format is locale depending.
same as the :ttag:`now` tag. Note that the predefined format is locale-
dependant.
The time filter will only accept parameters in the format string that relate
to the time of day, not the date (for obvious reasons). If you need to
format a date, use the `date`_ filter.
format a date, use the :tfilter:`date` filter.
For example::