Branch: refs/heads/master
Home: https://github.com/django/django
Commit: 47ddd6a4082d55d8856b7e6beac553485dd627f7
https://github.com/django/django/commit/47ddd6a4082d55d8856b7e6beac553485dd627f7
Author: Ramiro Morales <cra...@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)
Changed paths:
M django/utils/translation/__init__.py
M django/utils/translation/trans_real.py
M docs/releases/1.6.txt
M docs/topics/i18n/translation.txt
M docs/topics/templates.txt
M tests/regressiontests/i18n/commands/extraction.py
A tests/regressiontests/i18n/commands/templates/comments.thtml
Log Message:
-----------
Fixed #19552 -- Enhanced makemessages handling of ``{# #}``-style template
comments.
They are simply ignored now. This allows for a more correct behavior when
they are placed before translatable constructs on the same line.
Previously, the latter were wrongly ignored because the former were
preserved when converting template code to the internal Python-syntax
form later fed to xgettext but Python has no ``/* ... */``-style
comments.
Also, special comments directed to translators are now only taken in
account when they are located at the end of a line. e.g.::
{# Translators: ignored #}{% trans "Literal A" %}{# Translators: valid,
associated with "Literal B" below #}
{% trans "Literal B" %}
Behavior of ``{% comment %}...{% endcomment %}``tags remains unchanged.
Thanks juneih at redpill-linpro dot com for the report and Claude for
his work on the issue.
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to django-updates+unsubscr...@googlegroups.com.
To post to this group, send email to django-updates@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
