Ticket #13764: admin-cutom-jsi18n.patch

django/django/contrib/admin/options.py

@@ -8 +8 @@
 from django.core.exceptions import PermissionDenied
 from django.db import models, transaction
 from django.db.models.fields import BLANK_CHOICE_DASH
+from django.conf import settings
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.shortcuts import get_object_or_404, render_to_response
 from django.utils.datastructures import SortedDict
@@ -220 +221 @@
     def get_urls(self):
         from django.conf.urls.defaults import patterns, url
 
-        def wrap(view):
+        def wrap(view, cacheable=False):
             def wrapper(*args, **kwargs):
-                return self.admin_site.admin_view(view)(*args, **kwargs)
+                return self.admin_site.admin_view(view, cacheable)(*args, **kwargs)
             return update_wrapper(wrapper, view)
 
         info = self.model._meta.app_label, self.model._meta.module_name
@@ -240 +241 @@
             url(r'^(.+)/delete/$',
                 wrap(self.delete_view),
                 name='%s_%s_delete' % info),
+            url(r'^jsi18n/$',
+                wrap(self.i18n_javascript, cacheable=True),
+                name='%s_%s_jsi18n' % info),
             url(r'^(.+)/$',
                 wrap(self.change_view),
                 name='%s_%s_change' % info),
@@ -251 +255 @@
     urls = property(urls)
 
     def _media(self):
-        from django.conf import settings
-
         js = ['js/core.js', 'js/admin/RelatedObjectLookups.js']
         if self.actions is not None:
             js.extend(['js/getElementsBySelector.js', 'js/actions.js'])
@@ -1091 +1093 @@
             "admin/object_history.html"
         ], context, context_instance=context_instance)
 
+    def i18n_javascript(self, request):
+        """
+        Displays the i18n JavaScript that the Django admin requires.
+
+        This takes into account the USE_I18N setting. If it's set to False, the
+        generated JavaScript will be leaner and faster.
+        """
+        if settings.USE_I18N:
+            from django.views.i18n import javascript_catalog
+        else:
+            from django.views.i18n import null_javascript_catalog as javascript_catalog
+
+        for package in settings.INSTALLED_APPS:
+            if self.opts.app_label == package.split('.')[-1]:
+                break
+
+        return javascript_catalog(request, packages=('django.conf', package))
+
     #
     # DEPRECATED methods.
     #
@@ -1147 +1167 @@
             self.verbose_name_plural = self.model._meta.verbose_name_plural
 
     def _media(self):
-        from django.conf import settings
         js = []
         if self.prepopulated_fields:
             js.append('js/urlify.js')

django/django/contrib/admin/sites.py

@@ -207 +207 @@
             url(r'^password_change/done/$',
                 wrap(self.password_change_done, cacheable=True),
                 name='password_change_done'),
-            url(r'^jsi18n/$',
-                wrap(self.i18n_javascript, cacheable=True),
-                name='jsi18n'),
             url(r'^r/(?P<content_type>\d+)/(?P<object_id>.+)/$',
                 'django.views.defaults.shortcut'),
             url(r'^(?P<app_label>\w+)/$',
@@ -270 +267 @@
         from django.contrib.auth.views import password_change_done
         return password_change_done(request)
 
-    def i18n_javascript(self, request):
-        """
-        Displays the i18n JavaScript that the Django admin requires.
-
-        This takes into account the USE_I18N setting. If it's set to False, the
-        generated JavaScript will be leaner and faster.
-        """
-        if settings.USE_I18N:
-            from django.views.i18n import javascript_catalog
-        else:
-            from django.views.i18n import null_javascript_catalog as javascript_catalog
-        return javascript_catalog(request, packages='django.conf')
-
     def logout(self, request):
         """
         Logs out the user for the given HttpRequest.

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

@@ -1 +1 @@
 {% extends "admin/base_site.html" %}
 {% load i18n admin_modify adminmedia %}
 {% block extrahead %}{{ block.super }}
-<script type="text/javascript" src="../../../../jsi18n/"></script>
+<script type="text/javascript" src="../../jsi18n/"></script>
 {% endblock %}
 {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />{% endblock %}
 {% block bodyclass %}{{ opts.app_label }}-{{ opts.object_name.lower }} change-form{% endblock %}

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

@@ -2 +2 @@
 {% load i18n admin_modify adminmedia %}
 
 {% block extrahead %}{{ block.super }}
-<script type="text/javascript" src="../../../jsi18n/"></script>
+<script type="text/javascript" src="../jsi18n/"></script>
 {{ media }}
 {% endblock %}
 

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

@@ -6 +6 @@
   <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/changelists.css" />
   {% if cl.formset %}
     <link rel="stylesheet" type="text/css" href="{% admin_media_prefix %}css/forms.css" />
-    <script type="text/javascript" src="../../jsi18n/"></script>
+    <script type="text/javascript" src="./jsi18n/"></script>
   {% endif %}
   {{ media }}
   {% if not actions_on_top and not actions_on_bottom %}