Commit 4871b654 authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[1.1.X] Fixed #12966 - Force unicode of verbose labels in admin change messages. 

Backport of r12627.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 1b2b3b0d

django/contrib/admin/options.py

+3 −3
Original line number Diff line number Diff line
@@ -532,16 +532,16 @@ class ModelAdmin(BaseModelAdmin): 
            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.')