Commit 58833f51 authored by Collin Anderson's avatar Collin Anderson Committed by Tim Graham
Browse files

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

Refs #24117
parent a7c256cb

django/contrib/admin/templates/admin/base.html

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

django/contrib/gis/templates/gis/admin/openlayers.html

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

django/contrib/gis/templates/gis/openlayers.html

+3 −3
Original line number Diff line number Diff line 
<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>