From d63c9b3693278027309d33524c2e1e42787b8633 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Mon, 25 Nov 2013 12:33:48 +0100
Subject: [PATCH] Setlocale before including any storage file

---
 umap/templates/leaflet_storage/js.html        | 30 +++++++++++++++++++
 .../templates/leaflet_storage/map_detail.html |  7 +----
 2 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 umap/templates/leaflet_storage/js.html

diff --git a/umap/templates/leaflet_storage/js.html b/umap/templates/leaflet_storage/js.html
new file mode 100644
index 00000000..4d6b6c5f
--- /dev/null
+++ b/umap/templates/leaflet_storage/js.html
@@ -0,0 +1,30 @@
+{% load compress %}
+{% compress js %}
+    <script src="{{ STATIC_URL }}leaflet/dist/leaflet-src.js"></script>
+    <script src="{{ STATIC_URL }}draw/dist/leaflet.draw-src.js"></script>
+    <script src="{{ STATIC_URL }}hash/leaflet-hash.js"></script>
+    <script src="{{ STATIC_URL }}i18n/Leaflet.i18n.js"></script>
+    <script src="{{ STATIC_URL }}edit_in_osm/Leaflet.EditInOSM.js"></script>
+    <script src="{{ STATIC_URL }}minimap/src/Control.MiniMap.js"></script>
+    <script src="{{ STATIC_URL }}csv2geojson/csv2geojson.js"></script>
+    <script src="{{ STATIC_URL }}togeojson/togeojson.js"></script>
+    <script src="{{ STATIC_URL }}osmtogeojson/osm_geojson.js"></script>
+    <script src="{{ STATIC_URL }}loading/src/Control.Loading.js"></script>
+    <script src="{{ STATIC_URL }}markercluster/dist/leaflet.markercluster-src.js"></script>
+    <script src="{{ STATIC_URL }}measure/leaflet.measurecontrol.js"></script>
+    <script src="{{ STATIC_URL }}contextmenu/dist/leaflet.contextmenu-src.js"></script>
+{% endcompress %}
+{% if locale %}
+    <script src="{{ STATIC_URL }}storage/src/locale/{{ locale }}.js"></script>
+{% endif %}
+{% compress js %}
+    <script src="{{ STATIC_URL }}storage/src/js/leaflet.storage.core.js"></script>
+    <script src="{{ STATIC_URL }}storage/src/js/leaflet.storage.xhr.js"></script>
+    <script src="{{ STATIC_URL }}storage/src/js/leaflet.storage.forms.js"></script>
+    <script src="{{ STATIC_URL }}storage/src/js/leaflet.storage.icon.js"></script>
+    <script src="{{ STATIC_URL }}storage/src/js/leaflet.storage.features.js"></script>
+    <script src="{{ STATIC_URL }}storage/src/js/leaflet.storage.layer.js"></script>
+    <script src="{{ STATIC_URL }}storage/src/js/leaflet.storage.controls.js"></script>
+    <script src="{{ STATIC_URL }}storage/src/js/leaflet.storage.js"></script>
+    <script src="{{ STATIC_URL }}storage/contrib/js/storage.ui.default.js"></script>
+{% endcompress %}
diff --git a/umap/templates/leaflet_storage/map_detail.html b/umap/templates/leaflet_storage/map_detail.html
index 57803453..4353e428 100644
--- a/umap/templates/leaflet_storage/map_detail.html
+++ b/umap/templates/leaflet_storage/map_detail.html
@@ -7,12 +7,7 @@
     {% compress css %}
         {% leaflet_storage_css %}
     {% endcompress %}
-    {% compress js %}
-        {% leaflet_storage_js %}
-    {% endcompress %}
-    {% if locale %}
-        <script src="{{ STATIC_URL }}storage/src/locale/{{ locale }}.js"></script>
-    {% endif %}
+    {% leaflet_storage_js locale=locale %}
 {% endblock %}
 
 {% block content %}