Parcourir la source

Disable l10n in templates, to avoid localised numbers (e.g. "42,1337") that break everything

Baptiste Jonglez il y a 8 ans
Parent
commit
63001f3bfa

+ 3 - 0
panorama/templates/panorama/locate_point.html

@@ -3,6 +3,7 @@
 {% load static %}
 {% load distance_filter %}
 {% load i18n %}
+{% load l10n %}
 
 {% block title %}{% trans "Result of research"%}{% endblock title %}
 
@@ -52,6 +53,7 @@ style="padding:0px;height:calc(100vh - 50px)"
 {% endblock css %}
 
 {% block js %}
+{% localize off %}
 <script src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>
 <script src="https://code.jquery.com/jquery-3.0.0.min.js"></script>
 <script type='text/javascript' src='http://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster.js'></script>
@@ -138,4 +140,5 @@ style="padding:0px;height:calc(100vh - 50px)"
     initmap();
     accordionMenus(); 
 </script>
+{% endlocalize %}
 {% endblock js %}

+ 3 - 0
panorama/templates/panorama/main.html

@@ -3,6 +3,7 @@
 {% load static %}
 {% load distance_filter %}
 {% load i18n %}
+{% load l10n %}
 
 {% block title %}{% trans "Celutz, a panorama viewer"%}{% endblock title %}
 
@@ -41,6 +42,7 @@
 {% endblock css %}
 
 {% block js %}
+{% localize off %}
     <script src="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.js"></script>
     <script src="https://code.jquery.com/jquery-3.0.0.min.js"></script>
     <script type='text/javascript' src='http://cdnjs.cloudflare.com/ajax/libs/leaflet.markercluster/0.4.0/leaflet.markercluster.js'></script>
@@ -160,4 +162,5 @@
         initmap();
         accordionMenus(); 
     </script>
+{% endlocalize %}
 {% endblock js %}

+ 3 - 1
panorama/templates/panorama/sidebar-all.html

@@ -1,4 +1,6 @@
 {% load i18n %}
+{% load l10n %}
+{% localize off %}
         <li>
             <a href="{% url 'panorama:main' %}"><i class="fa fa-fw fa-home"></i> {% trans "Map" %}</a>
         </li>
@@ -32,4 +34,4 @@
                 </li>
             </ul>
         </li>
-
+{% endlocalize %}

+ 3 - 0
panorama/templates/panorama/sidebar-locate-point.html

@@ -1,7 +1,9 @@
 {% load i18n %}
+{% load l10n %}
 {% load panorama_url %}
 {% load distance_filter %}
 {% include "panorama/sidebar-common.html" %}
+{% localize off %}
         <li>
             {% if located_point_name != None %}
                 <a href="javascript:;" data-toggle="collapse" data-target="#result"><i class="fa fa-fw fa-eye"></i> {% trans "Results for the point" %} <b>{{ located_point_name }}</b></a>
@@ -14,3 +16,4 @@
               {% endfor %}
             </ul>
         </li>
+{% endlocalize %}

+ 5 - 0
panorama/templates/panorama/view.html

@@ -3,6 +3,7 @@
 {% load staticfiles %}
 {% load distance_filter %}
 {% load i18n %}
+{% load l10n %}
 
 {% block title %}{{ panorama.name }}{% endblock title %}
 
@@ -14,6 +15,7 @@
 {% endblock css %}
 
 {% block js %}
+{% localize off %}
     <script>
       var title = "{{ panorama.name|escapejs }}";
       var panorama_id = {{ panorama.pk }};
@@ -104,6 +106,7 @@
 
       $( document ).ready(load_map);
     </script>
+{% endlocalize %}
 {% endblock js %}
 
 {% block top-menu-title %}
@@ -112,6 +115,7 @@
 {% endblock %}
 
 {% block top-menu-pano-items %}
+{% localize off %}
     <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-question-circle"></i>  {% trans "Parameters" %}<b class="caret"></b></a>
         <ul class="dropdown-menu">
@@ -151,6 +155,7 @@
             </li>
         </ul>
     </li>
+{% endlocalize %}
 {% endblock %}
 
 {% block sidebar %}