Missing i18n string in django.contrib.admin.options

[Petar Marić]

Source line 559:
raise Http404('%s object with primary key %r does not exist.' % (force_unicode(opts.verbose_name), escape(object_id)))

Expected:
raise Http404(_('%s object with primary key %r does not exist.') % (force_unicode(opts.verbose_name), escape(object_id)))

[Marc Fargas]

Patch

[Marc Fargas]

Patch attached, please commit ASAP to have translations in time for 1.0.1 if possible ;)

[Karen Tracey]

(In [9360]) Fixed #9506 -- Marked error string for translation.

[Karen Tracey]

(In [9362]) [1.0.X] Fixed #9506 -- Marked error string for translation.

[9360] from trunk.

[Jarek Zgoda]

The convention used in this patch prevents locale catalog updating:

jarek:~/install/django/django$ LANG=C django-admin.py makemessages -l pl
processing language pl
Error: errors happened while running xgettext on options.py
./contrib/admin/options.py:559: warning: 'msgid' format string with unnamed arguments cannot be properly localized:
                                         The translator cannot reorder the arguments.
                                         Please consider using a format string with named arguments,
                                         and a mapping instead of a tuple for the arguments.

[Karen Tracey]

Oops. I'll fix it.

[Karen Tracey]

(In [9363]) Fixed #9506 take 2 -- Marked the message properly for translation, in both places it appears in the source.

[Karen Tracey]

(In [9364]) [1.0.X] Fixed #9506 take 2 -- Marked the message properly for translation, in both places it appears in the source.

[9363] from trunk.

[Ramiro Morales]

(In [9421]) [1.0.X] Updated Argentinian spanish translations, refs #9506 and related commits.

Port of [9420] from trunk.