'makemessages' ignores plural from 'blocktrans'

[ahagenbruch]

I have two files with equal strings to translate, in the first file
with trans and in the second file with blocktrans and a plural form:

a.html:
{% trans 'My string' %}

b.html:
{% blocktrans count counter=mylist|length %}My string{% plural %}My strings{% endblocktrans %}

and when I run django-admin.py makemessages -l de I get

django.po
#: templates/a.html:108
#: templates/b.html:3
msgid "My string"
msgstr ""

and not as you'd expect

django.po
#: templates/a.html:108
#: templates/b.html:3
msgid "My string"
msgid_plural "My strings"
msgstr[0] ""
msgstr[1] ""

I can reproduce this for similar structures in other files.
blocktrans strings that don't have trans equivalents in other
files correctly produce entries with plural forms in the .po file.

[Claude Paroz]

Seems to trigger this bug: ​https://savannah.gnu.org/bugs/index.php?35027

One possible workaround in makemessages could be to pass a list of files to xgettext instead of concatenating messages for each individual file, as xgettext seems to properly handle the merge.

[Maciej Wiśniowski]

This issue doesn't exist anymore in current trunk (1.4).

Attached test for this specific case.

[Claude Paroz]

The only reason it is working in your patch is that the msgid of the problematic string in test.html has a msgctxt line.

[Maciej Wiśniowski]

Ok, right, it fails for blocktrans that doesn't use 'context'. Uploaded patch solves issue as suggested by using xgettext call with multiple files at once.

One thing to modify there yet is to make use of -f, --files-from in cmd for xgettext, instead of passing great amount of parameters.

[Maciej Wiśniowski]

Uploaded issue_17375.2.diff that uses --files-from parameter for xgettext. Now patch seems to be complete for me.

[Jakub Wiśniowski]

Looks and works OK.

[Jannis Leidel]

This doesn't apply to trunk anymore.

[Aymeric Augustin]

Indeed, patch no longer applies.

[Maciej Wiśniowski]

OK, I'm going to update it soon

[Maciej Wiśniowski]

Patch updated to current trunk

[Maciej Wiśniowski]

Patch updated

[Claude Paroz]

#22671 was a duplicate

[Tim Graham]

Patch no longer applies cleanly.

[Sergey Kolosov]

Working on it.

[Sergey Kolosov]

Created a PR with another implementation based on the original idea from Claude:
​https://github.com/django/django/pull/5187

[Tim Graham]

Left some comments for improvement.

[Sergey Kolosov]

PR updated: ​https://github.com/django/django/pull/5187

[Tim Graham]

Claude, could you take a look?

[Claude Paroz]

Looks like a solid patch. Thanks Sergey!

[Tim Graham <timograham@…>]

In e7588233:

Fixed #17375 -- Changed makemessages to use xgettext with --files-from

Changed the way makemessages invokes xgettext from one call per
translatable file to one call per locale directory (using --files-from).
This allows to avoid ​https://savannah.gnu.org/bugs/index.php?35027 and,
as a positive side effect, speeds up localization build.

[Claude Paroz <claude@…>]

In 185f90c:

Adapted _assertPoLocComment for multi-file source lines in po files

Refs #17375.