Author: kmtracey
Date: 2008-11-06 10:44:42 -0600 (Thu, 06 Nov 2008)
New Revision: 9363
Modified:
django/trunk/django/contrib/admin/options.py
Log:
Fixed #9506 take 2 -- Marked the message properly for translation, in both
places it appears in the source.
Modified: django/trunk/django/contrib/admin/options.py
===================================================================
--- django/trunk/django/contrib/admin/options.py 2008-11-06 14:50:23 UTC
(rev 9362)
+++ django/trunk/django/contrib/admin/options.py 2008-11-06 16:44:42 UTC
(rev 9363)
@@ -556,7 +556,7 @@
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 @@
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.
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
