Author: kmtracey
Date: 2008-11-06 10:47:13 -0600 (Thu, 06 Nov 2008)
New Revision: 9364
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/django/contrib/admin/options.py
Log:
[1.0.X] Fixed #9506 take 2 -- Marked the message properly for translation, in
both places it appears in the source.
[9363] from trunk.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9361
+
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9363
Modified: django/branches/releases/1.0.X/django/contrib/admin/options.py
===================================================================
--- django/branches/releases/1.0.X/django/contrib/admin/options.py
2008-11-06 16:44:42 UTC (rev 9363)
+++ django/branches/releases/1.0.X/django/contrib/admin/options.py
2008-11-06 16:47:13 UTC (rev 9364)
@@ -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
-~----------~----~----~----~------~----~------~--~---
