Author: jezdez Date: 2010-03-01 08:36:45 -0600 (Mon, 01 Mar 2010) New Revision: 12628
Modified: django/branches/releases/1.1.X/django/contrib/admin/options.py Log: [1.1.X] Fixed #12966 - Force unicode of verbose labels in admin change messages. Backport of r12627. Modified: django/branches/releases/1.1.X/django/contrib/admin/options.py =================================================================== --- django/branches/releases/1.1.X/django/contrib/admin/options.py 2010-03-01 14:34:24 UTC (rev 12627) +++ django/branches/releases/1.1.X/django/contrib/admin/options.py 2010-03-01 14:36:45 UTC (rev 12628) @@ -532,16 +532,16 @@ for formset in formsets: for added_object in formset.new_objects: change_message.append(_('Added %(name)s "%(object)s".') - % {'name': added_object._meta.verbose_name, + % {'name': force_unicode(added_object._meta.verbose_name), 'object': force_unicode(added_object)}) for changed_object, changed_fields in formset.changed_objects: change_message.append(_('Changed %(list)s for %(name)s "%(object)s".') % {'list': get_text_list(changed_fields, _('and')), - 'name': changed_object._meta.verbose_name, + 'name': force_unicode(changed_object._meta.verbose_name), 'object': force_unicode(changed_object)}) for deleted_object in formset.deleted_objects: change_message.append(_('Deleted %(name)s "%(object)s".') - % {'name': deleted_object._meta.verbose_name, + % {'name': force_unicode(deleted_object._meta.verbose_name), 'object': force_unicode(deleted_object)}) change_message = ' '.join(change_message) return change_message or _('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 django-upda...@googlegroups.com. To unsubscribe from this group, send email to django-updates+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/django-updates?hl=en.