summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorShabda Raaj <shabda@agiliq.com>2016-06-19 16:21:58 +0530
committerTim Graham <timograham@gmail.com>2016-06-27 15:37:32 -0400
commitb0acb1e73ef32e368a8a6213e300e66981f976d7 (patch)
treeb09c854fd6ca923b48f5da698ad22a7c95b11fcf /django
parent2224a56631eae3342993e4b7b90e80f59a167151 (diff)
Fixed #26779 -- Added extra_context parameter to admin's i18n_javascript view.
Diffstat (limited to 'django')
-rw-r--r--django/contrib/admin/sites.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/contrib/admin/sites.py b/django/contrib/admin/sites.py
index 707428b055..ea64d6e296 100644
--- a/django/contrib/admin/sites.py
+++ b/django/contrib/admin/sites.py
@@ -314,9 +314,12 @@ class AdminSite(object):
request.current_app = self.name
return password_change_done(request, **defaults)
- def i18n_javascript(self, request):
+ def i18n_javascript(self, request, extra_context=None):
"""
Displays the i18n JavaScript that the Django admin requires.
+
+ `extra_context` is unused but present for consistency with the other
+ admin views.
"""
return JavaScriptCatalog.as_view(packages=['django.contrib.admin'])(request)