Ticket #14450: localization-for-application-name.patch

contrib/admin/actions.py

@@ -12 +12 @@
 from django.utils.safestring import mark_safe
 from django.utils.text import capfirst
 from django.utils.translation import ugettext_lazy, ugettext as _
+from django.conf import settings
 
 def delete_selected(modeladmin, request, queryset):
     """
@@ -25 +26 @@
     """
     opts = modeladmin.model._meta
     app_label = opts.app_label
+    app_name = app_label.title()
+    try:
+        app_name = settings.APP_NAMES[app_label]
+    except:
+        pass
 
     # Check that the user has delete permission for the actual model
     if not modeladmin.has_delete_permission(request):
@@ -60 +66 @@
         "opts": opts,
         "root_path": modeladmin.admin_site.root_path,
         "app_label": app_label,
+        "app_name": app_name,
         'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME,
     }
 

contrib/admin/options.py

@@ -23 +23 @@
 from django.utils.translation import ugettext as _
 from django.utils.translation import ungettext, ugettext_lazy
 from django.utils.encoding import force_unicode
+from django.conf import settings
 
 HORIZONTAL, VERTICAL = 1, 2
 # returns the <ul> class for a given radio_admin field
@@ -265 +266 @@
     urls = property(urls)
 
     def _media(self):
-        from django.conf import settings
-
         js = ['js/core.js', 'js/admin/RelatedObjectLookups.js',
               'js/jquery.min.js', 'js/jquery.init.js']
         if self.actions is not None:
@@ -605 +604 @@
     def render_change_form(self, request, context, add=False, change=False, form_url='', obj=None):
         opts = self.model._meta
         app_label = opts.app_label
+        app_name = app_label.title()
+        try:
+            app_name = settings.APP_NAMES[app_label]
+        except:
+            pass
         ordered_objects = opts.get_ordered_objects()
         context.update({
             'add': add,
@@ -617 +621 @@
             'ordered_objects': ordered_objects,
             'form_url': mark_safe(form_url),
             'opts': opts,
+            'app_name': app_name,
             'content_type_id': ContentType.objects.get_for_model(self.model).id,
             'save_as': self.save_as,
             'save_on_top': self.save_on_top,
@@ -836 +841 @@
             inline_admin_formsets.append(inline_admin_formset)
             media = media + inline_admin_formset.media
 
+        app_name = opts.app_label.title()
+        try:
+            app_name = settings.APP_NAMES[app_label]
+        except:
+            pass
+
         context = {
             'title': _('Add %s') % force_unicode(opts.verbose_name),
             'adminform': adminForm,
@@ -846 +857 @@
             'errors': helpers.AdminErrorList(form, formsets),
             'root_path': self.admin_site.root_path,
             'app_label': opts.app_label,
+            'app_name': app_name,
         }
         context.update(extra_context or {})
         return self.render_change_form(request, context, form_url=form_url, add=True)
@@ -927 +939 @@
             inline_admin_formsets.append(inline_admin_formset)
             media = media + inline_admin_formset.media
 
+        app_name = opts.app_label.title()
+        try:
+            app_name = settings.APP_NAMES[app_label]
+        except:
+            pass
+
         context = {
             'title': _('Change %s') % force_unicode(opts.verbose_name),
             'adminform': adminForm,
@@ -938 +956 @@
             'errors': helpers.AdminErrorList(form, formsets),
             'root_path': self.admin_site.root_path,
             'app_label': opts.app_label,
+            'app_name': app_name,
         }
         context.update(extra_context or {})
         return self.render_change_form(request, context, change=True, obj=obj)
@@ -948 +967 @@
         from django.contrib.admin.views.main import ERROR_FLAG
         opts = self.model._meta
         app_label = opts.app_label
+
+        app_name = opts.app_label.title()
+        try:
+            app_name = settings.APP_NAMES[app_label]
+        except:
+            pass
+
         if not self.has_change_permission(request, None):
             raise PermissionDenied
 
@@ -1077 +1103 @@
             'has_add_permission': self.has_add_permission(request),
             'root_path': self.admin_site.root_path,
             'app_label': app_label,
+            'app_name': app_name,
             'action_form': action_form,
             'actions_on_top': self.actions_on_top,
             'actions_on_bottom': self.actions_on_bottom,
@@ -1095 +1122 @@
         "The 'delete' admin view for this model."
         opts = self.model._meta
         app_label = opts.app_label
+        app_name = opts.app_label.title()
+        try:
+            app_name = settings.APP_NAMES[app_label]
+        except:
+            pass
 
         obj = self.get_object(request, unquote(object_id))
 
@@ -1130 +1162 @@
             "opts": opts,
             "root_path": self.admin_site.root_path,
             "app_label": app_label,
+            "app_name": app_name,
         }
         context.update(extra_context or {})
         context_instance = template.RequestContext(request, current_app=self.admin_site.name)
@@ -1145 +1178 @@
         model = self.model
         opts = model._meta
         app_label = opts.app_label
+        app_name = opts.app_label.title()
+        try:
+            app_name = settings.APP_NAMES[app_label]
+        except:
+            pass
         action_list = LogEntry.objects.filter(
             object_id = object_id,
             content_type__id__exact = ContentType.objects.get_for_model(model).id
@@ -1158 +1196 @@
             'object': obj,
             'root_path': self.admin_site.root_path,
             'app_label': app_label,
+            'app_name': app_name,
         }
         context.update(extra_context or {})
         context_instance = template.RequestContext(request, current_app=self.admin_site.name)
@@ -1224 +1263 @@
             self.verbose_name_plural = self.model._meta.verbose_name_plural
 
     def _media(self):
-        from django.conf import settings
         js = ['js/jquery.min.js', 'js/jquery.init.js', 'js/inlines.min.js']
         if self.prepopulated_fields:
             js.append('js/urlify.js')

contrib/admin/sites.py

@@ -370 +370 @@
                     if app_label in app_dict:
                         app_dict[app_label]['models'].append(model_dict)
                     else:
+                        app_name = app_label.title()
+                        try:
+                            app_name = settings.APP_NAMES[app_label]
+                        except:
+                            pass
                         app_dict[app_label] = {
-                            'name': app_label.title(),
+                            'name': app_name,
                             'app_url': app_label + '/',
                             'has_module_perms': has_module_perms,
                             'models': [model_dict],
@@ -415 +420 @@
         user = request.user
         has_module_perms = user.has_module_perms(app_label)
         app_dict = {}
+        app_name = capfirst(app_label)
+        try:
+            app_name = settings.APP_NAMES[app_label]
+        except:
+            pass
         for model, model_admin in self._registry.items():
             if app_label == model._meta.app_label:
                 if has_module_perms:
@@ -435 +445 @@
                             # something to display, add in the necessary meta
                             # information.
                             app_dict = {
-                                'name': app_label.title(),
+                                'name': app_name,
                                 'app_url': '',
                                 'has_module_perms': has_module_perms,
                                 'models': [model_dict],
@@ -445 +455 @@
         # Sort the models alphabetically within each app.
         app_dict['models'].sort(lambda x, y: cmp(x['name'], y['name']))
         context = {
-            'title': _('%s administration') % capfirst(app_label),
+            'title': _('%s administration') % app_name,
             'app_list': [app_dict],
             'root_path': self.root_path,
         }

contrib/admin/templates/admin/change_form.html

@@ -11 +11 @@
 
 {% block coltype %}{% if ordered_objects %}colMS{% else %}colM{% endif %}{% endblock %}
 
-{% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}
+{% block bodyclass %}{{ app_name }}-{{ opts.object_name.lower }} change-form{% endblock %}
 
 {% 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_name|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>

contrib/admin/templates/admin/change_list.html

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

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_name }}</a> &rsaquo; 
      <a href="../../">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo;
      {% trans 'Delete' %}

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_name }}</a> &rsaquo;
      <a href="./">{{ opts.verbose_name_plural|capfirst }}</a> &rsaquo;
      {% trans 'Delete multiple objects' %}
 </div>

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_name }}</a> &rsaquo; 
     <a href="../../">{{ module_name }}</a> &rsaquo; 
     <a href="../">{{ object|truncatewords:"18" }}</a> &rsaquo; 
     {% trans 'History' %}