From f3fe6f7fdd5e815283f22c9f06afd0c5a6400576 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 29 Feb 2024 11:39:56 +0100 Subject: 🏷️ Documentation/finds received -> documentation/finds provided MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archaeological_operations/forms.py | 12 ++++++------ archaeological_operations/models.py | 12 ++++++------ .../templates/ishtar/sheet_operation.html | 4 ++-- locale/de/LC_MESSAGES/django.po | 12 ++++++------ locale/es/LC_MESSAGES/django.po | 12 ++++++------ locale/fr/LC_MESSAGES/django.po | 16 ++++++++-------- locale/pt/LC_MESSAGES/django.po | 12 ++++++------ 7 files changed, 40 insertions(+), 40 deletions(-) diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 28ed5b899..2b5e7c8f0 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -569,14 +569,14 @@ class OperationSelect(GeoItemSelect): associated_model=Person), validators=[valid_id(Person)]) documentation_received = forms.NullBooleanField( - label=_("Documentation received")) + label=_("Documentation provided")) documentation_deadline_before = DateField( label=_("Documentation deadline before")) documentation_deadline_after = DateField( label=_("Documentation deadline after")) has_finds = forms.NullBooleanField(label=_("Has finds")) finds_received = forms.NullBooleanField( - label=_("Finds received")) + label=_("Finds provided")) finds_deadline_before = DateField( label=_("Finds deadline before")) finds_deadline_after = DateField( @@ -809,12 +809,12 @@ class OperationFormGeneral(CustomForm, ManageOldType): label=_("Deadline for submission of the documentation"), required=False) documentation_received = forms.NullBooleanField( - required=False, label=_("Documentation received")) + required=False, label=_("Documentation provided")) finds_deadline = DateField( label=_("Deadline for submission of the finds"), required=False, ) finds_received = forms.NullBooleanField( - required=False, label=_("Finds received")) + required=False, label=_("Finds provided")) HEADERS['scientific_documentation_comment'] = FormHeader(_("Scientific")) scientific_documentation_comment = forms.CharField( @@ -1694,11 +1694,11 @@ class QAOperationFormMulti(QAForm): associated_model=Organization, new=True), validators=[valid_id(Organization)], required=False) qa_documentation_received = forms.ChoiceField( - label=_("Documentation received"), required=False, + label=_("Documentation provided"), required=False, choices=QAForm.NULL_BOOL_CHOICES ) qa_finds_received = forms.ChoiceField( - label=_("Finds received"), required=False, + label=_("Finds provided"), required=False, choices=QAForm.NULL_BOOL_CHOICES ) qa_collaborators = forms.IntegerField( diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index bcc845f8e..6e71343e8 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -987,8 +987,8 @@ class Operation( ("remains__label", _("Remains")), ("periods__label", _("Periods")), ("record_quality_type__label", _("Record quality")), - ("documentation_received", _("Documentation received")), - ("finds_received", _("Finds received")), + ("documentation_received", _("Documentation provided")), + ("finds_received", _("Finds provided")), ("documents__source_type__label", _("Associated document type")), ("last_modified__year", _("Modification (year)")), ] @@ -1221,7 +1221,7 @@ class Operation( "archaeological_sites__cached_label__icontains", ), "documentation_received": SearchAltName( - pgettext_lazy("key for text search", "documentation-received"), + pgettext_lazy("key for text search", "documentation-provided"), "documentation_received", ), "documentation_deadline_before": SearchAltName( @@ -1233,7 +1233,7 @@ class Operation( "documentation_deadline__gte", ), "finds_received": SearchAltName( - pgettext_lazy("key for text search", "finds-received"), "finds_received" + pgettext_lazy("key for text search", "finds-provided"), "finds_received" ), "has_finds": SearchAltName( pgettext_lazy("key for text search", "has-finds"), @@ -1491,12 +1491,12 @@ class Operation( _("Deadline for submission of the documentation"), blank=True, null=True ) documentation_received = models.NullBooleanField( - _("Documentation received"), blank=True, null=True + _("Documentation provided"), blank=True, null=True ) finds_deadline = models.DateField( _("Deadline for submission of the finds"), blank=True, null=True ) - finds_received = models.NullBooleanField(_("Finds received"), blank=True, null=True) + finds_received = models.NullBooleanField(_("Finds provided"), blank=True, null=True) # underwater drassm_code = models.CharField( diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 2d276b67c..8d88f79cc 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -249,12 +249,12 @@ {% with documentation_deadline=item.documentation_deadline|date:"DATE_FORMAT"|default:"" %} {% field_flex "Deadline for submission of the documentation" documentation_deadline %} {% endwith %} - {% field_flex "Documentation received" item.documentation_received %} + {% field_flex "Documentation provided" item.documentation_received %} {% with finds_deadline=item.finds_deadline|date:"DATE_FORMAT"|default:"" %} {% field_flex "Deadline for submission of the finds" finds_deadline %} {% endwith %} - {% field_flex "Finds received" item.finds_received %} + {% field_flex "Finds provided" item.finds_received %} {% field_flex_detail "Associated file" item.associated_file %} {% field_flex "Résultat considéré comme négatif" item.negative_result %} diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index e0452182f..8c74eed67 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-29 11:12+0100\n" +"POT-Creation-Date: 2024-02-29 11:41+0100\n" "PO-Revision-Date: 2019-11-01 18:52+0000\n" "Last-Translator: Valérie-Emma Leroux \n" "Language-Team: German \n" "Language-Team: LANGUAGE \n" @@ -109,7 +109,6 @@ msgstr "" #: archaeological_context_records/forms.py:621 #: archaeological_context_records/models.py:735 #: archaeological_context_records/models.py:1358 -#: archaeological_warehouse/forms.py:459 msgid "ID" msgstr "" @@ -2216,6 +2215,7 @@ msgstr "" #: archaeological_operations/forms.py:1434 #: archaeological_operations/forms.py:1567 #: archaeological_operations/models.py:2737 +#: archaeological_warehouse/forms.py:459 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 #: ishtar_common/models.py:4502 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -6621,7 +6621,7 @@ msgstr "" #: archaeological_operations/forms.py:1697 #: archaeological_operations/models.py:990 #: archaeological_operations/models.py:1494 -msgid "Documentation received" +msgid "Documentation provided" msgstr "" #: archaeological_operations/forms.py:574 @@ -6637,7 +6637,7 @@ msgstr "" #: archaeological_operations/forms.py:1701 #: archaeological_operations/models.py:991 #: archaeological_operations/models.py:1499 -msgid "Finds received" +msgid "Finds provided" msgstr "" #: archaeological_operations/forms.py:581 @@ -7307,7 +7307,7 @@ msgstr "" #: archaeological_operations/models.py:1224 msgctxt "key for text search" -msgid "documentation-received" +msgid "documentation-provided" msgstr "" #: archaeological_operations/models.py:1228 @@ -7322,7 +7322,7 @@ msgstr "" #: archaeological_operations/models.py:1236 msgctxt "key for text search" -msgid "finds-received" +msgid "finds-provided" msgstr "" #: archaeological_operations/models.py:1243 diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 05d1e3fd4..5088896e9 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-29 11:12+0100\n" +"POT-Creation-Date: 2024-02-29 11:41+0100\n" "PO-Revision-Date: 2022-07-08 13:04+0000\n" "Last-Translator: Étienne Loks \n" "Language-Team: French \n" "Language-Team: LANGUAGE \n" @@ -109,7 +109,6 @@ msgstr "" #: archaeological_context_records/forms.py:621 #: archaeological_context_records/models.py:735 #: archaeological_context_records/models.py:1358 -#: archaeological_warehouse/forms.py:459 msgid "ID" msgstr "" @@ -2216,6 +2215,7 @@ msgstr "" #: archaeological_operations/forms.py:1434 #: archaeological_operations/forms.py:1567 #: archaeological_operations/models.py:2737 +#: archaeological_warehouse/forms.py:459 #: cd17_app/templates/ishtar/sheet_find.html:366 ishtar_common/admin.py:588 #: ishtar_common/models.py:4502 #: man_app/templates/ishtar/sheet_museum_find.html:400 @@ -6621,7 +6621,7 @@ msgstr "" #: archaeological_operations/forms.py:1697 #: archaeological_operations/models.py:990 #: archaeological_operations/models.py:1494 -msgid "Documentation received" +msgid "Documentation provided" msgstr "" #: archaeological_operations/forms.py:574 @@ -6637,7 +6637,7 @@ msgstr "" #: archaeological_operations/forms.py:1701 #: archaeological_operations/models.py:991 #: archaeological_operations/models.py:1499 -msgid "Finds received" +msgid "Finds provided" msgstr "" #: archaeological_operations/forms.py:581 @@ -7307,7 +7307,7 @@ msgstr "" #: archaeological_operations/models.py:1224 msgctxt "key for text search" -msgid "documentation-received" +msgid "documentation-provided" msgstr "" #: archaeological_operations/models.py:1228 @@ -7322,7 +7322,7 @@ msgstr "" #: archaeological_operations/models.py:1236 msgctxt "key for text search" -msgid "finds-received" +msgid "finds-provided" msgstr "" #: archaeological_operations/models.py:1243 -- cgit v1.2.3