summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamiro Morales <cramm0@gmail.com>2010-10-25 12:57:36 +0000
committerRamiro Morales <cramm0@gmail.com>2010-10-25 12:57:36 +0000
commit188a8e39fd1619b2e60f1846348ba237b892cc9f (patch)
treebfaf77ab6f05efdf2d681a764a08636d5c4c8097
parent552acc652d5cad1e2664809a437702792a73b1e8 (diff)
[1.2.X] Removed obsolete 'date' filter -> 'now' tag link.
Backport of [14346] from trunk git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@14347 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--docs/ref/templates/builtins.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index c40d71a322..f65e94b825 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -1151,17 +1151,17 @@ If ``value`` is a ``datetime`` object (e.g., the result of
``datetime.datetime.now()``), the output will be the string
``'Wed 09 Jan 2008'``.
-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 :ttag:`now` tag. Note that predefined formats
-may vary depending on the current locale.
+The format passed can be one of the predefined ones ``DATE_FORMAT``,
+``DATETIME_FORMAT``, ``SHORT_DATE_FORMAT`` or ``SHORT_DATETIME_FORMAT``, or a
+custom format that uses the format specifiers shown in the table above. Note
+that predefined formats may vary depending on the current locale.
Assuming that :setting:`USE_L10N` is ``True`` and :setting:`LANGUAGE_CODE` is,
for example, ``"es"``, then for::
{{ value|date:"SHORT_DATE_FORMAT" }}
-the output will be the string ``"09/01/2008"`` (The ``"SHORT_DATE_FORMAT"``
+the output would be the string ``"09/01/2008"`` (the ``"SHORT_DATE_FORMAT"``
format specifier for the ``es`` locale as shipped with Django is ``"d/m/Y"``).
When used without a format string::