diff options
Diffstat (limited to 'ishtar_common/templates/ishtar/blocks')
3 files changed, 9 insertions, 7 deletions
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 %}–{% 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 %}–{% 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 %}–{% 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 %}–{% 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> {% 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> {% 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 %} |