✨ finds - workshop, movement, style fields: model, admin, forms, views, sheet (refs #6725)

1 files changed, 68 insertions, 67 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index b3663bbbc..df2d68da0 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -123,44 +123,44 @@
         </div>
 
         <div class='row'>
-            {% field_flex "Denomination" item.denomination %}
+            {% field_flex _("Denomination") item.denomination %}
             {% field_flex _("Title") item.title %}
-            {% field_flex "Complete museum ID" item.cache_complete_museum_id %}
-            {% field_flex "Free ID" item.label %}
-            {% field_flex "Previous ID" item.previous_id %}
-            {% field_flex "Excavation ID" item.excavation_ids %}
-            {% field_flex "Laboratory ID" item.laboratory_id %}
-            {% field_flex "Seal number" item.seal_number %}
+            {% field_flex _("Complete museum ID") item.cache_complete_museum_id %}
+            {% field_flex _("Free ID") item.label %}
+            {% field_flex _("Previous ID") item.previous_id %}
+            {% field_flex _("Excavation ID") item.excavation_ids %}
+            {% field_flex _("Laboratory ID") item.laboratory_id %}
+            {% field_flex _("Seal number") item.seal_number %}
             {# no index admin #}
         </div>
 
         <h3>{% trans "Description" %}</h3>
         <div class='row'>
-            {% field_flex_full "Description" item.description "<pre>" "</pre>" %}
-            {% field_flex_full "Public description" item.public_description "<pre>" "</pre>" %}
-            {% field_flex "Is complete?" item.is_complete %}
-            {% with material=item.get_hierarchical_material_types %}{% if material %}
+            {% field_flex_full _("Description") item.description "<pre>" "</pre>" %}
+            {% field_flex_full _("Public description") item.public_description "<pre>" "</pre>" %}
+            {% field_flex _("Is complete?") item.is_complete %}
             {% field_flex_detail_multiple _("Actors") item.actors %}
-            {% field_flex "Material types" material %}{% else %}
-            {% field_flex_multiple_obj "Material types" item 'material_types' %}
+            {% with material=item.get_hierarchical_material_types %}{% if material %}
+            {% field_flex _("Material types") material %}{% else %}
+            {% field_flex_multiple_obj _("Material types") item 'material_types' %}
             {% endif %}{% endwith %}
-            {% field_flex "Material type quality" item.material_type_quality %}
-            {% field_flex_multiple_obj "Technical processes" item 'technical_processes' %}
-            {% field_flex_full "Comment on the material" item.material_comment "<pre>" "</pre>" %}
-            {% field_flex_multiple_obj "Object types" item 'object_types' %}
-            {% field_flex "Object type quality" item.object_type_quality %}
-            {% field_flex_multiple_obj "Functional areas" item 'functional_areas' %}
-            {% field_flex_multiple_obj "Technical areas" item 'technical_areas' %}
-            {% field_flex "Number of remains" item.find_number %}
-            {% field_flex "Minimum number of individuals (MNI)" item.min_number_of_individuals %}
-            {% field_flex "Inventory quantity" item.museum_inventory_quantity %}
-            {% field_flex "Observed quantity" item.museum_observed_quantity %}
-            {% field_flex_full "Comment on quantity" item.quantity_comment "<pre>" "</pre>" %}
-            {% field_flex_full "Decoration" item.decoration "<pre>" "</pre>" %}
-            {% field_flex_full "Inscription" item.inscription "<pre>" "</pre>" %}
-            {% field_flex "Manufacturing place" item.manufacturing_place %}
-            {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %}
-            {% field_flex_multiple_obj "Communicability" item 'communicabilities' %}
+            {% field_flex _("Material type quality") item.material_type_quality %}
+            {% field_flex_multiple_obj _("Technical processes") item 'technical_processes' %}
+            {% field_flex_full _("Comment on the material") item.material_comment "<pre>" "</pre>" %}
+            {% field_flex_multiple_obj _("Object types") item 'object_types' %}
+            {% field_flex _("Object type quality") item.object_type_quality %}
+            {% field_flex_multiple_obj _("Functional areas") item 'functional_areas' %}
+            {% field_flex_multiple_obj _("Technical areas") item 'technical_areas' %}
+            {% field_flex _("Number of remains") item.find_number %}
+            {% field_flex _("Minimum number of individuals (MNI)") item.min_number_of_individuals %}
+            {% field_flex _("Inventory quantity") item.museum_inventory_quantity %}
+            {% field_flex _("Observed quantity") item.museum_observed_quantity %}
+            {% field_flex_full _("Comment on quantity") item.quantity_comment "<pre>" "</pre>" %}
+            {% field_flex_full _("Decoration") item.decoration "<pre>" "</pre>" %}
+            {% field_flex_full _("Inscription") item.inscription "<pre>" "</pre>" %}
+            {% field_flex _("Manufacturing place") item.manufacturing_place %}
+            {% field_flex_multiple_obj _("Cultural attributions") item 'cultural_attributions' %}
+            {% field_flex_multiple_obj _("Communicability") item 'communicabilities' %}
             {% field_flex_full _("General comment") item.comment "<pre>" "</pre>" %}
         </div>
 
@@ -185,52 +185,53 @@
         {% if item.has_museum_section %}
         <h3>{% trans "Museum / legal status" %}</h3>
         <div class='row'>
-            {% field_flex "Complete museum ID" item.cache_complete_museum_id %}
-            {% field_flex "Comment on museum ID" item.museum_id_comment %}
+            {% field_flex _("Complete museum ID") item.cache_complete_museum_id %}
+            {% field_flex _("Comment on museum ID") item.museum_id_comment %}
             {% field_flex_multiple_obj _("Collections") item "museum_collections" %}
             {% field_flex_detail_multiple _("Former collection") item.museum_former_collections %}
-            {% field_flex_detail "Owner institution" item.museum_owner_institution %}
-            {% field_flex_detail "Assigned institution" item.museum_assigned_institution %}
-            {% field_flex_detail "Custodian institution" item.museum_custodian_institution %}
-            {% field_flex "Depositor inventory number" item.museum_depositor_inventory_number %}
-            {% field_flex "Collections entry mode" item.museum_collection_entry_mode %}
-            {% field_flex "Comment on museum entry mode" item.museum_entry_mode_comment %}
+            {% field_flex_detail _("Owner institution") item.museum_owner_institution %}
+            {% field_flex_detail _("Assigned institution") item.museum_assigned_institution %}
+            {% field_flex_detail _("Custodian institution") item.museum_custodian_institution %}
+            {% field_flex _("Depositor inventory number") item.museum_depositor_inventory_number %}
+            {% field_flex _("Collections entry mode") item.museum_collection_entry_mode %}
+            {% field_flex _("Comment on museum entry mode") item.museum_entry_mode_comment %}
             {% trans "Museum entry date" as museum_entry_date_label %}
             {% field_flex museum_entry_date_label item.museum_entry_date_label %}
-            {% field_flex "Comment on museum entry date" item.museum_entry_date_comment %}
+            {% field_flex _("Comment on museum entry date") item.museum_entry_date_comment %}
             {% field_flex_detail_multiple _("Donors, testators or vendors") item.museum_donors %}
             {% field_flex_multiple_obj _("Iconographic patterns") item 'iconographic_patterns' %}
             {% field_flex_full _("Notes on iconography") item.iconography_notes "<pre>" "</pre>" %}
-            {% field_flex_multiple_obj "Presence of inventory marking" item "museum_inventory_marking_presence" %}
-            {% field_flex_multiple_obj "Type of marking" item "museum_marking_type" %}
+            {% field_flex_multiple_obj _("Workshop, movement, style") item 'workshop_movement_styles' %}
+            {% field_flex_multiple_obj _("Presence of inventory marking") item "museum_inventory_marking_presence" %}
+            {% field_flex_multiple_obj _("Type of marking") item "museum_marking_type" %}
             {% field_flex _("Transcription of the marking") item.mark_text %}
-            {% field_flex "Marking details" item.mark "<pre>" "</pre>" %}
-            {% field_flex "Conformity with inventory" item.museum_inventory_conformity %}
-            {% field_flex "Comment on conformity" item.museum_conformity_comment %}
-            {% field_flex "Inventory entry year" item.museum_inventory_entry_year %}
-            {% field_flex_full "Inventory transcript" item.museum_inventory_transcript %}
-            {% field_flex "Original/reproduction" item.museum_original_repro %}
-            {% field_flex "Date of museum allocation" item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %}
-            {% field_flex "Purchase price" item.museum_purchase_price %}
+            {% field_flex _("Marking details") item.mark "<pre>" "</pre>" %}
+            {% field_flex _("Conformity with inventory") item.museum_inventory_conformity %}
+            {% field_flex _("Comment on conformity") item.museum_conformity_comment %}
+            {% field_flex _("Inventory entry year") item.museum_inventory_entry_year %}
+            {% field_flex_full _("Inventory transcript") item.museum_inventory_transcript %}
+            {% field_flex _("Original/reproduction") item.museum_original_repro %}
+            {% field_flex _("Date of museum allocation") item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %}
+            {% field_flex _("Purchase price") item.museum_purchase_price %}
         </div>
         {% endif %}
 
         {% if item.length or item.width or item.height or item.diameter or item.thickness or item.volume or item.weight_string or item.dimensions_comment or item.clutter_long_side or item.clutter_short_side or item.clutter_height %}
         <h3>{% trans "Dimensions" %}</h3>
         <div class='row'>
-            {% field_flex "Length (cm)" item.length %}
-            {% field_flex "Width (cm)" item.width %}
-            {% field_flex "Height (cm)" item.height %}
-            {% field_flex "Thickness (cm)" item.thickness %}
-            {% field_flex "Diameter (cm)" item.diameter %}
-            {% field_flex "Circumference (cm)" item.circumference %}
-            {% field_flex "Volume (l)" item.volume %}
+            {% field_flex _("Length (cm)") item.length %}
+            {% field_flex _("Width (cm)") item.width %}
+            {% field_flex _("Height (cm)") item.height %}
+            {% field_flex _("Thickness (cm)") item.thickness %}
+            {% field_flex _("Diameter (cm)") item.diameter %}
+            {% field_flex _("Circumference (cm)") item.circumference %}
+            {% field_flex _("Volume (l)") item.volume %}
             {% trans "Weight (g)" as weight_label %}
             {% field_flex weight_label item.weight_string %}
-            {% field_flex "Clutter long side (cm)" item.clutter_long_side %}
-            {% field_flex "Clutter short side (cm)" item.clutter_short_side %}
-            {% field_flex "Clutter height (cm)" item.clutter_height %}
-            {% field_flex_full "Dimensions comment" item.dimensions_comment "<pre>" "</pre>" %}
+            {% field_flex _("Clutter long side (cm)") item.clutter_long_side %}
+            {% field_flex _("Clutter short side (cm)") item.clutter_short_side %}
+            {% field_flex _("Clutter height (cm)") item.clutter_height %}
+            {% field_flex_full _("Dimensions comment") item.dimensions_comment "<pre>" "</pre>" %}
         </div>
         {% endif %}
         {% if has_image %}
@@ -244,7 +245,7 @@
             {% trans "Checked" as checked_label %}
             {% field_flex checked_label item.checked_type %}
             {% with item.check_date|date:"SHORT_DATE_FORMAT" as check_date %}
-            {% if check_date %}{% field_flex "Check date" check_date %}{% endif %}
+            {% if check_date %}{% field_flex _("Check date") check_date %}{% endif %}
             {% endwith %}
             {% include "ishtar/blocks/sheet_creation_section.html" %}
         </div>
@@ -309,12 +310,12 @@
       <h3>{% trans "Periods / Datings" %}</h3>
       <div class='row'>
           {% field_flex_multiple_obj _("Periods") item 'periods' %}
-          {% field_flex_multiple_obj "Cultural attributions" item 'cultural_attributions' %}
-          {% field_flex "TAQ" item.taq %}
-          {% field_flex "Estimated TAQ" item.taq_estimated %}
-          {% field_flex "TPQ" item.tpq %}
-          {% field_flex "Estimated TPQ" item.tpq_estimated %}
-          {% field_flex_full "Comment on datings" item.dating_comment "<pre>" "</pre>" has_image %}
+          {% field_flex_multiple_obj _("Cultural attributions") item 'cultural_attributions' %}
+          {% field_flex _("TAQ") item.taq %}
+          {% field_flex _("Estimated TAQ") item.taq_estimated %}
+          {% field_flex _("TPQ") item.tpq %}
+          {% field_flex _("Estimated TPQ") item.tpq_estimated %}
+          {% field_flex_full _("Comment on datings") item.dating_comment "<pre>" "</pre>" has_image %}
       </div>
       {% with url_dating="find-dating" %}
       {% include "ishtar/blocks/sheet_dating_list.html" %}