diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py --- a/django/contrib/admin/sites.py +++ b/django/contrib/admin/sites.py @@ -358,7 +358,7 @@ app_dict[app_label]['models'].append(model_dict) else: app_dict[app_label] = { - 'name': app_label.title(), + 'name': app_label, 'app_url': reverse('admin:app_list', kwargs={'app_label': app_label}, current_app=self.name), 'has_module_perms': has_module_perms, 'models': [model_dict], @@ -415,7 +415,7 @@ # something to display, add in the necessary meta # information. app_dict = { - 'name': app_label.title(), + 'name': app_label, 'app_url': '', 'has_module_perms': has_module_perms, 'models': [model_dict], @@ -425,7 +425,7 @@ # Sort the models alphabetically within each app. app_dict['models'].sort(key=lambda x: x['name']) context = { - 'title': _('%s administration') % capfirst(app_label), + 'title': _('%(app_label)s administration') % {'app_label': capfirst(_(app_label))}, 'app_list': [app_dict], } context.update(extra_context or {}) diff --git a/django/contrib/admin/templates/admin/app_index.html b/django/contrib/admin/templates/admin/app_index.html --- a/django/contrib/admin/templates/admin/app_index.html +++ b/django/contrib/admin/templates/admin/app_index.html @@ -8,7 +8,7 @@ {% trans 'Home' %} › {% for app in app_list %} -{% blocktrans with app.name as name %}{{ name }}{% endblocktrans %} +{% trans app.name|title %} {% endfor %} {% endblock %} diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -13,8 +13,8 @@ {% block breadcrumbs %}
diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -19,8 +19,8 @@ {% block breadcrumbs %} {% endblock %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -41,8 +41,8 @@ {% block breadcrumbs %} {% endblock %} {% endif %} diff --git a/django/contrib/admin/templates/admin/delete_confirmation.html b/django/contrib/admin/templates/admin/delete_confirmation.html --- a/django/contrib/admin/templates/admin/delete_confirmation.html +++ b/django/contrib/admin/templates/admin/delete_confirmation.html @@ -6,7 +6,7 @@ {% block breadcrumbs %}