Ticket #15810: dj_adm_add_applabel_class.diff

django/contrib/admin/templates/admin/change_list.html

@@ -43 +43 @@
       </a>
        &rsaquo;
        <a href="../">
-         {{ app_label|capfirst }}
+         {{ app_label.title|capfirst }}
       </a>
       &rsaquo;
       {{ cl.opts.verbose_name_plural|capfirst }}

django/contrib/admin/templates/admin/delete_selected_confirmation.html

@@ -4 +4 @@
 {% block breadcrumbs %}
 <div class="breadcrumbs">
      <a href="../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../">{{ app_label|capfirst }}</a> &rsaquo;
+     <a href="../">{{ app_label.title|capfirst }}</a> &rsaquo;
      <a href="./">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      {% trans 'Delete multiple objects' %}
 </div>

django/contrib/admin/templates/admin/object_history.html

@@ -4 +4 @@
 {% block breadcrumbs %}
 <div class="breadcrumbs">
     <a href="../../../../">{% trans 'Home' %}</a> &rsaquo; 
-    <a href="../../../">{{ app_label|capfirst }}</a> &rsaquo; 
+    <a href="../../../">{{ app_label.title|capfirst }}</a> &rsaquo; 
     <a href="../../">{{ module_name }}</a> &rsaquo; 
     <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo; 
     {% trans 'History' %}

django/contrib/admin/templates/admin/auth/user/change_password.html

@@ -10 +10 @@
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
      <a href="../../../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../../../">{{ opts.app_label|capfirst|escape }}</a> &rsaquo;
+     <a href="../../../">{{ opts.app_label.title|capfirst|escape }}</a> &rsaquo;
      <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      <a href="../">{{ original|truncatewords:"18" }}</a> &rsaquo;
      {% trans 'Change password' %}

django/contrib/admin/templates/admin/change_form.html

@@ -17 +17 @@
 {% block breadcrumbs %}{% if not is_popup %}
 <div class="breadcrumbs">
      <a href="../../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../../">{{ app_label|capfirst|escape }}</a> &rsaquo;
+     <a href="../../">{{ app_label.title|capfirst|escape }}</a> &rsaquo;
      {% if has_change_permission %}<a href="../">{{ opts.verbose_name_plural|capfirst }}</a>{% else %}{{ opts.verbose_name_plural|capfirst }}{% endif %} &rsaquo;
      {% if add %}{% trans "Add" %} {{ opts.verbose_name }}{% else %}{{ original|truncatewords:"18" }}{% endif %}
 </div>

django/contrib/admin/templates/admin/delete_confirmation.html

@@ -4 +4 @@
 {% block breadcrumbs %}
 <div class="breadcrumbs">
      <a href="../../../../">{% trans "Home" %}</a> &rsaquo;
-     <a href="../../../">{{ app_label|capfirst }}</a> &rsaquo; 
+     <a href="../../../">{{ app_label.title|capfirst }}</a> &rsaquo; 
      <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo;
      {% trans 'Delete' %}

django/contrib/admin/util.py

@@ -385 +385 @@
         return limit_choices_to # already a Q
     else:
         return models.Q(**limit_choices_to) # convert dict to Q
+
+
+class AppLabel(str):
+    def __new__(cls,value,title=None):
+        obj = str.__new__(cls, value)
+        obj._my_title = title
+        return obj
+
+    def title(self):
+        if self._my_title is not None:
+            return self._my_title
+        return super(AppLabel,self).title()

django/contrib/admin/sites.py

@@ -388 +388 @@
         app_dict = {}
         for model, model_admin in self._registry.items():
             if app_label == model._meta.app_label:
+                app_label = model._meta.app_label
                 if has_module_perms:
                     perms = model_admin.get_model_perms(request)
 
@@ -416 +417 @@
         # Sort the models alphabetically within each app.
         app_dict['models'].sort(key=lambda x: x['name'])
         context = {
-            'title': _('%s administration') % capfirst(app_label),
+            'title': _('%s administration') % (app_label.title()),
             'app_list': [app_dict],
             'root_path': self.root_path,
         }