Fixed #10503 -- Clarified docs on the operation of the noop option to {% trans %}. Thanks to liangent for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10151 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
2aa8890136
commit
539bebab3f
|
@ -251,9 +251,9 @@ The ``{% trans %}`` template tag translates either a constant string
|
||||||
<title>{% trans "This is the title." %}</title>
|
<title>{% trans "This is the title." %}</title>
|
||||||
<title>{% trans myvar %}</title>
|
<title>{% trans myvar %}</title>
|
||||||
|
|
||||||
If the ``noop`` option is present, variable lookup still takes place but the
|
If the ``noop`` option is present, variable lookup still takes place, but the
|
||||||
translation is skipped. This is useful when "stubbing out" content that will
|
original text will be returned unchanged. This is useful when "stubbing out"
|
||||||
require translation in the future::
|
content that will require translation in the future::
|
||||||
|
|
||||||
<title>{% trans "myvar" noop %}</title>
|
<title>{% trans "myvar" noop %}</title>
|
||||||
|
|
||||||
|
@ -995,9 +995,9 @@ test or compile a changed message file, you will need the ``gettext`` utilities:
|
||||||
* Add ``;C:\Program Files\gettext-utils\bin`` at the end of the
|
* Add ``;C:\Program Files\gettext-utils\bin`` at the end of the
|
||||||
``Variable value`` field
|
``Variable value`` field
|
||||||
|
|
||||||
You may also use ``gettext`` binaries you have obtained elsewhere, so long as
|
You may also use ``gettext`` binaries you have obtained elsewhere, so long as
|
||||||
the ``xgettext --version`` command works properly. Some version 0.14.4 binaries
|
the ``xgettext --version`` command works properly. Some version 0.14.4 binaries
|
||||||
have been found to not support this command. Do not attempt to use Django
|
have been found to not support this command. Do not attempt to use Django
|
||||||
translation utilities with a ``gettext`` package if the command ``xgettext
|
translation utilities with a ``gettext`` package if the command ``xgettext
|
||||||
--version`` entered at a Windows command prompt causes a popup window saying
|
--version`` entered at a Windows command prompt causes a popup window saying
|
||||||
"xgettext.exe has generated errors and will be closed by Windows".
|
"xgettext.exe has generated errors and will be closed by Windows".
|
||||||
|
|
Loading…
Reference in New Issue