summaryrefslogtreecommitdiff
path: root/archaeological_finds
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2023-01-19 18:52:36 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2023-01-19 18:52:36 +0100
commit41d1a261a3e6318a72f569f6cd816ce654547917 (patch)
tree5edb9a1e880ddf030a00e0f88936a55f0267c6a1 /archaeological_finds
parentc9e7e5478aed8757821827e8f5358d7959257a2d (diff)
downloadIshtar-41d1a261a3e6318a72f569f6cd816ce654547917.tar.bz2
Ishtar-41d1a261a3e6318a72f569f6cd816ce654547917.zip
Change labels
* Identifiant musée -> Numéro d'inventaire musée * Localisation (fiche) -> Localisation géographique * Date de découverte (exacte ou TPQ) -> Date de découverte (exacte ou début) * Date de découverte (TAQ) -> Date de découverte (fin)
Diffstat (limited to 'archaeological_finds')
-rw-r--r--archaeological_finds/forms.py18
-rw-r--r--archaeological_finds/models_finds.py10
-rw-r--r--archaeological_finds/templates/ishtar/sheet_basefind.html6
-rw-r--r--archaeological_finds/templates/ishtar/sheet_find.html2
4 files changed, 18 insertions, 18 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index f1b1a11d9..e4248aeac 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -277,7 +277,7 @@ class BasicFindForm(CustomForm, ManageOldType):
)
denomination = forms.CharField(label=_("Denomination"), required=False)
previous_id = forms.CharField(label=_("Previous ID"), required=False)
- museum_id = forms.CharField(label=_("Museum ID"), required=False)
+ museum_id = forms.CharField(label=_("Museum inventory number"), required=False)
laboratory_id = forms.CharField(label=_("Laboratory ID"), required=False)
seal_number = forms.CharField(label=_("Seal number"), required=False)
mark = forms.CharField(label=_("Mark"), required=False)
@@ -507,10 +507,10 @@ class FindForm(BasicFindForm):
)
get_first_base_find__discovery_date = forms.DateField(
- label=_("Discovery date (exact or TPQ)"), widget=DatePicker, required=False
+ label=_("Discovery date (exact or beginning)"), widget=DatePicker, required=False
)
get_first_base_find__discovery_date_taq = forms.DateField(
- label=_("Discovery date (TAQ)"), widget=DatePicker, required=False
+ label=_("Discovery date (end)"), widget=DatePicker, required=False
)
get_first_base_find__batch = forms.ChoiceField(
label=_("Batch/object"), choices=[], required=False
@@ -817,7 +817,7 @@ class QAFindFormMulti(QAForm):
qa_get_first_base_find__excavation_id = forms.CharField(
label=_("Excavation ID"), required=False
)
- qa_museum_id = forms.CharField(label=_("Museum ID"), required=False)
+ qa_museum_id = forms.CharField(label=_("Museum inventory number"), required=False)
qa_laboratory_id = forms.CharField(label=_("Laboratory ID"), required=False)
qa_seal_number = forms.CharField(label=_("Seal number"), required=False)
qa_mark = forms.CharField(label=_("Mark"), required=False)
@@ -1335,7 +1335,7 @@ class FindSelect(GeoItemSelect, PeriodSelect):
previous_id = forms.CharField(label=_("Previous ID"))
base_finds__excavation_id = forms.CharField(label=_("Excavation ID"))
seal_number = forms.CharField(label=_("Seal number"))
- museum_id = forms.CharField(label=_("Museum ID"))
+ museum_id = forms.CharField(label=_("Museum inventory number"))
laboratory_id = forms.CharField(label=_("Laboratory ID"))
mark = forms.CharField(label=_("Mark"))
@@ -1431,16 +1431,16 @@ class FindSelect(GeoItemSelect, PeriodSelect):
label=_("Discovery date before"), widget=DatePicker
)
base_finds__discovery_date_tpq__after = forms.DateField(
- label=_("Discovery date (exact or TPQ) after"), widget=DatePicker
+ label=_("Discovery date (exact or beginning) after"), widget=DatePicker
)
base_finds__discovery_date_tpq__before = forms.DateField(
- label=_("Discovery date (exact or TPQ) before"), widget=DatePicker
+ label=_("Discovery date (exact or beginning) before"), widget=DatePicker
)
base_finds__discovery_date_taq__after = forms.DateField(
- label=_("Discovery date (TAQ) after"), widget=DatePicker
+ label=_("Discovery date (end) after"), widget=DatePicker
)
base_finds__discovery_date_taq__before = forms.DateField(
- label=_("Discovery date (TAQ) before"), widget=DatePicker
+ label=_("Discovery date (end) before"), widget=DatePicker
)
base_finds__batch = forms.ChoiceField(label=_("Batch/object"), choices=[])
is_complete = forms.NullBooleanField(label=_("Is complete?"))
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 6be609056..11c611eea 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -420,10 +420,10 @@ class BaseFind(
on_delete=models.CASCADE,
)
discovery_date = models.DateField(
- _("Discovery date (exact or TPQ)"), blank=True, null=True
+ _("Discovery date (exact or beginning)"), blank=True, null=True
)
discovery_date_taq = models.DateField(
- _("Discovery date (TAQ)"), blank=True, null=True
+ _("Discovery date (end)"), blank=True, null=True
)
batch = models.ForeignKey(
BatchType,
@@ -1105,8 +1105,8 @@ class Find(
"Base find - " "Topographic localisation"
),
"base_finds__special_interest": _("Base find - Special interest"),
- "base_finds__discovery_date": _("Base find - Discovery date (exact or TPQ)"),
- "base_finds__discovery_date_taq": _("Base find - Discovery date (TAQ)"),
+ "base_finds__discovery_date": _("Base find - Discovery date (exact or beginning)"),
+ "base_finds__discovery_date_taq": _("Base find - Discovery date (end)"),
"container__cached_label": _("Current container"),
"container_ref__cached_label": _("Reference container"),
"datings__period__label": _("Periods"),
@@ -1808,7 +1808,7 @@ class Find(
order = models.IntegerField(_("Order"), default=1)
label = models.TextField(_("Free ID"))
denomination = models.TextField(_("Denomination"), blank=True, default="")
- museum_id = models.TextField(_("Museum ID"), blank=True, default="")
+ museum_id = models.TextField(_("Museum inventory number"), blank=True, default="")
laboratory_id = models.TextField(_("Laboratory ID"), blank=True, default="")
description = models.TextField(_("Description"), blank=True, default="")
decoration = models.TextField(_("Decoration"), blank=True, default="")
diff --git a/archaeological_finds/templates/ishtar/sheet_basefind.html b/archaeological_finds/templates/ishtar/sheet_basefind.html
index e8111b54a..fb67e3cd8 100644
--- a/archaeological_finds/templates/ishtar/sheet_basefind.html
+++ b/archaeological_finds/templates/ishtar/sheet_basefind.html
@@ -28,9 +28,9 @@
{% trans "Discovery year" as discovery_year_label %}
{% field_flex discovery_year_label base_find.discovery_date.year '' '' first %}
{% else %}
- {% trans "Discovery date (TPQ)" as discovery_tpq_label %}
+ {% trans "Discovery date (exact or beginning)" as discovery_tpq_label %}
{% field_flex discovery_tpq_label base_find.discovery_date '' '' first %}
- {% trans "Discovery date (TAQ)" as discovery_taq_label %}
+ {% trans "Discovery date (end)" as discovery_taq_label %}
{% field_flex discovery_taq_label base_find.discovery_date_taq '' '' first %}
{% endif %}
{# END discovery dates #}
@@ -67,7 +67,7 @@
<div class="clearfix">
</div>
- <h3>{% trans "Localisation"%}</h3>
+ <h3>{% trans "Geographic localisation" %}</h3>
<div class='row'>
{% with geo_item=base_find %}
{% include "ishtar/blocks/sheet_map.html"%}
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 34d1ec978..20cb4a5c1 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -167,7 +167,7 @@
{% field_flex "Free ID" item.label %}
{% field_flex "Previous ID" item.previous_id %}
{% field_flex "Excavation ID" item.excavation_ids %}
- {% field_flex "Museum ID" item.museum_id %}
+ {% field_flex "Museum inventory number" item.museum_id %}
{% field_flex "Laboratory ID" item.laboratory_id %}
{% field_flex "Seal number" item.seal_number %}
{% trans "Administrative index" as admin_index_label %}