Skip to content
Browse files

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

…e messages.

Backport of r12627.

git-svn-id: bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 1b2b3b0 commit 4871b654b59544ba99a6ab5b9c70f9c220d954fa @jezdez jezdez committed Mar 1, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 django/contrib/admin/
6 django/contrib/admin/
@@ -532,16 +532,16 @@ def construct_change_message(self, request, form, formsets):
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.')

0 comments on commit 4871b65

Please sign in to comment.
Something went wrong with that request. Please try again.