innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Made Django's templates get their own LANGUAGE_* variables. 

Refs #24117
This commit is contained in:
Collin Anderson 2015-01-12 08:27:25 -05:00 committed by Tim Graham
parent a7c256cb54
commit 58833f5197
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/contrib/admin/templates/admin/base.html
View File

@ -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>

2
django/contrib/gis/templates/gis/admin/openlayers.html
View File

@ -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; }

6
django/contrib/gis/templates/gis/openlayers.html
View File

@ -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>