diff options
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_files/models.py | 6 | ||||
| -rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 42a645171..45a05b9b1 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -290,7 +290,7 @@ class FileFormPreventive(ManageOldType, forms.Form): validators=[valid_id(Person)]) responsible_town_planning_service = forms.IntegerField( required=False, - label=_(u"Responsible for town planning service"), + label=_(u"Responsible for planning service"), widget=widgets.JQueryAutoComplete( reverse_lazy( 'autocomplete-person', @@ -389,7 +389,7 @@ class FinalFileClosingForm(FinalForm): class FinalFileDeleteForm(FinalForm): confirm_msg = " " - confirm_end_msg = _(u"Would you like to delete this archaelogical file ?") + confirm_end_msg = _(u"Would you like to delete this archaeological file ?") class AdministrativeActFileModifySelect(TableSelect): diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 1d8317b31..7f5655c0c 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -135,16 +135,16 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter, responsible_town_planning_service = models.ForeignKey( Person, related_name='responsible_town_planning_service_files', blank=True, null=True, - verbose_name=_(u"Responsible for town planning service"), + verbose_name=_(u"Responsible for planning service"), on_delete=models.SET_NULL,) # service instructeur - personne raw_town_planning_service = models.CharField( - _(u"Town planning service (raw)"), max_length=200, + _(u"Planning service (raw)"), max_length=200, blank=True, null=True) planning_service = models.ForeignKey( Organization, related_name='planning_service_files', blank=True, null=True, - verbose_name=_(u"Town planning service organization"), + verbose_name=_(u"Planning service organization"), on_delete=models.SET_NULL,) # service instructeur permit_type = models.ForeignKey( PermitType, verbose_name=_(u"Permit type"), blank=True, null=True) diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index f228531e1..249a9846c 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -59,18 +59,18 @@ {% if item.is_preventive %} -<h3>{% trans "Preventive archaelogical file"%}</h3> +<h3>{% trans "Preventive archaeological file"%}</h3> <ul class='form-flex'> {% if item.total_developed_surface %}<li><label>{%trans "Developed surface:"%}</label> <span class='value'>{{ item.total_developed_surface }} m<sup>2</sup> ({{ item.total_developed_surface_ha }} ha)</span></li>{% endif %} {% field_li "Saisine type" item.saisine_type %} -{% field_li_detail "Responsible for town planning service" item.responsible_town_planning_service %} -{% field_li "Responsible for town planning service address" item.responsible_town_planning_service.full_address %} +{% field_li_detail "Responsible for planning service" item.responsible_town_planning_service %} +{% field_li "Responsible for planning service address" item.responsible_town_planning_service.full_address %} {% if item.town_planning_service %} - {% field_li "Town planning service organization" item.town_planning_service.full_address %} + {% field_li "Planning service organization" item.town_planning_service.full_address %} {% else %} - {% field_li "Town planning service organization" item.responsible_town_planning_service.attached_to.full_address %} + {% field_li "Planning service organization" item.responsible_town_planning_service.attached_to.full_address %} {% endif %} {% field_li "Permit type" item.permit_type %} @@ -132,7 +132,7 @@ <td class='link'><a href="#" class='display_details' onclick='load_window("{%url show-operation operation.pk "" %}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> </tr> {% empty %} - <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaelogical file" %}</td></tr> + <tr><td colspan="8" class='no_items'>{% trans "No operation associated to this archaeological file" %}</td></tr> {% endfor %} </table> </div> |