mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
newforms-admin: Fixed #7564 -- Make position argument string interpolation use keywords instead. Works better for translators and get rid of make-messages.py warnings. Thanks Marc Garcia for the report and permon for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7874 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
d9a2441c48
commit
7d45454e55
@ -427,17 +427,17 @@ class ModelAdmin(BaseModelAdmin):
|
|||||||
if formsets:
|
if formsets:
|
||||||
for formset in formsets:
|
for formset in formsets:
|
||||||
for added_object in formset.new_objects:
|
for added_object in formset.new_objects:
|
||||||
change_message.append(_('Added %s "%s".')
|
change_message.append(_('Added %(name)s "%(object)s".')
|
||||||
% (added_object._meta.verbose_name, added_object))
|
% {'name': added_object._meta.verbose_name, % 'object': added_object})
|
||||||
for changed_object, changed_fields in formset.changed_objects:
|
for changed_object, changed_fields in formset.changed_objects:
|
||||||
change_message.append(_('Changed %s for %s "%s".')
|
change_message.append(_('Changed %(list)s for %(name)s "%(object)s".')
|
||||||
% (get_text_list(changed_fields, _('and')),
|
% {'list': get_text_list(changed_fields, _('and')),
|
||||||
changed_object._meta.verbose_name,
|
'name': changed_object._meta.verbose_name,
|
||||||
changed_object))
|
'object': changed_object})
|
||||||
for deleted_object in formset.deleted_objects:
|
for deleted_object in formset.deleted_objects:
|
||||||
change_message.append(_('Deleted %s "%s".')
|
change_message.append(_('Deleted %(name)s "%(object)s".')
|
||||||
% (deleted_object._meta.verbose_name, deleted_object))
|
% {'name': deleted_object._meta.verbose_name,
|
||||||
|
'object': deleted_object})
|
||||||
change_message = ' '.join(change_message)
|
change_message = ' '.join(change_message)
|
||||||
if not change_message:
|
if not change_message:
|
||||||
change_message = _('No fields changed.')
|
change_message = _('No fields changed.')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user