can_delete and can_order labels are not internationalized

[Javier de la Rosa]

In ​forms/formsets.py, lines 241, 243 and 245:

[...]
                form.fields[ORDERING_FIELD_NAME] = IntegerField(label='Order', initial=index+1, required=False)
            else:
                form.fields[ORDERING_FIELD_NAME] = IntegerField(label='Order', required=False)
        if self.can_delete:
            form.fields[DELETION_FIELD_NAME] = BooleanField(label='Delete', required=False)
[...]

I think this should be

[...]
                form.fields[ORDERING_FIELD_NAME] = IntegerField(label=_('Order'), initial=index+1, required=False)
            else:
                form.fields[ORDERING_FIELD_NAME] = IntegerField(label=_('Order'), required=False)
        if self.can_delete:
            form.fields[DELETION_FIELD_NAME] = BooleanField(label=_('Delete'), required=False)
[...]

I attach a patch file.

[Javier de la Rosa]

I attach a patch file.

[Javier de la Rosa]

Patch file and regression test.

[Manuel Saelices]

You've missed upload the .mo file to patch. You can do this with this order (executed in django/conf dir):

 $ django-admin.py compilemessages

[Manuel Saelices]

Also you missed putting that new msgid in other catalogs, with this command:

  $ django-admin.py makemessages -a

[Malcolm Tredinnick]

Woah, woah.. everybody slow down! This patch should only be adding the ugettext_lazy() call to the source. That is the internationalisation bug.

The localisation updates will be done by the respective translators. Code patches should never touch message catalogs (nor should MO files ever be put into a translation patch, since they are regenerated before commits). Putting a translation update into a code patch is mixing two separate things.

[Manuel Saelices]

@mtredinnick, ok, you're right, but in this case, for the regression tests, you at least need put the spanish translation of "Order". The test case will fail in other case.

what do you think about this?

[Malcolm Tredinnick]

Leave the test out. We don't need a test for every translated string in Django.

[Manuel Saelices]

Right :-)

[Manuel Saelices]

Patch without tests and using ugettext instead of ugettext_lazy

[Jacob]

(In [8562]) Fixed #8543: added translation markings to can_delete and can_order form labels. Thanks, msaelices.

[Manuel Saelices]

@jacob, it's better to give thanks to Versae. He created the first patch :-)

[Jacob]

Milestone 1.0 deleted