6 files changed, 20 insertions, 19 deletions
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}}