diff options
| author | Tim Graham <timograham@gmail.com> | 2015-03-14 14:35:50 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-03-14 15:20:53 -0400 |
| commit | da8b3aa7eb174959aeec9acbf86c6728ec99fa21 (patch) | |
| tree | eff6c6c8952ec25a175952debb4dbe56807087f5 | |
| parent | bd36f2d43264c76e67192ad6ce28002cd4138106 (diff) | |
[1.8.x] Fixed #24480 -- Marked strings in contrib.gis templates for translation.
Backport of 21ffbb06ec9eb741f62ac51abab4b722fb91b9bc from master
| -rw-r--r-- | django/contrib/gis/templates/gis/admin/openlayers.html | 4 | ||||
| -rw-r--r-- | django/contrib/gis/templates/gis/google/google-map.html | 4 | ||||
| -rw-r--r-- | django/contrib/gis/templates/gis/openlayers.html | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/django/contrib/gis/templates/gis/admin/openlayers.html b/django/contrib/gis/templates/gis/admin/openlayers.html index 0f5716e40c..78e874720e 100644 --- a/django/contrib/gis/templates/gis/admin/openlayers.html +++ b/django/contrib/gis/templates/gis/admin/openlayers.html @@ -32,9 +32,9 @@ </script> <div id="{{ id }}_map"{% if LANGUAGE_BIDI %} dir="ltr"{% endif %}></div> {% if editable %} -<a href="javascript:{{ module }}.clearFeatures()">Delete all Features</a> +<a href="javascript:{{ module }}.clearFeatures()">{% trans "Delete all Features" %}</a> {% endif %} -{% if display_wkt %}<p> WKT debugging window:</p>{% endif %} +{% if display_wkt %}<p>{% trans "WKT debugging window:" %} </p>{% endif %} <textarea id="{{ id }}" class="vWKTField required" cols="150" rows="10" name="{{ name }}">{{ wkt }}</textarea> <script type="text/javascript">{% block init_function %}{{ module }}.init();{% endblock %}</script> </span> diff --git a/django/contrib/gis/templates/gis/google/google-map.html b/django/contrib/gis/templates/gis/google/google-map.html index fb60e44fba..ef80c5b1b1 100644 --- a/django/contrib/gis/templates/gis/google/google-map.html +++ b/django/contrib/gis/templates/gis/google/google-map.html @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +{% load i18n %}<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" {{ gmap.xmlns }}> <head> - <title>{% block title %}Google Maps via GeoDjango{% endblock %}</title> + <title>{% block title %}{% trans "Google Maps via GeoDjango" %}{% endblock %}</title> {{ gmap.style }} {{ gmap.scripts }} </head> diff --git a/django/contrib/gis/templates/gis/openlayers.html b/django/contrib/gis/templates/gis/openlayers.html index 5cb46a59cb..cbefb3a9f2 100644 --- a/django/contrib/gis/templates/gis/openlayers.html +++ b/django/contrib/gis/templates/gis/openlayers.html @@ -15,8 +15,8 @@ <div id="{{ id }}_div_map"> <div id="{{ id }}_map"></div> - <span class="clear_features"><a href="javascript:{{ module }}.clearFeatures()">Delete all Features</a></span> - {% if display_raw %}<p>Debugging window (serialized value):</p>{% endif %} + <span class="clear_features"><a href="javascript:{{ module }}.clearFeatures()">{% trans "Delete all Features" %}</a></span> + {% if display_raw %}<p>{% trans "Debugging window (serialized value)" %}</p>{% endif %} <textarea id="{{ id }}" class="vSerializedField required" cols="150" rows="10" name="{{ name }}">{{ serialized }}</textarea> <script type="text/javascript"> {% block map_options %}var map_options = {};{% endblock %} |