[Django] #17375: 'makemessages' ignores plural from 'blocktrans'
Django
--------------------------------------+--------------------
Reporter: ahagenbruch | Owner: nobody
Type: Bug | Status: new
Component: Internationalization | Version: SVN
Severity: Normal | Keywords:
Triage Stage: Unreviewed | Has patch: 0
Easy pickings: 0 | UI/UX: 0
--------------------------------------+--------------------
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.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375>
Django <https://code.djangoproject.com/>
The Web framework for perfectionists with deadlines.
Django
Type: Bug | Status: new
Internationalization | Resolution:
Severity: Normal | Triage Stage:
Keywords: | Unreviewed
Has patch: 0 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 0
Changes (by claudep):
* needs_better_patch: => 0
* needs_tests: => 0
* needs_docs: => 0
Comment:
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.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:1>
Django
Type: Bug | Status: new
Component: Internationalization | Version: SVN
Keywords: | Triage Stage: Accepted
Changes (by aaugustin):
* stage: Unreviewed => Accepted
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:2>
Django
Reporter: ahagenbruch | Owner: pigletto
Component: Internationalization | Version: SVN
Keywords: | Triage Stage: Accepted
Has patch: 0 | Needs documentation: 0
Changes (by pigletto):
* owner: nobody => pigletto
* needs_tests: 0 => 1
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:3>
Django
Reporter: ahagenbruch | Owner: pigletto
Component: Internationalization | Version: SVN
Keywords: | Triage Stage: Accepted
Has patch: 0 | Needs documentation: 0
Changes (by pigletto):
* needs_tests: 1 => 0
Comment:
This issue doesn't exist anymore in current trunk (1.4).
Attached test for this specific case.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:4>
Django
Reporter: ahagenbruch | Owner: pigletto
Component: Internationalization | Version: SVN
Keywords: | Triage Stage: Accepted
Has patch: 0 | Needs documentation: 0
Changes (by pigletto):
* status: new => assigned
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:5>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Keywords: | Triage Stage: Accepted
Has patch: 0 | Needs documentation: 0
Comment (by claudep):
The only reason it is working in your patch is that the msgid of the
problematic string in test.html has a msgctxt line.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:6>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Keywords: | Triage Stage: Accepted
Has patch: 0 | Needs documentation: 0
Comment (by pigletto):
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.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:7>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Keywords: | Triage Stage: Accepted
Has patch: 0 | Needs documentation: 0
Changes (by pigletto):
* cc: pigletto (added)
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:8>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Keywords: | Triage Stage: Accepted
Has patch: 0 | Needs documentation: 0
Comment (by pigletto):
Uploaded issue_17375.2.diff that uses --files-from parameter for xgettext.
Now patch seems to be complete for me.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:9>
Django
Type: Bug | Status: assigned
Internationalization | Resolution:
Keywords: | checkin
Changes (by ext):
* stage: Accepted => Ready for checkin
Comment:
Looks and works OK.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:10>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Component: | Version: SVN
Internationalization | Resolution:
Severity: Normal | Triage Stage: Ready for
Keywords: | checkin
Has patch: 0 | Needs documentation: 0
Comment (by jezdez):
This doesn't apply to trunk anymore.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:11>
Django
Type: Bug | Status: assigned
Keywords: | Triage Stage: Accepted
Needs tests: 0 | Patch needs improvement: 1
Changes (by aaugustin):
* needs_better_patch: 0 => 1
* has_patch: 0 => 1
* stage: Ready for checkin => Accepted
Comment:
Indeed, patch no longer applies.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:12>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Keywords: | Triage Stage: Accepted
Has patch: 1 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 1
Comment (by pigletto):
OK, I'm going to update it soon
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:13>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Keywords: | Triage Stage: Accepted
Has patch: 1 | Needs documentation: 0
Changes (by pigletto):
* needs_better_patch: 1 => 0
Comment:
Patch updated
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:14>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Severity: Normal | Resolution:
Keywords: | Triage Stage: Accepted
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Comment (by claudep):
#22671 was a duplicate
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:15>
Django
Reporter: ahagenbruch | Owner: pigletto
Type: Bug | Status: assigned
Component: Internationalization | Version: master
Severity: Normal | Resolution:
Keywords: | Triage Stage: Accepted
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Changes (by timo):
* needs_better_patch: 0 => 1
Comment:
Patch no longer applies cleanly.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:16>
Django
Reporter: ahagenbruch | Owner:
| sergeykolosov
Type: Bug | Status: assigned
Component: | Version: master
Internationalization |
Severity: Normal | Resolution:
Keywords: | Triage Stage: Accepted
Has patch: 1 | Needs documentation: 0
Needs tests: 0 | Patch needs improvement: 1
Changes (by sergeykolosov):
* cc: m17.admin@… (added)
* owner: pigletto => sergeykolosov
Comment:
Working on it.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:17>
Django
Reporter: ahagenbruch | Owner:
| sergeykolosov
Type: Bug | Status: assigned
Component: | Version: master
Internationalization |
Severity: Normal | Resolution:
Keywords: | Triage Stage: Accepted
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Changes (by sergeykolosov):
* needs_better_patch: 1 => 0
Comment:
Created a PR with another implementation based on the original idea from
Claude:
https://github.com/django/django/pull/5187
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:18>
Django
Reporter: ahagenbruch | Owner:
| sergeykolosov
Type: Bug | Status: assigned
Component: | Version: master
Internationalization |
Severity: Normal | Resolution:
Keywords: | Triage Stage: Accepted
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Changes (by timgraham):
* needs_better_patch: 0 => 1
Comment:
Left some comments for improvement.
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:19>
Django
Reporter: ahagenbruch | Owner:
| sergeykolosov
Type: Bug | Status: assigned
Component: | Version: master
Internationalization |
Severity: Normal | Resolution:
Keywords: | Triage Stage: Accepted
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Changes (by sergeykolosov):
* needs_better_patch: 1 => 0
Comment:
PR updated: https://github.com/django/django/pull/5187
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:20>
Django
Reporter: ahagenbruch | Owner:
| sergeykolosov
Type: Bug | Status: assigned
Component: | Version: master
Internationalization |
Severity: Normal | Resolution:
| checkin
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Changes (by timgraham):
* stage: Accepted => Ready for checkin
Comment:
Claude, could you take a look?
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:21>
Django
Reporter: ahagenbruch | Owner:
| sergeykolosov
Type: Bug | Status: assigned
Component: | Version: master
Internationalization |
Severity: Normal | Resolution:
Keywords: | Triage Stage: Ready for
| checkin
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Comment (by claudep):
Looks like a solid patch. Thanks Sergey!
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:22>
Django
Reporter: ahagenbruch | Owner:
| sergeykolosov
Component: | Version: master
Internationalization |
Severity: Normal | Resolution: fixed
Keywords: | Triage Stage: Ready for
| checkin
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Changes (by Tim Graham <timograham@…>):
* status: assigned => closed
* resolution: => fixed
Comment:
In [changeset:"e75882332c8593a1d5a47f9f1e099e9201b12296" e7588233]:
{{{
#!CommitTicketReference repository=""
revision="e75882332c8593a1d5a47f9f1e099e9201b12296"
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.
}}}
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:23>
Django
Reporter: ahagenbruch | Owner:
| sergeykolosov
Type: Bug | Status: closed
Component: | Version: master
Internationalization |
Severity: Normal | Resolution: fixed
Keywords: | Triage Stage: Ready for
| checkin
Has patch: 1 | Needs documentation: 0
Easy pickings: 0 | UI/UX: 0
Comment (by Claude Paroz <claude@…>):
In [changeset:"185f90c45f4398f186ee9dffe1c9bd7392a47686" 185f90c]:
{{{
#!CommitTicketReference repository=""
revision="185f90c45f4398f186ee9dffe1c9bd7392a47686"
Adapted _assertPoLocComment for multi-file source lines in po files
Refs #17375.
}}}
--
Ticket URL: <https://code.djangoproject.com/ticket/17375#comment:24>