Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

newforms-admin: Fixed #5401 -- make-messages.py works again. Thanks, …

…Petr Marhoun

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6319 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit aff1c2aa96df00da61d0335c05bc592bffd29e32 1 parent 84fd07f
Adrian Holovaty authored September 15, 2007

Showing 1 changed file with 3 additions and 3 deletions. Show diff stats Hide diff stats

  1. 6  django/contrib/admindocs/views.py
6  django/contrib/admindocs/views.py
@@ -169,7 +169,7 @@ def model_detail(request, app_label, model_name):
169 169
             model = m
170 170
             break
171 171
     if model is None:
172  
-        raise Http404, _("Model %r not found in app %r") % (model_name, app_label)
  172
+        raise Http404, _("Model %(model_name)r not found in app %(app_label)r") % {'model_name': model_name, 'app_label': app_label}
173 173
 
174 174
     opts = model._meta
175 175
 
@@ -181,7 +181,7 @@ def model_detail(request, app_label, model_name):
181 181
         if isinstance(field, models.ForeignKey):
182 182
             data_type = related_object_name = field.rel.to.__name__
183 183
             app_label = field.rel.to._meta.app_label
184  
-            verbose = utils.parse_rst((_("the related `%s.%s` object")  % (app_label, data_type)), 'model', _('model:') + data_type)
  184
+            verbose = utils.parse_rst((_("the related `%(app_label)s.%(data_type)s` object")  % {'app_label': app_label, 'data_type': data_type}), 'model', _('model:') + data_type)
185 185
         else:
186 186
             data_type = get_readable_field_data_type(field)
187 187
             verbose = field.verbose_name
@@ -212,7 +212,7 @@ def model_detail(request, app_label, model_name):
212 212
 
213 213
     # Gather related objects
214 214
     for rel in opts.get_all_related_objects():
215  
-        verbose = _("related `%s.%s` objects") % (rel.opts.app_label, rel.opts.object_name)
  215
+        verbose = _("related `%(app_label)s.%(object_name)s` objects") % {'app_label': rel.opts.app_label, 'object_name': rel.opts.object_name}
216 216
         accessor = rel.get_accessor_name()
217 217
         fields.append({
218 218
             'name'      : "%s.all" % accessor,

0 notes on commit aff1c2a

Please sign in to comment.
Something went wrong with that request. Please try again.