diff options
| author | Collin Anderson <cmawebsite@gmail.com> | 2015-01-12 08:27:25 -0500 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-01-12 10:54:59 -0500 |
| commit | 58833f519797e15ae3cb39b1613e5f7e09c96952 (patch) | |
| tree | c33ddb579cd3230ca14a8a67c9d61b63532b8d8c | |
| parent | a7c256cb5491bf2a77abdff01638239db5bfd9d5 (diff) | |
Made Django's templates get their own LANGUAGE_* variables.
Refs #24117
| -rw-r--r-- | django/contrib/admin/templates/admin/base.html | 3 | ||||
| -rw-r--r-- | django/contrib/gis/templates/gis/admin/openlayers.html | 2 | ||||
| -rw-r--r-- | django/contrib/gis/templates/gis/openlayers.html | 6 |
3 files changed, 6 insertions, 5 deletions
diff --git a/django/contrib/admin/templates/admin/base.html b/django/contrib/admin/templates/admin/base.html index e76f15c540..1c7a9a7ae2 100644 --- a/django/contrib/admin/templates/admin/base.html +++ b/django/contrib/admin/templates/admin/base.html @@ -1,4 +1,5 @@ -{% load admin_static %}<!DOCTYPE html> +{% load i18n admin_static %}<!DOCTYPE html> +{% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} <html lang="{{ LANGUAGE_CODE|default:"en-us" }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}> <head> <title>{% block title %}{% endblock %}</title> diff --git a/django/contrib/gis/templates/gis/admin/openlayers.html b/django/contrib/gis/templates/gis/admin/openlayers.html index 592c6c9e71..0f5716e40c 100644 --- a/django/contrib/gis/templates/gis/admin/openlayers.html +++ b/django/contrib/gis/templates/gis/admin/openlayers.html @@ -1,5 +1,5 @@ {% block extrastyle %} -{% load static %} +{% load i18n static %}{% get_current_language_bidi as LANGUAGE_BIDI %} <style type="text/css"> #{{ id }}_map { width: {{ map_width }}px; height: {{ map_height }}px; } #{{ id }}_map .aligned label { float:inherit; } diff --git a/django/contrib/gis/templates/gis/openlayers.html b/django/contrib/gis/templates/gis/openlayers.html index 4884f48106..5cb46a59cb 100644 --- a/django/contrib/gis/templates/gis/openlayers.html +++ b/django/contrib/gis/templates/gis/openlayers.html @@ -1,14 +1,14 @@ -<style type="text/css">{% block map_css %} +<style type="text/css">{% block map_css %}{% load i18n static %}{% get_current_language_bidi as LANGUAGE_BIDI %} #{{ id }}_map { width: {{ map_width }}px; height: {{ map_height }}px; } #{{ id }}_map .aligned label { float: inherit; } #{{ id }}_div_map { position: relative; vertical-align: top; float: {{ LANGUAGE_BIDI|yesno:"right,left" }}; } {% if not display_raw %}#{{ id }} { display: none; }{% endif %} .olControlEditingToolbar .olControlModifyFeatureItemActive { - background-image: url("{{ STATIC_URL }}admin/img/gis/move_vertex_on.png"); + background-image: url("{% static "admin/img/gis/move_vertex_on.png" %}); background-repeat: no-repeat; } .olControlEditingToolbar .olControlModifyFeatureItemInactive { - background-image: url("{{ STATIC_URL }}admin/img/gis/move_vertex_off.png"); + background-image: url("{% static "admin/img/gis/move_vertex_off.png" %}); background-repeat: no-repeat; }{% endblock %} </style> |