[1.8.x] Fixed #25051 -- Clarified return type of {% now %} tag.

Backport of a871cf422d from master
This commit is contained in:
Tim Graham 2015-07-04 08:46:49 -04:00
parent e2acbfb69b
commit 73cbf08159
1 changed files with 2 additions and 2 deletions

View File

@ -810,8 +810,8 @@ This would display as "It is the 4th of September".
You can also use the syntax ``{% now "Y" as current_year %}`` to store the You can also use the syntax ``{% now "Y" as current_year %}`` to store the
output inside a variable. This is useful if you want to use ``{% now %}`` output (as a string) inside a variable. This is useful if you want to use
inside a template tag like :ttag:`blocktrans` for example:: ``{% now %}`` inside a template tag like :ttag:`blocktrans` for example::
{% now "Y" as current_year %} {% now "Y" as current_year %}
{% blocktrans %}Copyright {{ current_year }}{% endblocktrans %} {% blocktrans %}Copyright {{ current_year }}{% endblocktrans %}