summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-05-09 15:32:51 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2023-05-09 16:11:28 +0200
commit3f1bd22dc86753fc87c1cb00040caa836185fb11 (patch)
tree89f20542bbac962667470dfea744316e098dc34b /ishtar_common/templates/ishtar
parentf16e30d07859678a24d2e9aec2e79a2c122feca8 (diff)
downloadIshtar-3f1bd22dc86753fc87c1cb00040caa836185fb11.tar.bz2
Ishtar-3f1bd22dc86753fc87c1cb00040caa836185fb11.zip
Settings js in an external (generated but cachable) file. Manually set l10n for town sheet.
Diffstat (limited to 'ishtar_common/templates/ishtar')
-rw-r--r--ishtar_common/templates/ishtar/blocks/sheet_map.html7
-rw-r--r--ishtar_common/templates/ishtar/sheet_town.html6
2 files changed, 6 insertions, 7 deletions
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_map.html b/ishtar_common/templates/ishtar/blocks/sheet_map.html
index 74182a2e1..1ecdb204f 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_map.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_map.html
@@ -1,5 +1,6 @@
-{% load i18n window_field %}{% if PROFILE.mapping and geo_item.main_geodata %}
+{% load i18n l10n window_field %}{% if PROFILE.mapping and geo_item.main_geodata %}
{% with geodata_list=geo_item.geodata_list %}
+{% localize off %}
<div class="col-12 col-lg-6 flex-wrap">
<div class="window-map" id="map-{{window_id}}-{{geo_item.SLUG}}-{{geo_item.pk}}">
</div>
@@ -73,8 +74,6 @@ const display_map_{{geo_item.SLUG}}_{{geo_item.pk}} = function() {
display_map_{{geo_item.SLUG}}_{{geo_item.pk}}();
refresh_map_{{geo_item.SLUG}}_{{geo_item.pk}}(true);
-
-
-</script>
+{% endlocalize %}</script>
{% endwith %}
{% endif %}
diff --git a/ishtar_common/templates/ishtar/sheet_town.html b/ishtar_common/templates/ishtar/sheet_town.html
index 4f154f40d..7b86b9bf1 100644
--- a/ishtar_common/templates/ishtar/sheet_town.html
+++ b/ishtar_common/templates/ishtar/sheet_town.html
@@ -91,7 +91,7 @@
{% endif %}
{% endwith %}
<hr class="clearfix">
- {% if PROFILE.mapping and geo_item.main_geodata %}
+ {% if PROFILE.mapping and item.main_geodata %}
<h3>{% trans "Geographic localisation" %}</h3>
<div class="row">
{% with geo_item=item %}
@@ -133,7 +133,7 @@
</div>
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
$(document).ready( function () {
datatable_options = {
"dom": 'ltip',
@@ -148,7 +148,7 @@ $(document).ready( function () {
}
});
} );
-</script>
+{% endlocalize %}</script>
{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}