summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorValérie-Emma Leroux <emma@iggdrasil.net>2016-11-14 19:22:19 +0100
committerValérie-Emma Leroux <emma@iggdrasil.net>2016-11-14 19:22:19 +0100
commitcbf59fbfc5e54958e62a27a01a6fec90dbc26059 (patch)
tree5228d2c5502b4c2edb17f6dca4cd094d2fef0a58 /ishtar_common
parentc578cba0544d10d4c6be93a15c5dc966e2ffcb44 (diff)
downloadIshtar-cbf59fbfc5e54958e62a27a01a6fec90dbc26059.tar.bz2
Ishtar-cbf59fbfc5e54958e62a27a01a6fec90dbc26059.zip
Update labels
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/templates/ishtar/sheet_organization.html4
-rw-r--r--ishtar_common/templates/ishtar/sheet_person.html6
-rw-r--r--ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html2
-rw-r--r--ishtar_common/templates/sheet_ope.html2
4 files changed, 7 insertions, 7 deletions
diff --git a/ishtar_common/templates/ishtar/sheet_organization.html b/ishtar_common/templates/ishtar/sheet_organization.html
index 8a47c35f5..1f4bd77b7 100644
--- a/ishtar_common/templates/ishtar/sheet_organization.html
+++ b/ishtar_common/templates/ishtar/sheet_organization.html
@@ -35,12 +35,12 @@
{% endfor %}
</table>
-{% trans "General contractor organization of archaelogical files" as af %}
+{% trans "General contractor organization of archaeological files" as af %}
{% if item.general_contractor_files.count %}
{% dynamic_table_document af 'files' 'corporation_general_contractor' item.pk '' output %}
{% endif %}
-{% trans "Town planning service of archaelogical files" as af %}
+{% trans "Planning service of archaeological files" as af %}
{% if item.planning_service_files.count %}
{% dynamic_table_document af 'files' 'planning_service' item.pk '' output %}
{% endif %}
diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html
index c84c56996..bcf39c363 100644
--- a/ishtar_common/templates/ishtar/sheet_person.html
+++ b/ishtar_common/templates/ishtar/sheet_person.html
@@ -77,17 +77,17 @@
{% dynamic_table_document ao 'operations' 'in_charge' item.pk '' output %}
{% endif %}
-{% trans "In charge of archaelogical files" as af %}
+{% trans "In charge of archaeological files" as af %}
{% if item.file_responsability.count %}
{% dynamic_table_document af 'files' 'in_charge' item.pk '' output %}
{% endif %}
-{% trans "General contractor of archaelogical files" as af %}
+{% trans "General contractor of archaeological files" as af %}
{% if item.general_contractor_files.count %}
{% dynamic_table_document af 'files' 'general_contractor' item.pk '' output %}
{% endif %}
-{% trans "Responsible for town planning service of archaelogical files" as af %}
+{% trans "Responsible for planning service of archaeological files" as af %}
{% if item.responsible_town_planning_service_files.count %}
{% dynamic_table_document af 'files' 'responsible_town_planning_service' item.pk '' output %}
{% endif %}
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
index 03b941c60..86286fad0 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
@@ -19,7 +19,7 @@
{% endif %}
{% if current_object.responsible_town_planning_service.count %}
-<h3>{% trans "Responsible town planning service of archaeological files" %}</h3>
+<h3>{% trans "Responsible for planning service of archaeological files" %}</h3>
<ul class='list'>
{% for file in current_object.responsible_town_planning_service.all %}
<li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %}
diff --git a/ishtar_common/templates/sheet_ope.html b/ishtar_common/templates/sheet_ope.html
index 28390af45..1e18e8b7e 100644
--- a/ishtar_common/templates/sheet_ope.html
+++ b/ishtar_common/templates/sheet_ope.html
@@ -33,7 +33,7 @@
<p><label>{%trans "Related file:"%}</label> <span class='value'><a href='{% url show-file item.related_file.pk ''%}'>{{ item.related_file }}</a></span></p><!-- Displayed as Year/index/Commune/Common_name This should be a link to the file sheet of the related file -->
{% if item.related_file.is_preventive %}
{% if item.operator_reference_code %}<p><label>{%trans "Operator's reference code:"%}</label> <span class='value'>{{ item.operator_reference_code }}</span></p>{% endif %}
-{% if item.related_file.town_planning_service %}<p><label>{%trans "Town planning service:"%}</label> <span class='value'>{{ item.related_file.town_planning_service }}</span></p>{% endif %}
+{% if item.related_file.town_planning_service %}<p><label>{%trans "Planning service:"%}</label> <span class='value'>{{ item.related_file.town_planning_service }}</span></p>{% endif %}
{% if item.related_file.permit_type %}<p><label>{%trans "Permit type:"%}</label> <span class='value'>{{ item.related_file.permit_type }}</span></p>{% endif %}
{% if item.related_file.permit_reference %}<p><label>{%trans "Permit reference:"%}</label> <span class='value'>{{ item.related_file.permit_reference }}</span></p>{% endif %}
{% if item.related_file.general_contractor.attached_to %}<p><label>{%trans "General contractor organisation:"%}</label> <span class='value'>{{ item.related_file.general_contractor.attached_to }}</span></p>{% endif %} <!-- Contractor's organisation displayed as concat of Name/Adress/postal_code/city -->