Ticket #12952: django-admin-history-verbose-name.diff

django/contrib/admin/options.py

@@ -553 +553 @@
         """
         Construct a change message from a changed object.
         """
+        def convert_changed_list(obj, changed_data):
+            cls = type(obj)
+            verbose_names = []
+            for field in changed_data:
+                try:
+                    verbose_names.append(cls._meta.get_field_by_name(field)[0].verbose_name)
+                except FieldDoesNotExist:
+                    verbose_names.append(field)
+            return verbose_names
+        
         change_message = []
         if form.changed_data:
-            change_message.append(_('Changed %s.') % get_text_list(form.changed_data, _('and')))
+            change_message.append(_('Changed %s.') %
+                get_text_list(convert_changed_list(form.instance, form.changed_data), _('and')))
 
         if formsets:
             for formset in formsets:
@@ -565 +576 @@
                                              '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')),
+                                          % {'list': get_text_list(convert_changed_list(changed_object, changed_fields), _('and')),
                                              'name': changed_object._meta.verbose_name,
                                              'object': force_unicode(changed_object)})
                 for deleted_object in formset.deleted_objects: