Author: brosner
Date: 2008-07-09 13:29:47 -0500 (Wed, 09 Jul 2008)
New Revision: 7874
Modified:
django/branches/newforms-admin/django/contrib/admin/options.py
Log:
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.
Modified: django/branches/newforms-admin/django/contrib/admin/options.py
===================================================================
--- django/branches/newforms-admin/django/contrib/admin/options.py
2008-07-09 18:09:38 UTC (rev 7873)
+++ django/branches/newforms-admin/django/contrib/admin/options.py
2008-07-09 18:29:47 UTC (rev 7874)
@@ -427,17 +427,17 @@
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.')
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
