Commit 7b5b1c7e authored by Jannis Leidel's avatar Jannis Leidel
Browse files

[1.1.X] Fixed #11478 - Use namespacing for URLs to i18n JavaScript in admin. 

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3a6f58a1

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

+2 −1
Original line number Diff line number Diff line 
{% 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 %}

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

+2 −1
Original line number Diff line number Diff line
@@ -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 %}

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

+2 −1
Original line number Diff line number Diff line
@@ -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 %}