From 5dd2be142e031d21108296b601c261665d32fb7e Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Wed, 15 Mar 2017 11:54:54 +0100
Subject: Sheets: mark explicitly some fields as translated fields (refs #3459)

---
 .../templates/ishtar/sheet_contextrecord.html                       | 3 ++-
 .../templates/ishtar/sheet_contextrecordsource.html                 | 3 ++-
 archaeological_finds/models_finds.py                                | 3 ++-
 archaeological_finds/templates/ishtar/sheet_find.html               | 3 ++-
 archaeological_finds/templates/ishtar/sheet_findsource.html         | 3 ++-
 .../templates/ishtar/sheet_treatmentfilesource.html                 | 3 ++-
 archaeological_finds/templates/ishtar/sheet_treatmentsource.html    | 3 ++-
 archaeological_operations/templates/ishtar/sheet_operation.html     | 3 ++-
 .../templates/ishtar/sheet_operationsource.html                     | 3 ++-
 ishtar_common/templates/ishtar/sheet_source.html                    | 6 ++++--
 10 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 3f19289e0..8398a0523 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -73,7 +73,8 @@
 {% endif %}
 <ul class='form-flex'>
 {% field_li "Year" item.operation.year %}
-{% field_li "Numerical reference" item.operation.operation_code %}
+    {% trans "Numerical reference" as num_ref_label %}
+    {% field_li num_ref_label item.operation.operation_code %}
 {% field_li "Patriarche OA code" item.operation.code_patriarche %}
 {% field_li_detail "Head scientist" item.operation.scientist %}
 <li><label>{%trans "State:"%}</label><span class='value'>{% if item.operation.is_active %}{% trans "Active file" %}{% else %}{%trans "Closed operation" %}{% endif %}</span></li>
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html b/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html
index 253d5f047..bd6cdcdba 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecordsource.html
@@ -8,5 +8,6 @@
 {% endblock %}
 
 {% block related %}
-{% field "Related context record" item.owner '' item.owner|link_to_window %}
+{% trans "Related context record" as related_item_label %}
+{% field related_item_label item.owner '' item.owner|link_to_window %}
 {% endblock %}
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 5872a241f..4ece0b286 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -485,7 +485,8 @@ class Find(BaseHistorizedItem, ImageModel, OwnPerms, ShortMenuItem):
                   'base_finds__context_record__operation__common_name',
                   'base_finds__context_record__parcel',
                   'base_finds__context_record__label',
-                  'material_types__label', 'object_types', 'datings__period__label',
+                  'material_types__label', 'object_types',
+                  'datings__period__label',
                   'container__cached_label',
                   'base_finds__batch', ]
     if settings.COUNTRY == 'fr':
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 7889870b9..df9fedb10 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -22,7 +22,8 @@
   {% field_li "Previous ID" item.previous_id %}
 
   {% include "ishtar/blocks/sheet_creation_section.html" %}
-{% field_li "Administrative index" item.administrative_index %}
+  {% trans "Administrative index" as admin_index_label %}
+  {% field_li admin_index_label item.administrative_index %}
 {% field_li_multiple "Material types" item.material_types %}
 {% field_li "Dating" item.dating %}
 {% field_li "Length (cm)" item.length %}
diff --git a/archaeological_finds/templates/ishtar/sheet_findsource.html b/archaeological_finds/templates/ishtar/sheet_findsource.html
index 69d14d161..fedb20911 100644
--- a/archaeological_finds/templates/ishtar/sheet_findsource.html
+++ b/archaeological_finds/templates/ishtar/sheet_findsource.html
@@ -8,5 +8,6 @@
 {% endblock %}
 
 {% block related %}
-{% field "Related find" item.owner '' item.owner|link_to_window %}
+{% trans "Related find" as related_item_label %}
+{% field related_item_label item.owner '' item.owner|link_to_window %}
 {% endblock %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
index e558296a8..17cc14b5b 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentfilesource.html
@@ -8,5 +8,6 @@
 {% endblock %}
 
 {% block related %}
-{% field "Related treatment request" item.owner '' item.owner|link_to_window %}
+{% trans "Related treatment request" as related_item_label %}
+{% field related_item_label item.owner '' item.owner|link_to_window %}
 {% endblock %}
diff --git a/archaeological_finds/templates/ishtar/sheet_treatmentsource.html b/archaeological_finds/templates/ishtar/sheet_treatmentsource.html
index 0825810ad..70e69c704 100644
--- a/archaeological_finds/templates/ishtar/sheet_treatmentsource.html
+++ b/archaeological_finds/templates/ishtar/sheet_treatmentsource.html
@@ -8,5 +8,6 @@
 {% endblock %}
 
 {% block related %}
-{% field "Related treatment" item.owner '' item.owner|link_to_window %}
+{% trans "Related treatment" as related_item_label %}
+{% field related_item_label item.owner '' item.owner|link_to_window %}
 {% endblock %}
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 19fdc930a..e920dd226 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -27,7 +27,8 @@
 <ul class='form-flex'>
   {% field_li "Old code" item.old_code %}
   {% include "ishtar/blocks/sheet_creation_section.html" %}
-{% field_li "Begining date" item.start_date %}
+  {% trans "Begining date" as begining_date_label %}
+  {% field_li begining_date_label item.start_date %}
 {% field_li "Excavation end date" item.excavation_end_date|default:"-" %}
 {% field_li_detail "Head scientist" item.scientist %}
 {% field_li_detail "In charge" item.in_charge %}
diff --git a/archaeological_operations/templates/ishtar/sheet_operationsource.html b/archaeological_operations/templates/ishtar/sheet_operationsource.html
index 9b8cbf509..55c48b319 100644
--- a/archaeological_operations/templates/ishtar/sheet_operationsource.html
+++ b/archaeological_operations/templates/ishtar/sheet_operationsource.html
@@ -8,5 +8,6 @@
 {% endblock %}
 
 {% block related %}
-{% field "Related operation" item.owner '' item.owner|link_to_window %}
+{% trans "Related operation" as related_item_label %}
+{% field related_item_label item.owner '' item.owner|link_to_window %}
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html
index 1c00b684e..244ca1be3 100644
--- a/ishtar_common/templates/ishtar/sheet_source.html
+++ b/ishtar_common/templates/ishtar/sheet_source.html
@@ -5,7 +5,8 @@
 {% block window_nav %}{% endblock %}
 {% block general %}
 {% block related %}
-{% field "Related item" item.owner %}
+{% trans "Related item" as related_item_label %}
+{% field related_item_label item.owner %}
 {% endblock %}
 
 {% if item.image %}
@@ -18,7 +19,8 @@
 {% field_li "Source type" item.source_type %}
 {% field_li "Format type" item.format_type %}
 {% field_li "Scale" item.scale %}
-{% field_li_url "Web link" item.associated_url %}
+    {% trans "Web link" as weblink_label %}
+    {% field_li_url weblink_label item.associated_url %}
 {% field_li "Item number" item.item_number %}
 {% field_li "Ref." item.reference %}
 {% field_li "Internal ref." item.internal_reference %}
-- 
cgit v1.2.3