Ticket #5286: 5286.diff

core/management/commands/adminindex.py

@@ -1 +1 @@
 from django.core.management.base import AppCommand
 from django.utils.text import capfirst
+from django.utils.encoding import force_unicode
 
 MODULE_TEMPLATE = '''    {%% if perms.%(app)s.%(addperm)s or perms.%(app)s.%(changeperm)s %%}
     <tr>
@@ -21 +22 @@
         output.append('<div class="module"><h2>%s</h2><table>' % app_label.title())
         for model in app_models:
             if model._meta.admin:
+                print capfirst(model._meta.verbose_name_plural)
                 output.append(MODULE_TEMPLATE % {
                     'app': app_label,
                     'mod': model._meta.module_name,
-                    'name': capfirst(model._meta.verbose_name_plural),
+                    'name': force_unicode(capfirst(model._meta.verbose_name_plural)),
                     'addperm': model._meta.get_add_permission(),
                     'changeperm': model._meta.get_change_permission(),
                 })