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". 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 .. templatetag:: regroup
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``, Given format can be one of the predefined ones ``DATE_FORMAT``,
``DATETIME_FORMAT``, ``SHORT_DATE_FORMAT`` or ``SHORT_DATETIME_FORMAT``, ``DATETIME_FORMAT``, ``SHORT_DATE_FORMAT`` or ``SHORT_DATETIME_FORMAT``,
or a custom format, same as the `now`_ tag. Note that predefined formats may or a custom format, same as the :ttag:`now` tag. Note that predefined formats
vary depending on the current locale. may vary depending on the current locale.
For example:: For example::
@ -1780,11 +1784,12 @@ time
Formats a time according to the given format. Formats a time according to the given format.
Given format can be the predefined one ``TIME_FORMAT``, or a custom 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 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 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:: For example::

View File

@ -235,7 +235,7 @@ definitions to use the new prototype as soon as possible.
If your ``get_db_prep_*()`` methods made no use of the database If your ``get_db_prep_*()`` methods made no use of the database
connection, you should be able to upgrade by renaming connection, you should be able to upgrade by renaming
``get_db_prep_value()`` to ``get_prep_value()`` and ``get_db_prep_value()`` to ``get_prep_value()`` and
``get_db_prep_lookup()`` to ``get_prep_lookup()`. If you require ``get_db_prep_lookup()`` to ``get_prep_lookup()``. If you require
database specific conversions, then you will need to provide an database specific conversions, then you will need to provide an
implementation ``get_db_prep_*`` that uses the ``connection`` implementation ``get_db_prep_*`` that uses the ``connection``
argument to resolve database-specific values. argument to resolve database-specific values.
@ -997,3 +997,17 @@ If a user has JavaScript enabled in their browser, the interface for
inline objects in the admin now allows inline objects to be inline objects in the admin now allows inline objects to be
dynamically added and removed. Users without JavaScript-enabled dynamically added and removed. Users without JavaScript-enabled
browsers will see no change in the behavior of inline objects. browsers will see no change in the behavior of inline objects.
New ``now`` template tag format specifier characters: ``c`` and ``u``
---------------------------------------------------------------------
The argument to the :ttag:`now` has gained two new format characters:
``c`` to specify that a datetime value should be formatted in ISO 8601
format, and ``u`` that allows output of the microseconds part of a
datetime or time value.
These are also available in others parts like the :tfilter:`date` and
:tfilter:`time` template filters, the ``humanize`` template tag library
and the new `format localization`_ framework.
.. _format localization: `Improved localization`_