Commit 675ee5c1 authored by Karen Tracey's avatar Karen Tracey
Browse files

[1.0.X] Fixed #9506 take 2 -- Marked the message properly for translation, in... 

[1.0.X] Fixed #9506 take 2 -- Marked the message properly for translation, in both places it appears in the source.

[9363] from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9364 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 0776ba04

django/contrib/admin/options.py

+2 −2
Original line number Diff line number Diff line
@@ -556,7 +556,7 @@ class ModelAdmin(BaseModelAdmin): 
            raise PermissionDenied



        if obj is None:

            raise Http404(_('%s object with primary key %r does not exist.') % (force_unicode(opts.verbose_name), escape(object_id)))

            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_unicode(opts.verbose_name), 'key': escape(object_id)})



        if request.method == 'POST' and request.POST.has_key("_saveasnew"):

            return self.add_view(request, form_url='../../add/')
@@ -670,7 +670,7 @@ class ModelAdmin(BaseModelAdmin): 
            raise PermissionDenied



        if obj is None:

            raise Http404('%s object with primary key %r does not exist.' % (force_unicode(opts.verbose_name), escape(object_id)))

            raise Http404(_('%(name)s object with primary key %(key)r does not exist.') % {'name': force_unicode(opts.verbose_name), 'key': escape(object_id)})



        # Populate deleted_objects, a data structure of all related objects that

        # will also be deleted.