Django

Code

Changeset 2779

Show
Ignore:
Timestamp:
04/28/06 20:18:20 (2 years ago)
Author:
adrian
Message:

magic-removal: Fixed #1678 -- Changed admin delete confirmation page to use verbose_name instead of name. Thanks, Christopher Lenz

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/magic-removal/django/contrib/admin/views/main.py

    r2720 r2779  
    469469                # admin or is edited inline. 
    470470                nh(deleted_objects, current_depth, [_('One or more %(fieldname)s in %(name)s: %(obj)s') % \ 
    471                     {'fieldname': related.field.name, 'name': related.opts.verbose_name, 'obj': escape(str(sub_obj))}, []]) 
     471                    {'fieldname': related.field.verbose_name, 'name': related.opts.verbose_name, 'obj': escape(str(sub_obj))}, []]) 
    472472            else: 
    473473                # Display a link to the admin page. 
    474474                nh(deleted_objects, current_depth, [ 
    475                     (_('One or more %(fieldname)s in %(name)s:') % {'fieldname': related.field.name, 'name':related.opts.verbose_name}) + \ 
     475                    (_('One or more %(fieldname)s in %(name)s:') % {'fieldname': related.field.verbose_name, 'name':related.opts.verbose_name}) + \ 
    476476                    (' <a href="../../../../%s/%s/%s/">%s</a>' % \ 
    477477                        (related.opts.app_label, related.opts.module_name, sub_obj._get_pk_val(), escape(str(sub_obj)))), []])