summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Rosner <brosner@gmail.com>2008-07-09 18:29:47 +0000
committerBrian Rosner <brosner@gmail.com>2008-07-09 18:29:47 +0000
commit7d45454e55d9eca6afb725d8869aad3946c9b65c (patch)
tree16e42e77578534279e4b0877f35234adf4edbbee
parentd9a2441c482a8b35da3e1cecc18b830d90015c6f (diff)
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
-rw-r--r--django/contrib/admin/options.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py
index 27f8676a64..93f3852416 100644
--- a/django/contrib/admin/options.py
+++ b/django/contrib/admin/options.py
@@ -427,17 +427,17 @@ class ModelAdmin(BaseModelAdmin):
if formsets:
for formset in formsets:
for added_object in formset.new_objects:
- change_message.append(_('Added %s "%s".')
- % (added_object._meta.verbose_name, added_object))
+ change_message.append(_('Added %(name)s "%(object)s".')
+ % {'name': added_object._meta.verbose_name, % 'object': added_object})
for changed_object, changed_fields in formset.changed_objects:
- change_message.append(_('Changed %s for %s "%s".')
- % (get_text_list(changed_fields, _('and')),
- changed_object._meta.verbose_name,
- changed_object))
+ change_message.append(_('Changed %(list)s for %(name)s "%(object)s".')
+ % {'list': get_text_list(changed_fields, _('and')),
+ 'name': changed_object._meta.verbose_name,
+ 'object': changed_object})
for deleted_object in formset.deleted_objects:
- change_message.append(_('Deleted %s "%s".')
- % (deleted_object._meta.verbose_name, deleted_object))
-
+ change_message.append(_('Deleted %(name)s "%(object)s".')
+ % {'name': deleted_object._meta.verbose_name,
+ 'object': deleted_object})
change_message = ' '.join(change_message)
if not change_message:
change_message = _('No fields changed.')