diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-13 15:41:59 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2024-06-13 15:41:59 +0200 |
| commit | b81a8233c9d905fd8cee50a68e4750d639f15308 (patch) | |
| tree | 737731b1c626d7edeb93358f5f3b351964df2bcb | |
| parent | 444204b50ec40181404c0c7b9d82c2fd2a1aaa89 (diff) | |
| download | Ishtar-b81a8233c9d905fd8cee50a68e4750d639f15308.tar.bz2 Ishtar-b81a8233c9d905fd8cee50a68e4750d639f15308.zip | |
🩹 archaeological file form: rename, translations, field duplication (refs #5877)
| -rw-r--r-- | archaeological_files/forms.py | 8 | ||||
| -rw-r--r-- | archaeological_files/templates/ishtar/sheet_file.html | 2 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index bee0e7caa..2e4a7004b 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -464,7 +464,7 @@ class FileFormPlanningService(CustomForm, IshtarForm): validators=[valid_id(Person)], ) permit_reference = forms.CharField( - label=_("File reference"), required=False, max_length=200 + label=_("Permit/order reference"), required=False, max_length=200 ) planning_service_date = forms.DateField( label=_("Date of planning service file"), widget=DatePicker, required=False @@ -570,11 +570,7 @@ class FileFormResearch(CustomForm, ManageOldType, forms.Form): "scientist": Person, "requested_operation_type": OperationType, "organization": Organization, - "department": Department, } - department = widgets.Select2MultipleField( - model=Department, label=_("Departments"), required=False - ) scientist = forms.IntegerField( widget=widgets.JQueryAutoComplete( reverse_lazy( @@ -613,7 +609,7 @@ class FileFormResearch(CustomForm, ManageOldType, forms.Form): if settings.COUNTRY == "fr": cira_advised = forms.NullBooleanField(label="Passage en CIRA", required=False) research_comment = forms.CharField( - label=_("Comment"), widget=forms.Textarea, required=False + label=_("Research archaeology comment"), widget=forms.Textarea, required=False ) if settings.COUNTRY == "fr": mh_register = forms.NullBooleanField( diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index 7e98234c5..9f86edc41 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -90,7 +90,7 @@ {% field_flex_detail_multiple_full "Towns" item.towns %} {% field_flex_multiple_obj "Departments" item 'departments' %} {% field_flex "Locality" item.locality %} - {% field_flex "Main address" item.address %} + {% field_flex "Address" item.address %} {% field_flex "Complement" item.address_complement %} {% field_flex "Postal code" item.postal_code %} {% if item.total_surface %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 48652ea06..a3ef009fc 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -2344,7 +2344,7 @@ msgstr "Dossier : responsable" #: archaeological_files/forms.py:1217 msgid "File permit reference" -msgstr "Dossier : réf. du permis" +msgstr "Dossier : réf. du permis / de l'arrêté" #: archaeological_files/forms.py:1281 msgid "Archaeological file - Administrative act - General" |