diff options
| author | Jannis Leidel <jannis@leidel.info> | 2010-01-09 20:03:11 +0000 |
|---|---|---|
| committer | Jannis Leidel <jannis@leidel.info> | 2010-01-09 20:03:11 +0000 |
| commit | 1e955e01430c7fdaf0ffe7e1da0d0ca71c1c4836 (patch) | |
| tree | ab64c65800ee0a7623e2169c3c4d1325ac424acd | |
| parent | b7236b857626660b62800f66700dc887915b96af (diff) | |
Fixed #11478 - Use namespacing for URLs to i18n JavaScript in admin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12138 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3 files changed, 6 insertions, 3 deletions
diff --git a/django/contrib/admin/templates/admin/auth/user/change_password.html b/django/contrib/admin/templates/admin/auth/user/change_password.html index 11414d1465..ab47385fb4 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -1,7 +1,8 @@ {% extends "admin/base_site.html" %} {% load i18n admin_modify adminmedia %} {% block extrahead %}{{ block.super }} -<script type="text/javascript" src="../../../../jsi18n/"></script> +{% url admin:jsi18n as jsi18nurl %} +<script type="text/javascript" src="{{ jsi18nurl|default:"../../../../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 %} diff --git a/django/contrib/admin/templates/admin/change_form.html b/django/contrib/admin/templates/admin/change_form.html index c5ac729c7e..2db16bda05 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -2,7 +2,8 @@ {% load i18n admin_modify adminmedia %} {% block extrahead %}{{ block.super }} -<script type="text/javascript" src="../../../jsi18n/"></script> +{% url admin:jsi18n as jsi18nurl %} +<script type="text/javascript" src="{{ jsi18nurl|default:"../../../jsi18n/" }}"></script> {{ media }} {% endblock %} diff --git a/django/contrib/admin/templates/admin/change_list.html b/django/contrib/admin/templates/admin/change_list.html index 20b2eff060..3bcec9832f 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -6,7 +6,8 @@ <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> + {% url admin:jsi18n as jsi18nurl %} + <script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script> {% endif %} {{ media }} {% if not actions_on_top and not actions_on_bottom %} |