Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

9 files changed, 21 insertions, 17 deletions

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 7101ed7de..dcd3043ca 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -38,8 +38,8 @@
     var get_find_url = '{% url "get-find-shortcut" %}';
     var activate_all_search_url = '{% url "activate-all-search" %}';
     var activate_own_search_url = '{% url "activate-own-search" %}';
-    var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deals with all items.' %}";
-    var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deals with only your items.' %}";
+    var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deal with all items.' %}";
+    var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deal with only your items.' %}";
     </script>
 </head>
 <body{% if current_theme%} id='{{current_theme}}'{%endif%}>
diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index 4ce316217..3c52063f4 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -14,7 +14,7 @@
     <span class='history-nav'> </span>
     {% endif %}
     {% if next %}
-    <a class='history-nav' title="{% trans 'Restore this version' %}" href="#" onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changement made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'>
+    <a class='history-nav' title="{% trans 'Restore this version' %}" href="#" onclick='if(confirm("{%trans 'Are you sure to restore to this version? All changes made since this version will be lost.' %}")){load_url("{% url revert_url item.pk item.history_date|date:"c"%}");closeAllWindows();load_window("{% url show_url item.pk None %}");}'>
     <span class="fa-stack fa-lg">
       <i class="fa fa-circle fa-stack-2x"></i>
       <i class="fa fa-history fa-stack-1x fa-inverse"></i>
diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html
index 64793c46d..de17f3ad7 100644
--- a/ishtar_common/templates/ishtar/manage_basket.html
+++ b/ishtar_common/templates/ishtar/manage_basket.html
@@ -4,7 +4,10 @@
 <h2>{{page_name}}{% trans ":"%} {{basket}}</h2>
 <form enctype="multipart/form-data" action="." method="post">{% csrf_token %}
 <div class='form'>
-<p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {% trans 'Checking "Select all" only select the current page.' %}</p>
+<p class='alert'>
+    <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+    {% trans 'Checking "Select all" only selects the current page.' %}
+</p>
 {{form}}
 <button id='add_to' onclick='return false'>{% trans "Add" %}</button>
 <h3>{% trans "Basket content" %}</h3>
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/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index 9007c867c..1fbaadcd1 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -6,9 +6,9 @@
 <form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
 {% for step in previous_steps %}
-  <li><button name="form_prev_step" value="{{forloop.counter0}}">{{step.form_label}}</button></li>
+  <li><button name="form_prev_step" value="{{forloop.counter0}}">{{step}}</button></li>
 {% endfor %}
-  <li class='current'><a href='#'>{{current_step.form_label}}</a></li>
+  <li class='current'><a href='#'>{{current_step_label}}</a></li>
 </ul>
 </form>
 <form action="." method="post">{% csrf_token %}
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 6491b7a0f..fad1895bd 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -10,11 +10,11 @@
 <form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
 {% for step in previous_steps %}
-  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter0}}">{{step.form_label}}</button></li>
+  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter0}}">{{step}}</button></li>
 {% endfor %}
-  <li class='current'><a href='#'>{{current_step.form_label}}</a></li>
+  <li class='current'><a href='#'>{{current_step_label}}</a></li>
 {% for step in next_steps %}
-  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter|add:previous_step_counter}}">{{step.form_label}}</button></li>
+  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter|add:previous_step_counter}}">{{step}}</button></li>
 {% endfor %}
 </ul>
 </form>
@@ -24,6 +24,7 @@
 <div class='form'>
 {{ wizard.form.media }}
 {{ wizard.management_form }}
+{% block form_head %}{% endblock %}
 {% block form_detail %}
 {% if wizard.form.forms %}
   {{ wizard.form.management_form }}
@@ -55,7 +56,7 @@ $(document).ready(function(){
     $('form :input').change(function(){form_changed=true;});
     $('.change_step').click(function(){
         if(!form_changed ||
-           confirm("{% trans "The form has changed if you don't validate it all your changes will be lost." %}")){
+           confirm("{% trans "The form has changed. If you don't validate it, all your changes will be lost." %}")){
             return true;
         }
         return false;
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 -->