summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-02-29 11:39:56 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-02-29 11:43:37 +0100
commitf3fe6f7fdd5e815283f22c9f06afd0c5a6400576 (patch)
treebc5579ea970442947dfd105dd8820b10b3b3082b
parentf8f5b9b88d2795c4a9c1273906eb85517b05ac71 (diff)
downloadIshtar-f3fe6f7fdd5e815283f22c9f06afd0c5a6400576.tar.bz2
Ishtar-f3fe6f7fdd5e815283f22c9f06afd0c5a6400576.zip
🏷️ Documentation/finds received -> documentation/finds provided
-rw-r--r--archaeological_operations/forms.py12
-rw-r--r--archaeological_operations/models.py12
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html4
-rw-r--r--locale/de/LC_MESSAGES/django.po12
-rw-r--r--locale/es/LC_MESSAGES/django.po12
-rw-r--r--locale/fr/LC_MESSAGES/django.po16
-rw-r--r--locale/pt/LC_MESSAGES/django.po12
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 <valerie-emma.leroux@iggdrasil.net>\n"
"Language-Team: German <http://translate.iggdrasil.net/projects/ishtar/wip-"
@@ -110,7 +110,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 ""
@@ -2227,6 +2226,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
@@ -6646,7 +6646,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
@@ -6662,7 +6662,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
@@ -7336,7 +7336,7 @@ msgstr ""
#: archaeological_operations/models.py:1224
msgctxt "key for text search"
-msgid "documentation-received"
+msgid "documentation-provided"
msgstr ""
#: archaeological_operations/models.py:1228
@@ -7351,7 +7351,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/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po
index a09095fc8..c6d04ba2f 100644
--- a/locale/es/LC_MESSAGES/django.po
+++ b/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,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: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 <etienne.loks@iggdrasil.net>\n"
"Language-Team: French <http://translate.iggdrasil.net/projects/ishtar/wip-"
@@ -110,7 +110,6 @@ msgstr "Recherche en texte intégral"
#: 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 "Identifiant"
@@ -2231,6 +2230,7 @@ msgstr "Équipement / service"
#: 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
@@ -6684,7 +6684,7 @@ msgstr "Opération virtuelle"
#: archaeological_operations/forms.py:1697
#: archaeological_operations/models.py:990
#: archaeological_operations/models.py:1494
-msgid "Documentation received"
+msgid "Documentation provided"
msgstr "Documentation versée"
#: archaeological_operations/forms.py:574
@@ -6700,7 +6700,7 @@ msgstr "Date limite de versement de la documentation après"
#: archaeological_operations/forms.py:1701
#: archaeological_operations/models.py:991
#: archaeological_operations/models.py:1499
-msgid "Finds received"
+msgid "Finds provided"
msgstr "Mobilier versé"
#: archaeological_operations/forms.py:581
@@ -7377,8 +7377,8 @@ msgstr "operation-virtuelle"
#: archaeological_operations/models.py:1224
msgctxt "key for text search"
-msgid "documentation-received"
-msgstr "documentation-recue"
+msgid "documentation-provided"
+msgstr "documentation-versee"
#: archaeological_operations/models.py:1228
msgctxt "key for text search"
@@ -7392,8 +7392,8 @@ msgstr "documentation-date-limite-après"
#: archaeological_operations/models.py:1236
msgctxt "key for text search"
-msgid "finds-received"
-msgstr "mobilier-recu"
+msgid "finds-provided"
+msgstr "mobilier-verse"
#: archaeological_operations/models.py:1243
msgctxt "key for text search"
diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po
index a09095fc8..c6d04ba2f 100644
--- a/locale/pt/LC_MESSAGES/django.po
+++ b/locale/pt/LC_MESSAGES/django.po
@@ -8,7 +8,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: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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