mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 02:09:13 +00:00
Code Issues 32 Releases Wiki Activity

[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.

Browse Source 
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
This commit is contained in:
Ramiro Morales 2011-03-01 03:07:25 +00:00
parent b5b5d3c280
commit 8d3ee29847
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/ref/templates/builtins.txt
View File

@ -639,12 +639,9 @@ See :doc:`Custom tag and filter libraries </howto/custom-template-tags>` for mor
now now
~~~ ~~~
Display the current date and/or time, according to the given string. Display the current date and/or time, using a format according to the given
string. Such string can contain format specifiers characters as described
Given format can be one of the predefined ones ``DATE_FORMAT``, in the :tfilter:`date` filter section.
``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.
Example:: Example::