From 73cbf08159236c0529e02ed11b2a733c5102bfe2 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Sat, 4 Jul 2015 08:46:49 -0400 Subject: [1.8.x] Fixed #25051 -- Clarified return type of {% now %} tag. Backport of a871cf422d8f7a15d3029684538136e0c92f99dc from master --- docs/ref/templates/builtins.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs') diff --git a/docs/ref/templates/builtins.txt b/docs/ref/templates/builtins.txt index b4ca36b5e4..b0bcfc92c5 100644 --- a/docs/ref/templates/builtins.txt +++ b/docs/ref/templates/builtins.txt @@ -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 -output inside a variable. This is useful if you want to use ``{% now %}`` -inside a template tag like :ttag:`blocktrans` for example:: +output (as a string) 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 %} -- cgit v1.3