summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/ref/templates/builtins.txt12
-rw-r--r--docs/releases/1.8.txt3
2 files changed, 15 insertions, 0 deletions
diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt
index 2b3d48d90e..146f2eacd6 100644
--- a/docs/ref/templates/builtins.txt
+++ b/docs/ref/templates/builtins.txt
@@ -799,6 +799,18 @@ This would display as "It is the 4th of September".
It is {% now "SHORT_DATETIME_FORMAT" %}
+
+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 %}``
+inside a template tag like :ttag:`blocktrans` for example::
+
+ {% now "Y" as current_year %}
+ {% blocktrans %}Copyright {{ current_year }}{% endblocktrans %}
+
+.. versionadded:: 1.8
+
+The ability to use the "as" syntax was added.
+
.. templatetag:: regroup
regroup
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 73ad244cfb..b342234ef9 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -419,6 +419,9 @@ Templates
* Added a :class:`locmem.Loader <django.template.loaders.locmem.Loader>`
class that loads Django templates from a Python dictionary.
+* The :ttag:`now` tag can now store its output in a context variable with the
+ usual syntax: ``{% now 'j n Y' as varname %}``.
+
Requests and Responses
^^^^^^^^^^^^^^^^^^^^^^