django-admin.py makemessages failure on ' symbol in templates comment block

[andrew@…]

django-admin.py makemessages fails on mezzanine.core application default admin/base_site.html template (attachment:base_site.html​)

$ django-admin.py makemessages -l ru
processing language ru
Error: errors happened while running xgettext on base_site.html
./templates/admin/base_site.html.py:15: warning: unterminated string
./templates/admin/base_site.html.py:16: warning: unterminated string
./templates/admin/base_site.html.py:21: warning: unterminated string

It caused by xgettext when it see "Mezzanine's" string in this lines. In django v1.2 error doesn't appears.

[Jannis Leidel]

Which version of gettext do you use? Running xgettext --version should give you that info.

[andrew@…]

xgettext (GNU gettext-tools) 0.18.1

[Jannis Leidel]

Hm, this is probably related to #14045 and #15495. Can you check with gettext 0.17?

[andrew@…]

Same situation with gettext 0.17.

[grad@grad-book core]$ LANG=C xgettext --version
xgettext (GNU gettext-tools) 0.17
...

[grad@grad-book core]$ LANG=C PYTHONPATH=/home/grad/repos/django /home/grad/repos/django/django/bin/django-admin.py --version
1.3 rc 1 SVN-15876
[grad@grad-book core]$ LANG=C PYTHONPATH=/home/grad/repos/django /home/grad/repos/django/django/bin/django-admin.py makemessages -l ru
processing language ru
Error: errors happened while running xgettext on base_site.html
./templates/admin/base_site.html.py:15: warning: unterminated string
./templates/admin/base_site.html.py:16: warning: unterminated string
./templates/admin/base_site.html.py:21: warning: unterminated string

[grad@grad-book core]$ LANG=C django-admin.py --version
1.2.5
[grad@grad-book core]$ LANG=C django-admin.py makemessages -l ru
processing language ru
[grad@grad-book core]$ echo $?
0

[andrew@…]

Is there any way to see content of ./templates/admin/base_site.html.py file? Does django any change in template before passing it to xgettext?

[Claude Paroz]

Handle properly multiline translator comments

[Claude Paroz]

Same patch which doesn't replace newlines (following ramiro's idea)

[Ramiro Morales]

New patch for the issue -- preseves line numbers in .po file comments, expanded tests

[Ramiro Morales]

15632-5.diff is a further evolution of the patch we were discussing with Claude on IRC. I wasn't comfortable with ignoring the multi-line comments in templates because that means we get non-accurate line numbers #: path/to/template/file.html:NN comments in the PO files, so this patch also solves this. Tests were also expanded to cover some edge cases.

[Ramiro Morales]

In [15882]:

Fixed #15632 -- Ignore unrelated content in template multi-line comment blocks when looking for tokens that identify comments for translators. Thanks andrew AT ie-grad DOT ru for the report and Claude Paroz for spotting the problem and helping to fix it.

[Jacob]

Milestone 1.3 deleted