Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] Reverted 'now' template tag documentation changes so it descr…

…ibes 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
  • Loading branch information...
commit 8d3ee2984796336285961a8f9a00e1ceb77f2dd4 1 parent b5b5d3c
@ramiro ramiro authored
Showing with 3 additions and 6 deletions.
  1. +3 −6 docs/ref/templates/builtins.txt
View
9 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::
Please sign in to comment.
Something went wrong with that request. Please try again.