diff options
| author | Karen Tracey <kmtracey@gmail.com> | 2008-11-06 16:47:13 +0000 |
|---|---|---|
| committer | Karen Tracey <kmtracey@gmail.com> | 2008-11-06 16:47:13 +0000 |
| commit | 675ee5c1373fda3b2bb4e5076b3c476308078fa6 (patch) | |
| tree | c628c34fe2ef8d8cda82134135aa5ef8ebe1fb72 | |
| parent | 0776ba048a144fb5bdec35dac283e185fe172653 (diff) | |
[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
| -rw-r--r-- | django/contrib/admin/options.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/contrib/admin/options.py b/django/contrib/admin/options.py index 05f5c9715b..b3aa3cc501 100644 --- a/django/contrib/admin/options.py +++ b/django/contrib/admin/options.py @@ -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. |