Django

Code

Changeset 8144

Show
Ignore:
Timestamp:
07/29/08 19:52:01 (5 months ago)
Author:
mtredinnick
Message:

Fixed #7992 -- Interpolate UTF-8 verbose_names correctly into unicode strings
in the admin interface. Patch from aabele. Refs #8016.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/admin/options.py

    r8136 r8144  
    348348        pk_value = new_object._get_pk_val() 
    349349        LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), ADDITION) 
    350         msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': opts.verbose_name, 'obj': new_object} 
     350        msg = _('The %(name)s "%(obj)s" was added successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': new_object} 
    351351        # Here, we distinguish between different save types by checking for 
    352352        # the presence of keys in request.POST. 
    …… 
    362362                (escape(pk_value), escape(new_object))) 
    363363        elif request.POST.has_key("_addanother"): 
    364             request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name)) 
     364            request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name))) 
    365365            return HttpResponseRedirect(request.path) 
    366366        else: 
    …… 
    418418        LogEntry.objects.log_action(request.user.id, ContentType.objects.get_for_model(self.model).id, pk_value, force_unicode(new_object), CHANGE, change_message) 
    419419 
    420         msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': opts.verbose_name, 'obj': new_object} 
     420        msg = _('The %(name)s "%(obj)s" was changed successfully.') % {'name': force_unicode(opts.verbose_name), 'obj': new_object} 
    421421        if request.POST.has_key("_continue"): 
    422422            request.user.message_set.create(message=msg + ' ' + _("You may edit it again below.")) 
    …… 
    426426                return HttpResponseRedirect(request.path) 
    427427        elif request.POST.has_key("_saveasnew"): 
    428             request.user.message_set.create(message=_('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': opts.verbose_name, 'obj': new_object}) 
     428            request.user.message_set.create(message=_('The %(name)s "%(obj)s" was added successfully. You may edit it again below.') % {'name': force_unicode(opts.verbose_name), 'obj': new_object}) 
    429429            return HttpResponseRedirect("../%s/" % pk_value) 
    430430        elif request.POST.has_key("_addanother"): 
    431             request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % opts.verbose_name)) 
     431            request.user.message_set.create(message=msg + ' ' + (_("You may add another %s below.") % force_unicode(opts.verbose_name))) 
    432432            return HttpResponseRedirect("../add/") 
    433433        else: 
    …… 
    507507 
    508508        context = { 
    509             'title': _('Add %s') % opts.verbose_name, 
     509            'title': _('Add %s') % force_unicode(opts.verbose_name), 
    510510            'adminform': adminForm, 
    511511            'is_popup': request.REQUEST.has_key('_popup'), 
    …… 
    537537 
    538538        if obj is None: 
    539             raise Http404('%s object with primary key %r does not exist.' % (opts.verbose_name, escape(object_id))) 
     539            raise Http404('%s object with primary key %r does not exist.' % (force_unicode(opts.verbose_name), escape(object_id))) 
    540540 
    541541        if request.POST and request.POST.has_key("_saveasnew"): 
    …… 
    569569 
    570570        context = { 
    571             'title': _('Change %s') % opts.verbose_name, 
     571            'title': _('Change %s') % force_unicode(opts.verbose_name), 
    572572            'adminform': adminForm, 
    573573            'object_id': object_id, 
    …… 
    634634 
    635635        if obj is None: 
    636             raise Http404('%s object with primary key %r does not exist.' % (opts.verbose_name, escape(object_id))) 
     636            raise Http404('%s object with primary key %r does not exist.' % (force_unicode(opts.verbose_name), escape(object_id))) 
    637637 
    638638        # Populate deleted_objects, a data structure of all related objects that 
    …… 
    655655        context = { 
    656656            "title": _("Are you sure?"), 
    657             "object_name": opts.verbose_name, 
     657            "object_name": force_unicode(opts.verbose_name), 
    658658            "object": obj, 
    659659            "deleted_objects": deleted_objects, 
    …… 
    683683            'title': _('Change history: %s') % force_unicode(obj), 
    684684            'action_list': action_list, 
    685             'module_name': capfirst(opts.verbose_name_plural), 
     685            'module_name': capfirst(force_unicode(opts.verbose_name_plural)), 
    686686            'object': obj, 
    687687            'root_path': self.admin_site.root_path,