diff options
| author | Daniel Hepper <daniel.hepper@gmail.com> | 2012-06-08 15:28:07 +0200 |
|---|---|---|
| committer | Florian Apolloner <florian@apolloner.eu> | 2012-06-18 18:09:05 +0200 |
| commit | 108f8dddeae66efd47c13afa6033f36b6fd39c8f (patch) | |
| tree | 04b72471c860274b6ce14b9f34d8f16037381797 | |
| parent | ac1b9ae6301e2c38af7951f1feb56dafc380d3e7 (diff) | |
Fixed #18450 -- Removed default values for i18n JavaScript URLs in Admin templates
3 files changed, 3 insertions, 6 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 4fdccd13d2..f367223bc5 100644 --- a/django/contrib/admin/templates/admin/auth/user/change_password.html +++ b/django/contrib/admin/templates/admin/auth/user/change_password.html @@ -3,8 +3,7 @@ {% load admin_urls %} {% block extrahead %}{{ block.super }} -{% url 'admin:jsi18n' as jsi18nurl %} -<script type="text/javascript" src="{{ jsi18nurl|default:"../../../../jsi18n/" }}"></script> +<script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script> {% endblock %} {% block extrastyle %}{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/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 e455793f68..fd54924615 100644 --- a/django/contrib/admin/templates/admin/change_form.html +++ b/django/contrib/admin/templates/admin/change_form.html @@ -3,8 +3,7 @@ {% load admin_urls %} {% block extrahead %}{{ block.super }} -{% url 'admin:jsi18n' as jsi18nurl %} -<script type="text/javascript" src="{{ jsi18nurl|default:"../../../jsi18n/" }}"></script> +<script type="text/javascript" src="{% url 'admin: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 3c73ac8745..c72b6630a3 100644 --- a/django/contrib/admin/templates/admin/change_list.html +++ b/django/contrib/admin/templates/admin/change_list.html @@ -9,8 +9,7 @@ <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" /> {% endif %} {% if cl.formset or action_form %} - {% url 'admin:jsi18n' as jsi18nurl %} - <script type="text/javascript" src="{{ jsi18nurl|default:'../../jsi18n/' }}"></script> + <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script> {% endif %} {{ media.css }} {% if not actions_on_top and not actions_on_bottom %} |