diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-06-07 20:14:54 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2023-06-08 10:17:35 +0200 |
| commit | f6e87ee949148debc0c4c911153c828686e15123 (patch) | |
| tree | 6adf2a7f32bc6311afdf5414d4a5905c66e587a3 /archaeological_warehouse | |
| parent | 2eccf625a9a4e06e3236ece50728536bbe0cd75e (diff) | |
| download | Ishtar-f6e87ee949148debc0c4c911153c828686e15123.tar.bz2 Ishtar-f6e87ee949148debc0c4c911153c828686e15123.zip | |
🐛 many fix (or potential fix) in templates (inappropriate l10n) (refs #5594)
Diffstat (limited to 'archaeological_warehouse')
3 files changed, 9 insertions, 8 deletions
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 %} |