summaryrefslogtreecommitdiff
path: root/ishtar_common/templates/ishtar
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/templates/ishtar')
-rw-r--r--ishtar_common/templates/ishtar/basket_list.html6
-rw-r--r--ishtar_common/templates/ishtar/blocks/sheet_geographic.html8
-rw-r--r--ishtar_common/templates/ishtar/blocks/sheet_map.html3
-rw-r--r--ishtar_common/templates/ishtar/blocks/window_tables/dynamic_documents.html5
-rw-r--r--ishtar_common/templates/ishtar/forms/modify_parcels.html6
-rw-r--r--ishtar_common/templates/ishtar/forms/qa_base.html8
-rw-r--r--ishtar_common/templates/ishtar/forms/qa_message.html8
-rw-r--r--ishtar_common/templates/ishtar/formset_import_match.html6
-rw-r--r--ishtar_common/templates/ishtar/import_step_by_step.html6
-rw-r--r--ishtar_common/templates/ishtar/manage_basket.html6
-rw-r--r--ishtar_common/templates/ishtar/merge_organization.html6
-rw-r--r--ishtar_common/templates/ishtar/merge_person.html6
-rw-r--r--ishtar_common/templates/ishtar/organization_form.html8
-rw-r--r--ishtar_common/templates/ishtar/organization_person_form.html7
-rw-r--r--ishtar_common/templates/ishtar/person_form.html8
-rw-r--r--ishtar_common/templates/ishtar/sheet.html6
-rw-r--r--ishtar_common/templates/ishtar/sheet_area.html6
-rw-r--r--ishtar_common/templates/ishtar/wizard/default_wizard.html6
-rw-r--r--ishtar_common/templates/ishtar/wizard/search.html6
-rw-r--r--ishtar_common/templates/ishtar/wizard/wizard_done.html6
20 files changed, 62 insertions, 65 deletions
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 %}