diff options
| author | Ramiro Morales <cramm0@gmail.com> | 2011-03-01 03:07:25 +0000 |
|---|---|---|
| committer | Ramiro Morales <cramm0@gmail.com> | 2011-03-01 03:07:25 +0000 |
| commit | 8d3ee2984796336285961a8f9a00e1ceb77f2dd4 (patch) | |
| tree | bb2d834e93ab48886999a8c3e95a83c5d30c4e6d | |
| parent | b5b5d3c2800dae65cbd5466212844a422f7c95d8 (diff) | |
[1.2.X] Reverted 'now' template tag documentation changes so it describes the real code implementation regarding (lack of) interaction with L10N machinery. Refs #15263. Thanks danielr for the report.
Backport of [15678] from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@15679 bcc190cf-cafb-0310-a4f2-bffc1f526a37
| -rw-r--r-- | docs/ref/templates/builtins.txt | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index 5cf7c0533b..011d389c83 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -639,12 +639,9 @@ See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for mor now ~~~ -Display the current date and/or time, according to the given string. - -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 :tfilter:`date` filter. Note that predefined -formats may vary depending on the current locale. +Display the current date and/or time, using a format according to the given +string. Such string can contain format specifiers characters as described +in the :tfilter:`date` filter section. Example:: |