From f6e87ee949148debc0c4c911153c828686e15123 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 7 Jun 2023 20:14:54 +0200
Subject: 🐛 many fix (or potential fix) in templates (inappropriate l10n)
 (refs #5594)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 archaeological_finds/templates/ishtar/sheet_find.html             | 6 +++---
 archaeological_operations/templates/ishtar/sheet_operation.html   | 8 ++++----
 archaeological_warehouse/templates/ishtar/merge_container.html    | 5 +++--
 archaeological_warehouse/templates/ishtar/sheet_container.html    | 6 +++---
 archaeological_warehouse/templates/ishtar/sheet_warehouse.html    | 6 +++---
 changelog/en/changelog_2022-06-15.md                              | 4 +++-
 changelog/fr/changelog_2023-01-25.md                              | 3 ++-
 .../templates/admin/profiletype_summary_change_list.html          | 4 ++--
 ishtar_common/templates/base.html                                 | 6 +++---
 ishtar_common/templates/blocks/DataTables-stats-detail.html       | 6 +++---
 ishtar_common/templates/blocks/DataTables.html                    | 7 ++++---
 ishtar_common/templates/blocks/JQueryAdvancedTown.html            | 6 +++---
 ishtar_common/templates/blocks/JQueryJqGrid.html                  | 8 ++++----
 ishtar_common/templates/blocks/PersonOrganization.html            | 6 +++---
 ishtar_common/templates/blocks/bs_form_snippet.html               | 6 +++---
 ishtar_common/templates/gis/openlayers.html                       | 4 +++-
 ishtar_common/templates/ishtar/basket_list.html                   | 6 +++---
 ishtar_common/templates/ishtar/blocks/sheet_geographic.html       | 8 ++++----
 ishtar_common/templates/ishtar/blocks/sheet_map.html              | 3 ++-
 .../templates/ishtar/blocks/window_tables/dynamic_documents.html  | 5 +++--
 ishtar_common/templates/ishtar/forms/modify_parcels.html          | 6 +++---
 ishtar_common/templates/ishtar/forms/qa_base.html                 | 8 +++-----
 ishtar_common/templates/ishtar/forms/qa_message.html              | 8 +++-----
 ishtar_common/templates/ishtar/formset_import_match.html          | 6 +++---
 ishtar_common/templates/ishtar/import_step_by_step.html           | 6 +++---
 ishtar_common/templates/ishtar/manage_basket.html                 | 6 +++---
 ishtar_common/templates/ishtar/merge_organization.html            | 6 +++---
 ishtar_common/templates/ishtar/merge_person.html                  | 6 +++---
 ishtar_common/templates/ishtar/organization_form.html             | 8 ++++----
 ishtar_common/templates/ishtar/organization_person_form.html      | 7 +++----
 ishtar_common/templates/ishtar/person_form.html                   | 8 ++++----
 ishtar_common/templates/ishtar/sheet.html                         | 6 +++---
 ishtar_common/templates/ishtar/sheet_area.html                    | 6 +++---
 ishtar_common/templates/ishtar/wizard/default_wizard.html         | 6 +++---
 ishtar_common/templates/ishtar/wizard/search.html                 | 6 +++---
 ishtar_common/templates/ishtar/wizard/wizard_done.html            | 6 +++---
 ishtar_common/templates/widgets/CheckTextWidget.html              | 5 +++--
 ishtar_common/templates/widgets/UnitWidget.html                   | 4 ++--
 ishtar_common/templates/widgets/image_input.html                  | 6 +++---
 ishtar_common/templates/widgets/search_input.html                 | 6 +++---
 ishtar_common/templates/window.html                               | 6 +++---
 41 files changed, 125 insertions(+), 120 deletions(-)

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index a628498e0..42d7a41b9 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n ishtar_helpers window_field from_dict link_to_window window_tables window_header humanize %}
+{% load i18n l10n ishtar_helpers window_field from_dict link_to_window window_tables window_header humanize %}
 
 {% block head_title %}<strong>{% trans "Find" %}</strong>{% if item.denomination %} - {{item.denomination|default:""}}{% endif %} - {{item.label|default:""}}{% endblock %}
 
@@ -447,7 +447,7 @@
           </tr>
           {% endfor %}
       </table>
-      <p class='tool'><a class='badge' href="{% url 'get-upstreamtreatment' 'csv' %}?submited=1&amp;find_id={{item.pk}}" target="_blank" title='{% trans "Export as CSV"%}'>{% trans "CSV" %}</a> ({{ENCODING}})</p>
+      <p class='tool'><a class='badge' href="{% url 'get-upstreamtreatment' 'csv' %}?submited=1&amp;find_id={{item.pk|unlocalize}}" target="_blank" title='{% trans "Export as CSV"%}'>{% trans "CSV" %}</a> ({{ENCODING}})</p>
       {% endif %}
 
       {% if item.downstream_treatment %}
@@ -486,7 +486,7 @@
           {% endfor %}
       </table>
 
-      <p class='tool'><a class='badge' href="{% url 'get-downstreamtreatment' 'csv' %}?submited=1&amp;find_id={{item.pk}}" target="_blank">{% trans "CSV" %}</a> ({{ENCODING}})</p>
+      <p class='tool'><a class='badge' href="{% url 'get-downstreamtreatment' 'csv' %}?submited=1&amp;find_id={{item.pk|unlocalize}}" target="_blank">{% trans "CSV" %}</a> ({{ENCODING}})</p>
       {% endif %}
       {% endif %}
       {% if item.associated_treatment_files_count %}
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 7fbff7202..6fbc2e404 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n ishtar_helpers window_tables window_header window_ope_tables window_field from_dict %}
+{% load i18n l10n ishtar_helpers window_tables window_header window_ope_tables window_field from_dict %}
 
 {% block head_title %}<strong>{% trans "Operation" %}</strong> - {{item.short_label}}{% if item.common_name %} - {{item.common_name}}{% endif %}{% endblock %}
 
@@ -378,7 +378,7 @@
         <h4>{{rel.relation_type}}</h4>
         <div class="row">{% endifchanged %}
             <div class="col-12">
-                <a href="#" onclick="load_window('/show-operation/{{rel.right_record.pk}}/');" class="display_details">
+                <a href="#" onclick="load_window('/show-operation/{{rel.right_record.pk|unlocalize}}/');" class="display_details">
                     <i class="fa fa-info-circle" aria-hidden="true"></i>
                 </a> {{rel.right_record}}
             </div>
@@ -590,7 +590,7 @@
 </div>
 
 
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
 $(document).ready( function () {
     datatable_options = {
         "dom": 'ltip',
@@ -605,7 +605,7 @@ $(document).ready( function () {
             }
          });
 } );
-</script>
+{% endlocalize %}</script>
 
 {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
 
diff --git a/archaeological_warehouse/templates/ishtar/merge_container.html b/archaeological_warehouse/templates/ishtar/merge_container.html
index 558828586..a87ef13c4 100644
--- a/archaeological_warehouse/templates/ishtar/merge_container.html
+++ b/archaeological_warehouse/templates/ishtar/merge_container.html
@@ -1,4 +1,5 @@
 {% extends "ishtar/merge.html" %}
+{% load l10n %}
 {% block merge_field_row %}
       {% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %}
       <tr>
@@ -6,14 +7,14 @@
           <a href="#" onclick="load_window('{% url 'show-container' form.instance.from_container.pk '' %}', 'container');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          {{form.instance.from_container}} ({{form.instance.from_container.pk}})<br/>
+          {{form.instance.from_container}} ({{form.instance.from_container.pk|unlocalize}})<br/>
           {{form.instance.from_container.address_lbl|linebreaksbr}}
         </td>
         <td>
           <a href="#" onclick="load_window('{% url 'show-container' form.instance.to_container.pk '' %}', 'container');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          {{form.instance.to_container}} ({{form.instance.to_container.pk}})<br/>
+          {{form.instance.to_container}} ({{form.instance.to_container.pk|unlocalize}})<br/>
           {{form.instance.to_container.address_lbl|linebreaksbr}}
         </td>
         <td class='check'>{{form.b_is_duplicate_a}}</td>
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 142c586bf..eed28ca5b 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n ishtar_helpers window_header window_field window_tables link_to_window %}
+{% load i18n l10n ishtar_helpers window_header window_field window_tables link_to_window %}
 
 {% block head_title %}<strong>{% trans "Container" %}</strong> -
 {{ item.reference|default:"" }} ({{ item.container_type|default:"" }}) - {{item.location}}
@@ -303,7 +303,7 @@
 </div>
 
 
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
 $(document).ready( function () {
     datatable_options = {
         "dom": 'ltip',
@@ -318,7 +318,7 @@ $(document).ready( function () {
             }
          });
 } );
-</script>
+{% endlocalize %}</script>
 
 {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
 {% endblock %}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index b74d056a8..ab22d10e4 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n ishtar_helpers window_header window_field window_tables %}
+{% load i18n l10n ishtar_helpers window_header window_field window_tables %}
 
 {% block head_title %}<strong>{% trans "Warehouse" %}</strong> - {{item.name}} ({{item.warehouse_type}}){% endblock %}
 {% block toolbar %}
@@ -259,7 +259,7 @@
     {% endif %}
 </div>
 
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
 $(document).ready( function () {
     datatable_options = {
         "dom": 'ltip',
@@ -274,7 +274,7 @@ $(document).ready( function () {
             }
          });
 } );
-</script>
+{% endlocalize %}</script>
 
 {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
 {% endblock %}
diff --git a/changelog/en/changelog_2022-06-15.md b/changelog/en/changelog_2022-06-15.md
index af21a7dd3..e33597574 100644
--- a/changelog/en/changelog_2022-06-15.md
+++ b/changelog/en/changelog_2022-06-15.md
@@ -1,8 +1,10 @@
-v4.0.47 - 2023-
+v4.0.47 - 2023-06-08
 --------------------
 
 ### Technical ###
 - Improve post treatments after imports
+- Many fix (or potential fix) in templates (inappropriate l10n) (#5594)
+
 
 
 v4.0.46 - 2023-05-26
diff --git a/changelog/fr/changelog_2023-01-25.md b/changelog/fr/changelog_2023-01-25.md
index 8dbcafede..1b3c4613b 100644
--- a/changelog/fr/changelog_2023-01-25.md
+++ b/changelog/fr/changelog_2023-01-25.md
@@ -1,8 +1,9 @@
-v4.0.47 - 2023-
+v4.0.47 - 2023-06-08
 --------------------
 
 ### Technique ###
 - amélioration des post-traitements après import
+- nombreuses corrections (ou potentielles corrections) dans les templates (localisation inappropriée) (#5594)
 
 
 v4.0.46 - 2023-05-26
diff --git a/ishtar_common/templates/admin/profiletype_summary_change_list.html b/ishtar_common/templates/admin/profiletype_summary_change_list.html
index f071545cc..ca8f7f17f 100644
--- a/ishtar_common/templates/admin/profiletype_summary_change_list.html
+++ b/ishtar_common/templates/admin/profiletype_summary_change_list.html
@@ -1,4 +1,4 @@
-{% extends "admin/change_list.html" %}{% load i18n %}
+{% extends "admin/change_list.html" %}{% load i18n l10n %}
 
 {% block content_title %}
     <h1>{% trans "Profile type Summary" %}</h1>
@@ -16,7 +16,7 @@
         {% for profile_type in profile_types %}
         <th>
           <div class="text">
-            <a href="/admin/ishtar_common/profiletype/{{profile_type.pk}}/change/">
+            <a href="/admin/ishtar_common/profiletype/{{profile_type.pk|unlocalize}}/change/">
                 {{ profile_type.name }}
             </a>
           </div>
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 8937fe735..88824e4b2 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -1,4 +1,4 @@
-{% load i18n compress %}<!doctype html>
+{% load i18n l10n compress %}<!doctype html>
 <html lang="{{LANGUAGE_CODE}}">
 <head>
     <meta charset="utf-8">
@@ -227,10 +227,10 @@
     <div id='message'>
         <div class='information'><i class="fa fa-info-circle" aria-hidden="true"></i> <span class='content'></span></div>
     </div>
-    <script type='text/javascript'>
+    <script type="text/javascript">{% localize off %}
     {% block end_js %}
     {% endblock %}
-    </script>
+    {% endlocalize %}</script>
 </body>
 
 </html>
diff --git a/ishtar_common/templates/blocks/DataTables-stats-detail.html b/ishtar_common/templates/blocks/DataTables-stats-detail.html
index 9dcb04ae4..9dad573ac 100644
--- a/ishtar_common/templates/blocks/DataTables-stats-detail.html
+++ b/ishtar_common/templates/blocks/DataTables-stats-detail.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n l10n %}
 <div class="sources sources-{{extra}}">
     <div id="charts-{{stats_name}}-{{extra}}">
         <div id="chart-{{stats_name}}-{{extra}}-wrapper" class="chart-wrapper">
@@ -60,7 +60,7 @@
     </div>
 </div>
 
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">{% localize off %}
 jQuery(document).ready(function(){
         $("#chart-{{stats_name}}-wrapper-{{extra}}").resizable({
             handleSelector: ".resize-handler",
@@ -76,4 +76,4 @@ jQuery(document).ready(function(){
         });
     }
 );
-</script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/blocks/DataTables.html b/ishtar_common/templates/blocks/DataTables.html
index 4c1043c51..58180a949 100644
--- a/ishtar_common/templates/blocks/DataTables.html
+++ b/ishtar_common/templates/blocks/DataTables.html
@@ -1,5 +1,6 @@
-{% load i18n %}
+{% load i18n l10n %}
 
+{% localize off %}
 <button id='search_{{name}}' class='btn btn-primary search_button'
         type="button">
     {% trans "Search" %}</button>
@@ -53,7 +54,7 @@
 {% include "blocks/DataTables-content.html" %}
 {% endif %}
 
-<script type="text/javascript" language='javascript'>
+<script type="text/javascript">
 $('#modal_grid_{{name}}').on('show.bs.modal', function (e) {
     bs_expand_table("{{name}}");
 });
@@ -508,4 +509,4 @@ jQuery(document).ready(function(){
     return false;
   }
 </script>
-
+{% endlocalize %}
diff --git a/ishtar_common/templates/blocks/JQueryAdvancedTown.html b/ishtar_common/templates/blocks/JQueryAdvancedTown.html
index b74bb6b68..a894c3954 100644
--- a/ishtar_common/templates/blocks/JQueryAdvancedTown.html
+++ b/ishtar_common/templates/blocks/JQueryAdvancedTown.html
@@ -1,4 +1,4 @@
-{% load i18n %}</td></tr>
+{% load i18n l10n %}</td></tr>
 <tr>
   <td>{% trans "State" context "Region" %}</td>
   <td>
@@ -19,7 +19,7 @@
   <th><label>{% trans "Town" %}</label></th>
   <td><input{{attrs_select}}/>
 <input type="hidden"{{attrs_hidden}}/>
-<script type="text/javascript"><!--//
+<script type="text/javascript">{% localize off %}
     selected_department = "{{selected_department}}";
     var empty_select = "<option value=''>--------</option>";
 
@@ -96,4 +96,4 @@
 
         $(document).on("click", '#id_select_{{field_id}}', empty_town);
 
-});//--></script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/blocks/JQueryJqGrid.html b/ishtar_common/templates/blocks/JQueryJqGrid.html
index 642d0ca87..57d1fbaae 100644
--- a/ishtar_common/templates/blocks/JQueryJqGrid.html
+++ b/ishtar_common/templates/blocks/JQueryJqGrid.html
@@ -1,5 +1,5 @@
-{% load i18n %}
-
+{% load i18n l10n %}
+{% localize off %}
 <p class="text-center">
 
 <button id='search_{{name}}' class='btn btn-primary btn-block'>
@@ -45,7 +45,7 @@
 
 <input type="hidden" id="hidden_{{name}}" name="{{name}}"/>
 
-<script type="text/javascript" language='javascript'>
+<script type="text/javascript">
 
 var query_vars = new Array({{col_idx|safe}});
 var selItems_{{sname}} = new Array();
@@ -201,4 +201,4 @@ jQuery(document).ready(function(){
     return false;
   }
 </script>
-
+{% endlocalize %}
diff --git a/ishtar_common/templates/blocks/PersonOrganization.html b/ishtar_common/templates/blocks/PersonOrganization.html
index 6e7264c8e..a33feb1e3 100644
--- a/ishtar_common/templates/blocks/PersonOrganization.html
+++ b/ishtar_common/templates/blocks/PersonOrganization.html
@@ -1,9 +1,9 @@
-{% load i18n %}<input{{attrs_select}}/>
+{% load i18n l10n %}<input{{attrs_select}}/>
 </table>
 
 <div id='div-{{name}}'></div>
 
 <input type="hidden"{{attrs_hidden}}/>
-<script type="text/javascript"><!--//
+<script type="text/javascript">{% localize off %}
 {{js}}
-//--></script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html
index c80468db9..686bdd9c3 100644
--- a/ishtar_common/templates/blocks/bs_form_snippet.html
+++ b/ishtar_common/templates/blocks/bs_form_snippet.html
@@ -1,4 +1,4 @@
-{% load i18n from_dict %}
+{% load i18n l10n from_dict %}
 {% if form.non_field_errors and not no_error %}
 <div class="alert alert-danger" role="alert">
     {{form.non_field_errors}}
@@ -127,9 +127,9 @@
 {% endfor %}
 
 {% if search %}
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
 $(register_advanced_search);
-</script>
+{% endlocalize %}</script>
 {% endif %}
 {% if form.extra_render %}
 {{form.extra_render|safe}}
diff --git a/ishtar_common/templates/gis/openlayers.html b/ishtar_common/templates/gis/openlayers.html
index d6d0bf40c..1e0bb6cc7 100644
--- a/ishtar_common/templates/gis/openlayers.html
+++ b/ishtar_common/templates/gis/openlayers.html
@@ -1,4 +1,5 @@
 {% load i18n l10n %}
+{% localize off %}
 <style type="text/css">{% block map_css %}{% get_current_language_bidi as LANGUAGE_BIDI %}
     #{{ id }}_map { width: {{ map_width }}px; height: {{ map_height }}px; }
     #{{ id }}_map .aligned label { float: inherit; }
@@ -31,7 +32,7 @@
             id: '{{ id }}',
             map_id: '{{ id }}_map',
             map_options: map_options,
-            map_srid: {{ map_srid|unlocalize }},
+            map_srid: {{ map_srid }},
             name: '{{ name }}'
         };
         {% endblock %}
@@ -40,3 +41,4 @@
         {% endblock %}
     </script>
 </div>
+{% endlocalize %}
diff --git a/ishtar_common/templates/ishtar/basket_list.html b/ishtar_common/templates/ishtar/basket_list.html
index 43236aeb0..e70d87636 100644
--- a/ishtar_common/templates/ishtar/basket_list.html
+++ b/ishtar_common/templates/ishtar/basket_list.html
@@ -1,14 +1,14 @@
-{% load i18n %}
+{% load i18n l10n %}
 <ul class="list-group">
     {% for item in basket.items.all %}
     <li class="list-group-item">
         <a class="display_details" href="#"
-            onclick="load_window('{{item_url}}/{{item.pk}}/');"><i class="fa fa-info-circle" aria-hidden="true"></i>
+            onclick="load_window('{{item_url}}/{{item.pk|unlocalize}}/');"><i class="fa fa-info-circle" aria-hidden="true"></i>
         </a>
         <span>{{item.full_label}}</span>
         <a class='async-link text-danger float-right'
            data-target='#basket-content'
-           href='{{delete_url}}/{{basket.pk}}/{{item.pk}}/'>
+           href='{{delete_url}}/{{basket.pk|unlocalize}}/{{item.pk|unlocalize}}/'>
             <i class="fa fa-times" aria-hidden="true"></i>
         </a>
     </li>
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
index e119cb3f0..eeb618bfe 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_geographic.html
@@ -1,4 +1,4 @@
-{% load i18n ishtar_helpers window_field %}
+{% load i18n l10n ishtar_helpers window_field %}
 {% with search_url=item.get_search_url %}
 <table id='{{window_id}}-geographic-data' class="table table-striped">
     <tr>
@@ -16,7 +16,7 @@
 {% for geo in geo_item.geodata.all %}
     <tr>
         {% if not IS_HISTORY and permission_change_geo %}<td>
-        <a title="{% trans 'Edit' %}" href="{% url 'edit-geo' geo.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk}}{% endif %}">{% if geo|can_edit_item:request %}<i class="fa fa-pencil"></i></a>{% else %}&ndash;{% endif %}
+        <a title="{% trans 'Edit' %}" href="{% url 'edit-geo' geo.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk|unlocalize}}{% endif %}">{% if geo|can_edit_item:request %}<i class="fa fa-pencil"></i></a>{% else %}&ndash;{% endif %}
         </td>{% endif %}
         <td>{% if geo.id == geo_item.main_geodata_id %}<i class="fa fa-check-circle text-success" aria-hidden="true"></i>{% else %}&ndash;{% endif %}</td>
         <td>{% if geo.data_type %}{{ geo.data_type }}{% else %}-{% endif %}</td>
@@ -28,7 +28,7 @@
         <td>{% if geo.comment %}{{ geo.comment }}{% else %}-{% endif %}</td>
         {% if not IS_HISTORY and permission_change_geo and output != "ODT" and output != "PDF" %}<td>
             <a title="{% trans 'Delete' %}"
-               href="{% url 'delete-geo' geo.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk}}{% endif %}">
+               href="{% url 'delete-geo' geo.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk|unlocalize}}{% endif %}">
                 {% if geo|can_edit_item:request %}<i class="fa fa-trash text-danger"></i></a>{% else %}&ndash;{% endif %}
         </td>{% endif %}
     </tr>
@@ -36,7 +36,7 @@
 </table>
 {% if not IS_HISTORY and permission_change_geo and output != "ODT" and output != "PDF" %}
 <div class="text-center">
-    <a class="btn btn-success" href="{% url 'create-pre-geo' item.app_label item.model_name item.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk}}{% endif %}"><i class="fa fa-plus"></i> &nbsp;{% trans "geo item" %}</a>
+    <a class="btn btn-success" href="{% url 'create-pre-geo' item.app_label item.model_name item.pk %}{% if search_url %}?back_url={{search_url}}%3Fopen_item={{geo_item.pk|unlocalize}}{% endif %}"><i class="fa fa-plus"></i> &nbsp;{% trans "geo item" %}</a>
 </div>
 {% endif %}
 {% endwith %}
\ No newline at end of file
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_map.html b/ishtar_common/templates/ishtar/blocks/sheet_map.html
index 1ecdb204f..a7db9c35f 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_map.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_map.html
@@ -74,6 +74,7 @@ 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);
-{% endlocalize %}</script>
+</script>
+{% endlocalize %}
 {% endwith %}
 {% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
index 542866eb1..ef0e49f8f 100644
--- a/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
+++ b/ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html
@@ -1,5 +1,6 @@
-{% load i18n %}
+{% load i18n l10n %}
 
+{% localize off %}
 <h3>{{caption}}</h3>
 
 <div class="modal fade table-modal-lg" tabindex="-1" role="dialog"
@@ -123,4 +124,4 @@ setTimeout(
 }, 200);
 
 </script>
-
+{% endlocalize %}
diff --git a/ishtar_common/templates/ishtar/forms/modify_parcels.html b/ishtar_common/templates/ishtar/forms/modify_parcels.html
index 067655889..4c7c39120 100644
--- a/ishtar_common/templates/ishtar/forms/modify_parcels.html
+++ b/ishtar_common/templates/ishtar/forms/modify_parcels.html
@@ -1,4 +1,4 @@
-{% load i18n inline_formset table_form %}
+{% load i18n l10n inline_formset table_form %}
 
 <div class="modal-dialog modal-lg">
     <div class="modal-content">
@@ -49,7 +49,7 @@
         </form>
     </div>
 </div>
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
     {% block js %}
     {% endblock %}
     $(document).ready(function(){
@@ -61,4 +61,4 @@
     {% block js_ready %}
     {% endblock %}
     });
-</script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/ishtar/forms/qa_base.html b/ishtar_common/templates/ishtar/forms/qa_base.html
index 32951c49a..f6e43ad15 100644
--- a/ishtar_common/templates/ishtar/forms/qa_base.html
+++ b/ishtar_common/templates/ishtar/forms/qa_base.html
@@ -1,4 +1,4 @@
-{% load i18n inline_formset table_form %}
+{% load i18n l10n inline_formset table_form %}
 
 <div class="modal-dialog {% if modal_size == 'large' %}modal-lg {% elif modal_size == 'small'%}modal-sm {% endif%}modal-dialog-centered">
     <div class="modal-content">
@@ -65,7 +65,7 @@
         </form>
     </div>
 </div>
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
     {% block js %}
     {% endblock %}
     $(document).ready(function(){
@@ -77,6 +77,4 @@
     {% block js_ready %}
     {% endblock %}
     });
-</script>
-
-
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/ishtar/forms/qa_message.html b/ishtar_common/templates/ishtar/forms/qa_message.html
index 711aab492..43e0f170f 100644
--- a/ishtar_common/templates/ishtar/forms/qa_message.html
+++ b/ishtar_common/templates/ishtar/forms/qa_message.html
@@ -1,4 +1,4 @@
-{% load i18n inline_formset table_form %}
+{% load i18n l10n inline_formset table_form %}
 
 <div class="modal-dialog {% if modal_size == 'large' %}modal-lg {% elif modal_size == 'small'%}modal-sm {% endif%}modal-dialog-centered">
     <div class="modal-content">
@@ -13,12 +13,10 @@
         </div>
     </div>
 </div>
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
     {% block js %}
     {% endblock %}
     $(document).ready(function(){
         qa_action_register("{{url}}");
     });
-</script>
-
-
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/ishtar/formset_import_match.html b/ishtar_common/templates/ishtar/formset_import_match.html
index acec95a65..912577e76 100644
--- a/ishtar_common/templates/ishtar/formset_import_match.html
+++ b/ishtar_common/templates/ishtar/formset_import_match.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n l10n %}
 {% block extra_head %}
 {{formset.media}}
 {% endblock %}
@@ -90,7 +90,7 @@
 <p class="text-center">
   <a href="{% url 'current_imports' %}">{% trans "Back to import list" %}</a>
 </p>
-  <script type="text/javascript">
+  <script type="text/javascript">{% localize off %}
   $(document).ready(function() {{% for frm in formset %}
     $("#all-remember-{{forloop.counter0}}").change(
       function(){
@@ -102,7 +102,7 @@
     );
   {% endfor %}
   });
-  </script>
+  {% endlocalize %}</script>
 {% endblock %}
 {% block footer %}
 <div id="footer">
diff --git a/ishtar_common/templates/ishtar/import_step_by_step.html b/ishtar_common/templates/ishtar/import_step_by_step.html
index 8f5dfc723..d1dc71d98 100644
--- a/ishtar_common/templates/ishtar/import_step_by_step.html
+++ b/ishtar_common/templates/ishtar/import_step_by_step.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n inline_formset link_to_window %}
+{% load i18n l10n inline_formset link_to_window %}
 
 {% block content %}
 <p class="text-center">
@@ -319,7 +319,7 @@
     </div>
 
 </form>
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
     var modified = false;
     var no_modif_msg = "{% trans "No modification made to the source file" %}";
     var modif_msg = "{% trans "Modification to the source file have been made. Save or cancel these modification before import." %}";
@@ -346,7 +346,7 @@
         });
         no_modif_made();
     });
-</script>
+{% endlocalize %}</script>
 {% endif %}
 
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html
index c72d86664..5f3bf2c8f 100644
--- a/ishtar_common/templates/ishtar/manage_basket.html
+++ b/ishtar_common/templates/ishtar/manage_basket.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n inline_formset %}
+{% load i18n l10n inline_formset %}
 {% block content %}
 <h2>{{page_name}}{% trans ":"%} {{basket}}</h2>
 <form enctype="multipart/form-data" action="." method="post"
@@ -23,7 +23,7 @@
     <div class="clearfix"></div>
 </div>
 </form>
-<script type='text/javascript' language='javascript'>
+<script type="text/javascript">{% localize off %}
 
 var current_item_number = 0;
 
@@ -62,7 +62,7 @@ $('#add_to').click(function(){
 jQuery(document).ready(function(){
     $.get('{{list_url}}', load_list);
 });
-</script>
+{% endlocalize %}</script>
 {% endblock %}
 {% block footer %}
 <div id="footer">
diff --git a/ishtar_common/templates/ishtar/merge_organization.html b/ishtar_common/templates/ishtar/merge_organization.html
index f2ce05b41..ec29db07f 100644
--- a/ishtar_common/templates/ishtar/merge_organization.html
+++ b/ishtar_common/templates/ishtar/merge_organization.html
@@ -1,4 +1,4 @@
-{% extends "ishtar/merge.html" %}{% load i18n %}
+{% extends "ishtar/merge.html" %}{% load i18n l10n %}
 {% block merge_field_row %}
       {% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %}
       <tr>
@@ -6,7 +6,7 @@
           <a href="#" onclick="load_window('{% url 'show-organization' form.instance.from_organization.pk '' %}', 'organization');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          <span title="{% trans 'Name' %}">{{form.instance.from_organization.name}}</span> ({{form.instance.from_organization.pk}})<br>
+          <span title="{% trans 'Name' %}">{{form.instance.from_organization.name}}</span> ({{form.instance.from_organization.pk|unlocalize}})<br>
           {% if form.instance.from_organization.organization_type %}<span title="{% trans 'Type' %}">{{form.instance.from_organization.organization_type}}</span><br>{% endif %}
           {% if form.instance.from_organization.url %}<span title="{% trans 'URL' %}">{{form.instance.from_organization.url}}</span><br>{% endif %}
           {% for value, title in form.instance.from_organization.address_lbl_list %}
@@ -17,7 +17,7 @@
           <a href="#" onclick="load_window('{% url 'show-organization' form.instance.to_organization.pk '' %}', 'organization');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          <span title="{% trans 'Name' %}">{{form.instance.to_organization.name}}</span> ({{form.instance.to_organization.pk}})<br>
+          <span title="{% trans 'Name' %}">{{form.instance.to_organization.name}}</span> ({{form.instance.to_organization.pk|unlocalize}})<br>
           {% if form.instance.to_organization.organization_type %}<span title="{% trans 'Type' %}">{{form.instance.to_organization.organization_type}}</span><br>{% endif %}
           {% if form.instance.to_organization.url %}<span title="{% trans 'URL' %}">{{form.instance.to_organization.url}}</span><br>{% endif %}
           {% for value, title in form.instance.to_organization.address_lbl_list %}
diff --git a/ishtar_common/templates/ishtar/merge_person.html b/ishtar_common/templates/ishtar/merge_person.html
index bb80a5645..172f3e3db 100644
--- a/ishtar_common/templates/ishtar/merge_person.html
+++ b/ishtar_common/templates/ishtar/merge_person.html
@@ -1,4 +1,4 @@
-{% extends "ishtar/merge.html" %}{% load i18n %}
+{% extends "ishtar/merge.html" %}{% load i18n l10n %}
 {% block merge_field_row %}
       {% if form.non_field_errors %}<tr><td colspan='4'></td><td colspan='3' class='errorlist'>{% for error in form.non_field_errors %}{{error}} {% endfor%}</tr>{% endif %}
       <tr>
@@ -6,7 +6,7 @@
           <a href="#" onclick="load_window('{% url 'show-person' form.instance.from_person.pk '' %}', 'person');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          <span title="{% trans 'Raw name' %}">{{form.instance.from_person.raw_name}}</span> ({{form.instance.from_person.pk}})<br>
+          <span title="{% trans 'Raw name' %}">{{form.instance.from_person.raw_name}}</span> ({{form.instance.from_person.pk|unlocalize}})<br>
           <span title="{% trans 'Title' %}">{{form.instance.from_person.title|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.from_person.name|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.from_person.surname|default:""}}</span><br>
           {% if form.instance.from_person.attached_to %}<span title="{% trans 'Organization' %}">{{form.instance.from_person.attached_to}}</span><br>{% endif %}
           {% if form.instance.from_person.salutation %}<span title="{% trans 'Salutation' %}">{{form.instance.from_person.salutation}}</span><br>{% endif %}
@@ -18,7 +18,7 @@
           <a href="#" onclick="load_window('{% url 'show-person' form.instance.to_person.pk '' %}', 'person');" class="display_details"><i class="fa fa-info-circle" aria-hidden="true"></i></a>
         </td>
         <td>
-          <span title="{% trans 'Raw name' %}">{{form.instance.to_person.raw_name}}</span> ({{form.instance.to_person.pk}})<br>
+          <span title="{% trans 'Raw name' %}">{{form.instance.to_person.raw_name}}</span> ({{form.instance.to_person.pk|unlocalize}})<br>
           <span title="{% trans 'Title' %}">{{form.instance.to_person.title|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.to_person.name|default:""}}</span> <span title="{% trans 'Name' %}">{{form.instance.to_person.surname|default:""}}</span><br>
           {% if form.instance.to_person.attached_to %}<span title="{% trans 'Organization' %}">{{form.instance.to_person.attached_to}}</span><br>{% endif %}
           {% if form.instance.to_person.salutation %}<span title="{% trans 'Salutation' %}">{{form.instance.to_person.salutation}}</span><br>{% endif %}
diff --git a/ishtar_common/templates/ishtar/organization_form.html b/ishtar_common/templates/ishtar/organization_form.html
index 828023908..7f6e2725b 100644
--- a/ishtar_common/templates/ishtar/organization_form.html
+++ b/ishtar_common/templates/ishtar/organization_form.html
@@ -1,9 +1,9 @@
-{% load i18n %}
+{% load i18n l10n %}
 <div id='orga-form'>
 <form id='dyn-form-organization' method='post'>
 {% csrf_token %}
 {% for hidden in form.hidden_fields %}{{hidden}}{% endfor %}
-<input type='hidden' name='hidden_organization_pk' id='hidden_organization_pk' value='{{object.pk}}'/>
+<input type='hidden' name='hidden_organization_pk' id='hidden_organization_pk' value='{{object.pk|unlocalize}}'/>
 <input type='hidden' name='hidden_organization_lbl' id='hidden_organization_lbl' value="{{object}}"/>
 <table class='organization'>
 <tr>
@@ -41,7 +41,7 @@
 </div>
 </form>
 </div>
-<script type="text/javascript"><!--//
+<script type="text/javascript">{% localize off %}
 
 function checkPendingRequest(todo) {
     window.setTimeout(function () {
@@ -132,4 +132,4 @@ $(function() {
 
 
 });
-//--></script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/ishtar/organization_person_form.html b/ishtar_common/templates/ishtar/organization_person_form.html
index e258441b3..eaedbdfa0 100644
--- a/ishtar_common/templates/ishtar/organization_person_form.html
+++ b/ishtar_common/templates/ishtar/organization_person_form.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n l10n %}
 <div id='orga-person-form'>
 <form id='dyn-form-person' method='post'>
 {% csrf_token %}
@@ -36,7 +36,7 @@
 </div>
 </form>
 </div>
-<script type="text/javascript"><!--//
+<script type="text/javascript">{% localize off %}
 
 function checkPendingRequest(todo) {
     window.setTimeout(function () {
@@ -127,5 +127,4 @@ $(function() {
 
 
 });
-//--></script>
-
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/ishtar/person_form.html b/ishtar_common/templates/ishtar/person_form.html
index 10a49cd52..0306bad9e 100644
--- a/ishtar_common/templates/ishtar/person_form.html
+++ b/ishtar_common/templates/ishtar/person_form.html
@@ -1,9 +1,9 @@
-{% load i18n %}
+{% load i18n l10n %}
 <div id='person-form'>
 <form id='dyn-form-person' method='post'>
 {% csrf_token %}
 {% for hidden_field in form.hidden_fields %}{{hidden_field}}{% endfor %}
-<input type='hidden' name='hidden_person_pk' id='hidden_person_pk' value='{{object.pk}}'/>
+<input type='hidden' name='hidden_person_pk' id='hidden_person_pk' value='{{object.pk|unlocalize}}'/>
 <input type='hidden' name='hidden_person_lbl' id='hidden_person_lbl' value="{{object}}"/>
 <table class='person'>
 <caption>{% trans "Identification" %}</caption>
@@ -47,7 +47,7 @@
 </div>
 </form>
 </div>
-<script type="text/javascript"><!--//
+<script type="text/javascript">{% localize off %}
 $(function() {
     // person_save_callback and person_new_callback must have been defined
     disable_person = function(){
@@ -110,4 +110,4 @@ $(function() {
 
 
 });
-//--></script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/ishtar/sheet.html b/ishtar_common/templates/ishtar/sheet.html
index a4a3e2228..f3df2e510 100644
--- a/ishtar_common/templates/ishtar/sheet.html
+++ b/ishtar_common/templates/ishtar/sheet.html
@@ -1,4 +1,4 @@
-{% load i18n ishtar_helpers %}{% block main_head %}<html lang="en">
+{% load i18n l10n ishtar_helpers %}{% block main_head %}<html lang="en">
 <head>
     <title>{% block title %}Ishtar{% if APP_NAME %} - {{APP_NAME}}{%endif%}{% endblock %}
     </title>
@@ -76,7 +76,7 @@
       <div class="card-body">
         {% if output != "ODT" and output != "PDF" %}
         {% block head_sheet %}
-        <script type="text/javascript">
+        <script type="text/javascript">{% localize off %}
         var last_window='{{window_id}}';
 
         jQuery(document).ready(function(){
@@ -125,7 +125,7 @@
                 $(e.target).resize();  // fix table header refresh for datatable
             })
         });
-        </script>
+        {% endlocalize %}</script>
         {% endblock %}
         {% endif %}
         <div class="body">
diff --git a/ishtar_common/templates/ishtar/sheet_area.html b/ishtar_common/templates/ishtar/sheet_area.html
index 8c343f9aa..c4f67885e 100644
--- a/ishtar_common/templates/ishtar/sheet_area.html
+++ b/ishtar_common/templates/ishtar/sheet_area.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n ishtar_helpers window_tables window_header window_field from_dict link_to_window %}
+{% load i18n l10n ishtar_helpers window_tables window_header window_field from_dict link_to_window %}
 
 {% block head_title %}<strong>{% trans "Area" %}</strong> - {{item.name}}{% if item.reference %} ({{item.reference}}){% endif %}{% endblock %}
 
@@ -107,7 +107,7 @@
 </div>
 
 
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
 $(document).ready( function () {
     datatable_options = {
         "dom": 'ltip',
@@ -122,7 +122,7 @@ $(document).ready( function () {
             }
          });
 } );
-</script>
+{% endlocalize %}</script>
 
 {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
 
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 249d4c4ce..50e0662ae 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n range table_form %}
+{% load i18n l10n range table_form %}
 {% block extra_head %}
 {{wizard.form.media}}
 {% endblock %}
@@ -49,7 +49,7 @@
 </div>
 </form>
 {% endblock %}
-<script language="javascript" type="text/javascript">
+<script type="text/javascript">{% localize off %}
 var form_changed = false;
 {% block "js_extra_generic" %}
 {% endblock %}
@@ -66,5 +66,5 @@ $(document).ready(function(){
     {% block "js_extra_ready" %}
     {% endblock %}
 });
-</script>
+{% endlocalize %}</script>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/search.html b/ishtar_common/templates/ishtar/wizard/search.html
index 2e7e9bb08..9047c47fc 100644
--- a/ishtar_common/templates/ishtar/wizard/search.html
+++ b/ishtar_common/templates/ishtar/wizard/search.html
@@ -1,12 +1,12 @@
 {% extends "base.html" %}
-{% load i18n range %}
+{% load i18n l10n range %}
 {% block extra_head %}
 {{wizard.form.media}}
 {% endblock %}
 {% block content %}
 <h3>{{wizard_label}}</h3>
 {% if default_search_vector or open_url %}
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
     {% if default_search_vector %}
     var default_search_vector = "{{default_search_vector|safe}}".replace(/''/g, '"');{% endif %}
     $(document).ready(function() {
@@ -14,7 +14,7 @@
         $("#id_search_vector").val(default_search_vector.replace(/''/g, '"'));{% endif %}
         {% if open_url %}load_window("{{open_url}}");{% endif %}
     });
-</script>
+{% endlocalize %}</script>
 {% endif %}
 
 {% comment %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_done.html b/ishtar_common/templates/ishtar/wizard/wizard_done.html
index 5acd6e78e..ba12bf1e8 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_done.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load i18n %}
+{% load i18n l10n %}
 
 {% block top_content %}
 <div class="alert alert-success alert-dismissible fade show" role="alert">
@@ -11,7 +11,7 @@
 
 {% block content %}
 {% if redirect or wizard_done_window %}
-<script type='text/javascript' language='javascript'>
+<script type="text/javascript">{% localize off %}
 {% if redirect %}
 window.location.href = "{{redirect}}";
 {% endif %}
@@ -20,6 +20,6 @@ $(function(){
     load_window("{{wizard_done_window}}{{item.pk}}/", "",
                 function (){}, true); });
 {% endif %}
-</script>
+{% endlocalize %}</script>
 {% endif %}
 {% endblock %}
diff --git a/ishtar_common/templates/widgets/CheckTextWidget.html b/ishtar_common/templates/widgets/CheckTextWidget.html
index 593fcbb5b..59ac79b58 100644
--- a/ishtar_common/templates/widgets/CheckTextWidget.html
+++ b/ishtar_common/templates/widgets/CheckTextWidget.html
@@ -1,3 +1,4 @@
+{% load l10n %}
 <div class="input-group">
     <input class="area_widget form-control" type="text"{{final_attrs|safe}}>
     <div class="input-group-append">
@@ -7,7 +8,7 @@
         </div>
     </div>
 </div>
-<script type="text/javascript"><!--//
+<script type="text/javascript">{% localize off %}
     $("#check-{{id}} .text-danger").hide();
     $("#check-{{id}} .text-success").hide();
     function evaluate_{{safe_id}}(){
@@ -22,4 +23,4 @@
     }
     $("#{{id}}").keyup(evaluate_{{safe_id}});
     $(document).ready(evaluate_{{safe_id}}());
-//--></script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/widgets/UnitWidget.html b/ishtar_common/templates/widgets/UnitWidget.html
index 6c9df113a..1e6451708 100644
--- a/ishtar_common/templates/widgets/UnitWidget.html
+++ b/ishtar_common/templates/widgets/UnitWidget.html
@@ -6,7 +6,7 @@
         </div>
     </div>
 </div>
-<script type="text/javascript">{% localize off %}<!--//
+<script type="text/javascript">{% localize off %}
     function evaluate_{{safe_id}}(){
         value = parseFloat($("#{{id}}").val());
         if(!isNaN(value)){
@@ -18,4 +18,4 @@
     }
     $("#{{id}}").keyup(evaluate_{{safe_id}});
     $(document).ready(evaluate_{{safe_id}}());
-//-->{% endlocalize %}</script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/widgets/image_input.html b/ishtar_common/templates/widgets/image_input.html
index 4b1d83c0e..cc2e9811a 100644
--- a/ishtar_common/templates/widgets/image_input.html
+++ b/ishtar_common/templates/widgets/image_input.html
@@ -1,4 +1,4 @@
-{% load i18n %}<div class="form-row form-control">
+{% load i18n l10n %}<div class="form-row form-control">
     {% if widget.value and widget.value.url or hidden_value %}
     <span class="col-4">
         <div id="lightgallery-{{widget.name}}">
@@ -46,7 +46,7 @@
     </span>
 </div>
 {% if is_initial or widget.value.url %}
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
 $(document).ready(function(){
     if (mobile_check()){
         $(".mobile-capture").show();
@@ -56,5 +56,5 @@ $(document).ready(function(){
     lightGallery(document.getElementById('lightgallery-{{widget.name}}'));
     register_preview_input_image("{{ widget.name }}");
 });
-</script>
+{% endlocalize %}</script>
 {% endif %}
diff --git a/ishtar_common/templates/widgets/search_input.html b/ishtar_common/templates/widgets/search_input.html
index 114fea5a1..7ba147a77 100644
--- a/ishtar_common/templates/widgets/search_input.html
+++ b/ishtar_common/templates/widgets/search_input.html
@@ -1,4 +1,4 @@
-{% load i18n %}<div class="input-group search-widget">
+{% load i18n l10n %}<div class="input-group search-widget">
     <input type="{{ widget.type }}" name="{{ widget.name }}"
            {% if widget.value != None %} value="{{ widget.value|stringformat:'s' }}"{% endif %}{% include "django/forms/widgets/attrs.html" %} />
     <span class="input-group-append">
@@ -52,7 +52,7 @@
     </span>
 </div>
 
-<script type="text/javascript">
+<script type="text/javascript">{% localize off %}
 var bookmark_url = "{% url 'bookmark-list' app_name pin_model %}";
 
 if (typeof enable_save == "undefined") {
@@ -85,4 +85,4 @@ $(document).ready(function(){
     enable_save();
     load_bookmark_list();
 });
-</script>
+{% endlocalize %}</script>
diff --git a/ishtar_common/templates/window.html b/ishtar_common/templates/window.html
index dc94b4aae..993df68cc 100644
--- a/ishtar_common/templates/window.html
+++ b/ishtar_common/templates/window.html
@@ -1,4 +1,4 @@
-{% load i18n %}
+{% load i18n l10n %}
 <!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" xml:lang="en" lang="en">
@@ -45,14 +45,14 @@
 
   </form>
 </div>
-<script type='text/javascript' language='javascript'>
+<script type="text/javascript">{% localize off %}
 {% if new_item_label %}
 save_and_close_window{% if many %}_many{% endif %}("{{parent_name}}", "{{parent_pk}}", "{{new_item_label|safe}}", "{{new_item_pk}}");
 {% endif %}
 $("#cancel-btn").click(function(){
     close();
 });
-</script>
+{% endlocalize %}</script>
 
 </body>
 </html>
-- 
cgit v1.2.3