Commit 3b9a8271 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

[1.1.X] Fixed #12278 -- Corrected an example usage of string_concat. Thanks to...

[1.1.X] Fixed #12278 -- Corrected an example usage of string_concat. Thanks to loumz for the report, and timo for the patch.

Backport of r13167 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13173 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 5be6c7fc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ is included in a string. For example::
    ...
    name = ugettext_lazy(u'John Lennon')
    instrument = ugettext_lazy(u'guitar')
    result = string_concat([name, ': ', instrument])
    result = string_concat(name, ': ', instrument)

In this case, the lazy translations in ``result`` will only be converted to
strings when ``result`` itself is used in a string (usually at template