summaryrefslogtreecommitdiff
path: root/archaeological_operations
diff options
context:
space:
mode:
authorValérie-Emma Leroux <emma@iggdrasil.net>2017-03-17 11:13:56 +0100
committerValérie-Emma Leroux <emma@iggdrasil.net>2017-03-17 11:13:56 +0100
commit9127307734c85b816ac7dbb539b565ffb106d60f (patch)
tree4fa8e7f3c155e9bde465c305c67d2f42fbb8218e /archaeological_operations
parent9406a2043afe25ebc08e65b9cc223dd999bc003f (diff)
downloadIshtar-9127307734c85b816ac7dbb539b565ffb106d60f.tar.bz2
Ishtar-9127307734c85b816ac7dbb539b565ffb106d60f.zip
Update labels (without ':')
Diffstat (limited to 'archaeological_operations')
-rw-r--r--archaeological_operations/templates/ishtar/sheet_administrativeact.html6
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html10
2 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
index 080275aa9..92246ba80 100644
--- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html
+++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
@@ -33,13 +33,13 @@
{% field_li_detail "Treatment request" item.treatment_file %}
{% if item.operation and item.operation.surface %}
- <li><label>{% trans "Surface:"%}</label> <span class='value'>{{ item.operation.surface }} m<sup>2</sup> ({{ item.operation.surface_ha }} ha)</span></li>
+ <li><label>{% trans "Surface"%}</label> <span class='value'>{{ item.operation.surface }} m<sup>2</sup> ({{ item.operation.surface_ha }} ha)</span></li>
{% endif %}
{% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
{% comment %}{% if item.general_contractor.attached_to %}<p>
- <label>{% trans "General contractor organisation:"%}</label>
+ <label>{% trans "General contractor organisation"%}</label>
<span class='value'>{{ item.general_contractor.attached_to }}</span></p>{% endif %} <!-- Contractor's organisation displayed as concat of Name/Adress/postal_code/city -->
-{% if item.general_contractor %}<p><label>{%trans "General contractor:"%}</label> <span class='value'>{{ item.general_contractor.full_label }}</span></p>{% endif %}
+{% if item.general_contractor %}<p><label>{%trans "General contractor"%}</label> <span class='value'>{{ item.general_contractor.full_label }}</span></p>{% endif %}
{% endcomment %}
</ul>
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 48116433c..1e6d71c44 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -33,13 +33,13 @@
{% field_li_detail "Head scientist" item.scientist %}
{% field_li_detail "In charge" item.in_charge %}
{% field_li_detail "Operator" item.operator %}
-<li><label>{%trans "State:"%}</label> <span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
+<li><label>{%trans "State"%}</label> <span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
{% else %}{%trans "Closed operation"%}</span></li> {% endif %}
-{% if item.closing.date %}<li><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user }}</span></li>{% endif %}
+{% if item.closing.date %}<li><label>{%trans "Closing date"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user }}</span></li>{% endif %}
{% field_li "Type" item.operation_type %}
-{% if item.surface %}<li><label>{%trans "Surface:"%}</label> <span class='value'>{{ item.surface }} m<sup>2</sup> ({{ item.surface_ha }} ha)</span></li>{% endif %}
-{% if item.cost %}<li><label>{%trans "Cost:"%}</label> <span class='value'>{{ item.cost }} &euro;{% if item.cost_by_m2 %}, ({{ item.cost_by_m2 }} &euro;/m<sup>2</sup>){%endif%}</span></li>{%endif%}
-{% if item.duration %}<li><label>{%trans "Duration:"%}</label> <span class='value'>{{ item.duration }} {%trans "Day"%}s</span></li>{%endif%}
+{% if item.surface %}<li><label>{%trans "Surface"%}</label> <span class='value'>{{ item.surface }} m<sup>2</sup> ({{ item.surface_ha }} ha)</span></li>{% endif %}
+{% if item.cost %}<li><label>{%trans "Cost"%}</label> <span class='value'>{{ item.cost }} &euro;{% if item.cost_by_m2 %}, ({{ item.cost_by_m2 }} &euro;/m<sup>2</sup>){%endif%}</span></li>{%endif%}
+{% if item.duration %}<li><label>{%trans "Duration"%}</label> <span class='value'>{{ item.duration }} {%trans "Day"%}s</span></li>{%endif%}
{% field_li_multiple "Remains" item.remains %}
{% field_li_multiple "Periods" item.periods %}
{% if item.QUALITY_DICT %}{% field_li "Record quality" item.record_quality|from_dict:item.QUALITY_DICT %}{% endif %}