From 8ba152f7fb995eb7a4cdf3b0fd99e4f59f67c061 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 16 Jan 2023 11:45:10 +0100 Subject: Update translations --- archaeological_context_records/forms.py | 4 +- archaeological_context_records/models.py | 6 +-- archaeological_finds/forms.py | 14 +++---- archaeological_finds/models_finds.py | 4 +- .../templates/ishtar/sheet_find.html | 6 +-- archaeological_operations/forms.py | 2 +- .../templates/ishtar/sheet_operation.html | 6 +-- ishtar_common/utils.py | 2 +- locale/de/LC_MESSAGES/django.po | 37 ++++++++-------- locale/es/LC_MESSAGES/django.po | 37 ++++++++-------- locale/fr/LC_MESSAGES/django.po | 49 ++++++++++++---------- locale/pt/LC_MESSAGES/django.po | 37 ++++++++-------- 12 files changed, 110 insertions(+), 94 deletions(-) diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 380f62198..760f154f0 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -441,12 +441,12 @@ class DatingForm(ManageOldType, forms.Form): "quality": models.DatingQuality, "period": models.Period, } - period = forms.ChoiceField(label=_("Period"), choices=[]) + period = forms.ChoiceField(label=_("Chronological period"), choices=[]) start_date = forms.IntegerField(label=_("Start date"), required=False) end_date = forms.IntegerField(label=_("End date"), required=False) quality = forms.ChoiceField(label=_("Quality"), required=False, choices=[]) dating_type = forms.ChoiceField(label=_("Dating type"), required=False, choices=[]) - precise_dating = forms.CharField(label=_("Precise dating"), required=False) + precise_dating = forms.CharField(label=_("Precise on dating"), required=False) TYPES = [ FieldType("dating_type", models.DatingType), diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 0a3a9c256..72a835cc2 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -104,7 +104,7 @@ class Dating(models.Model, SerializeItem): SERIALIZE_EXCLUDE = ["find", "context_record"] uuid = models.UUIDField(default=uuid.uuid4) period = models.ForeignKey( - Period, verbose_name=_("Period"), on_delete=models.PROTECT + Period, verbose_name=_("Chronological period"), on_delete=models.PROTECT ) start_date = models.IntegerField(_("Start date"), blank=True, null=True) end_date = models.IntegerField(_("End date"), blank=True, null=True) @@ -122,7 +122,7 @@ class Dating(models.Model, SerializeItem): blank=True, null=True, ) - precise_dating = models.TextField(_("Precise dating"), blank=True, default="") + precise_dating = models.TextField(_("Precise on dating"), blank=True, default="") objects = UUIDModelManager() ASSOCIATED_ALT_NAMES = { "datings__period": SearchAltName( @@ -529,7 +529,7 @@ class ContextRecord( [ ("unit__label", _("Context record type")), ("operation__cached_label", _("Operation")), - ("datings__period__label", _("Period")), + ("datings__period__label", _("Chronological period")), ("identification__label", _("Identification")), ("activity__label", _("Activity")), ("excavation_technics__label", _("Excavation techniques")), diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index 0b3c842d4..f1b1a11d9 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -316,7 +316,7 @@ class BasicFindForm(CustomForm, ManageOldType): label=_("Functional areas"), required=False, ) - find_number = forms.IntegerField(label=_("Find number"), required=False) + find_number = forms.IntegerField(label=_("Number of remains"), required=False) min_number_of_individuals = forms.IntegerField( label=_("Minimum number of individuals (MNI)"), required=False ) @@ -633,7 +633,7 @@ class ResultingFindForm(CustomForm, ManageOldType): resulting_object_type_quality = forms.ChoiceField( label=_("Object type quality"), required=False, choices=[] ) - resulting_find_number = forms.IntegerField(label=_("Find number"), required=False) + resulting_find_number = forms.IntegerField(label=_("Number of remains"), required=False) resulting_min_number_of_individuals = forms.IntegerField( label=_("Minimum number of individuals (MNI)"), required=False ) @@ -875,7 +875,7 @@ class QAFindFormMulti(QAForm): qa_insurance_value = forms.FloatField(label=_("Insurance value"), required=False) qa_period = widgets.Select2MultipleField( - label=_("Period"), choices=[], required=False + label=_("Chronological period"), choices=[], required=False ) qa_dating_comment = forms.CharField( label=_("Comment on dating"), required=False, widget=forms.Textarea @@ -1226,12 +1226,12 @@ class DateForm(ManageOldType, forms.Form): "quality": DatingQuality, "period": Period, } - period = forms.ChoiceField(label=_("Period"), choices=[]) + period = forms.ChoiceField(label=_("Chronological period"), choices=[]) dating_type = forms.ChoiceField(label=_("Dating type"), required=False, choices=[]) start_date = forms.IntegerField(label=_("Start date"), required=False) end_date = forms.IntegerField(label=_("End date"), required=False) quality = forms.ChoiceField(label=_("Quality"), required=False, choices=[]) - precise_dating = forms.CharField(label=_("Precise dating"), required=False) + precise_dating = forms.CharField(label=_("Precise on dating"), required=False) TYPES = [ FieldType("dating_type", DatingType), FieldType("period", Period), @@ -1470,7 +1470,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): ), ) - find_number = forms.IntegerField(label=_("Find number")) + find_number = forms.IntegerField(label=_("Number of remains")) min_number_of_individuals = forms.IntegerField( label=_("Minimum number of individuals (MNI)") ) @@ -1968,7 +1968,7 @@ class ResultFindForm(ManageOldType, forms.Form): material_type = forms.ChoiceField(label=_("Material type"), choices=[]) volume = forms.IntegerField(label=_("Volume (l)")) weight = forms.IntegerField(label=_("Weight (g)")) - find_number = forms.IntegerField(label=_("Find number")) + find_number = forms.IntegerField(label=_("Number of remains")) TYPES = [FieldType("material_type", models.MaterialType)] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index 04af22d21..0efb9963e 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1147,7 +1147,7 @@ class Find( "base_finds__context_record__operation__towns__areas__parent__label", _("Extended area"), ), - ("datings__period__label", _("Period")), + ("datings__period__label", _("Chronological period")), ("material_types__label", _("Material type")), ("object_types__label", _("Object type")), ("preservation_to_considers__label", _("Recommended treatments")), @@ -1836,7 +1836,7 @@ class Find( weight_unit = models.CharField( _("Weight unit"), max_length=4, blank=True, null=True, choices=WEIGHT_UNIT ) - find_number = models.IntegerField(_("Find number"), blank=True, null=True) + find_number = models.IntegerField(_("Number of remains"), blank=True, null=True) upstream_treatment = models.ForeignKey( "Treatment", blank=True, diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 45544d415..34d1ec978 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -186,7 +186,7 @@ {% field_flex_multiple_obj "Object types" item 'object_types' %} {% field_flex "Object type quality" item.object_type_quality %} {% field_flex_multiple_obj "Functional areas" item 'functional_areas' %} - {% field_flex "Find number" item.find_number %} + {% field_flex "Number of remains" item.find_number %} {% field_flex "Minimum number of individuals (MNI)" item.min_number_of_individuals %} {% field_flex_full "Decoration" item.decoration "
" "
" %} {% field_flex_full "Inscription" item.inscription "
" "
" %} @@ -254,12 +254,12 @@ {% endif %} - + - + {% for dating in dating_list %} diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 7203da6c6..cf63b51c4 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -822,7 +822,7 @@ class OperationFormGeneral(CustomForm, ManageOldType): label=_("Remain type"), required=False ) period = widgets.Select2MultipleField( - label=_("Period"), required=False + label=_("Chronological period"), required=False ) abstract = forms.CharField( label=_("Abstract"), diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 412d00473..4c1317aaf 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -236,7 +236,7 @@ {% endwith %}
{% field_flex_multiple_obj "Remains" item 'remains' %} - {% field_flex_multiple_obj "Periods" item 'periods' %} + {% field_flex_multiple_obj "Chronological period" item 'periods' %} {% field_flex "Record quality" item.record_quality_type %} {% field_flex "Report delivery date" item.report_delivery_date %} {% field_flex "Report processing" item.report_processing %} @@ -514,7 +514,7 @@ {% if item.nb_context_records_by_periods %}
{% trans "Period" %}{% trans "Chronological period" %} {% trans "Start date" %} {% trans "End date" %} {% trans "Dating type" %} {% trans "Quality" %}{% trans "Precise dating" %}{% trans "Precise on dating" %}
- + {% for label, nb in item.nb_context_records_by_periods %} {% endfor %} @@ -551,7 +551,7 @@ {% if item.nb_finds_by_periods %}
{% trans "Period" %}{% trans "Number" %}
{% trans "Chronological period" %}{% trans "Number" %}
{{label|default:"-"}}{{nb}}
- + {% for label, nb in item.nb_finds_by_periods %} {% endfor %} diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 3abc0ddd1..340fb9ee0 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -1065,7 +1065,7 @@ def get_columns_from_class(cls, table_cols_attr="TABLE_COLS", dict_col_labels=Tr try: field = field._meta.get_field(key) field_verbose_name = field.verbose_name - except (fields.FieldDoesNotExist, AttributeError): + except (field.FieldDoesNotExist, AttributeError): if hasattr(field, key + "_lbl"): field_verbose_name = getattr(field, key + "_lbl") else: diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 27707e16a..aa0c01eb7 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: 2023-01-13 12:49+0100\n" +"POT-Creation-Date: 2023-01-16 11:42+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" @@ -373,8 +373,7 @@ msgstr "" #: archaeological_operations/forms.py:825 #: archaeological_operations/templates/ishtar/sheet_operation.html:517 #: archaeological_operations/templates/ishtar/sheet_operation.html:554 -#: ishtar_common/models_imports.py:928 -msgid "Period" +msgid "Chronological period" msgstr "" #: archaeological_context_records/forms.py:445 @@ -435,7 +434,7 @@ msgstr "" #: archaeological_context_records/models.py:125 #: archaeological_finds/forms.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:262 -msgid "Precise dating" +msgid "Precise on dating" msgstr "" #: archaeological_context_records/forms.py:460 @@ -2962,7 +2961,7 @@ msgstr "" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:636 #: archaeological_finds/forms.py:1473 archaeological_finds/forms.py:1971 #: archaeological_finds/models_finds.py:1839 -msgid "Find number" +msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:638 @@ -6704,43 +6703,43 @@ msgstr "" msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:4622 +#: archaeological_operations/tests.py:4667 msgid "is not a valid JSON message" msgstr "" -#: archaeological_operations/tests.py:4630 +#: archaeological_operations/tests.py:4680 msgid "{result['created']} matches created" msgstr "" -#: archaeological_operations/tests.py:4643 +#: archaeological_operations/tests.py:4698 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4650 ishtar_common/admin.py:2442 +#: archaeological_operations/tests.py:4705 ishtar_common/admin.py:2442 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " "version?" msgstr "" -#: archaeological_operations/tests.py:4656 +#: archaeological_operations/tests.py:4711 msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4729 ishtar_common/admin.py:2530 +#: archaeological_operations/tests.py:4784 ishtar_common/admin.py:2530 msgid "{result['updated']} match key(s) updated." msgstr "" -#: archaeological_operations/tests.py:4735 ishtar_common/models_rest.py:371 +#: archaeological_operations/tests.py:4790 ishtar_common/models_rest.py:371 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." msgstr "" -#: archaeological_operations/tests.py:4742 ishtar_common/models_rest.py:350 +#: archaeological_operations/tests.py:4797 ishtar_common/models_rest.py:350 #: ishtar_common/models_rest.py:356 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -11184,6 +11183,10 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" +#: ishtar_common/models_imports.py:928 +msgid "Period" +msgstr "" + #: ishtar_common/models_imports.py:929 msgid "Report state" msgstr "" @@ -12021,13 +12024,13 @@ msgstr "" msgid "Map" msgstr "" -#: ishtar_common/templates/blocks/DataTables.html:302 -#: ishtar_common/templates/blocks/DataTables.html:393 +#: ishtar_common/templates/blocks/DataTables.html:303 +#: ishtar_common/templates/blocks/DataTables.html:394 msgid "Select all items" msgstr "" -#: ishtar_common/templates/blocks/DataTables.html:307 -#: ishtar_common/templates/blocks/DataTables.html:398 +#: ishtar_common/templates/blocks/DataTables.html:308 +#: ishtar_common/templates/blocks/DataTables.html:399 msgid "Deselect" msgstr "" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 17da999ac..3de6adc56 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: 2023-01-13 12:49+0100\n" +"POT-Creation-Date: 2023-01-16 11:42+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" @@ -373,8 +373,7 @@ msgstr "" #: archaeological_operations/forms.py:825 #: archaeological_operations/templates/ishtar/sheet_operation.html:517 #: archaeological_operations/templates/ishtar/sheet_operation.html:554 -#: ishtar_common/models_imports.py:928 -msgid "Period" +msgid "Chronological period" msgstr "" #: archaeological_context_records/forms.py:445 @@ -435,7 +434,7 @@ msgstr "" #: archaeological_context_records/models.py:125 #: archaeological_finds/forms.py:1234 #: archaeological_finds/templates/ishtar/sheet_find.html:262 -msgid "Precise dating" +msgid "Precise on dating" msgstr "" #: archaeological_context_records/forms.py:460 @@ -2962,7 +2961,7 @@ msgstr "" #: archaeological_finds/forms.py:319 archaeological_finds/forms.py:636 #: archaeological_finds/forms.py:1473 archaeological_finds/forms.py:1971 #: archaeological_finds/models_finds.py:1839 -msgid "Find number" +msgid "Number of remains" msgstr "" #: archaeological_finds/forms.py:321 archaeological_finds/forms.py:638 @@ -6704,43 +6703,43 @@ msgstr "" msgid "This item has been locked. Edition is disabled." msgstr "" -#: archaeological_operations/tests.py:4622 +#: archaeological_operations/tests.py:4667 msgid "is not a valid JSON message" msgstr "" -#: archaeological_operations/tests.py:4630 +#: archaeological_operations/tests.py:4680 msgid "{result['created']} matches created" msgstr "" -#: archaeological_operations/tests.py:4643 +#: archaeological_operations/tests.py:4698 #, python-brace-format msgid "" "Theses search models have not been found: {missing_search_models}. Not the " "same Ishtar version?" msgstr "" -#: archaeological_operations/tests.py:4650 ishtar_common/admin.py:2442 +#: archaeological_operations/tests.py:4705 ishtar_common/admin.py:2442 #, python-brace-format msgid "" "Theses types have not been found: {missing_types}. Not the same Ishtar " "version?" msgstr "" -#: archaeological_operations/tests.py:4656 +#: archaeological_operations/tests.py:4711 msgid "{result['deleted']} matches deleted" msgstr "" -#: archaeological_operations/tests.py:4729 ishtar_common/admin.py:2530 +#: archaeological_operations/tests.py:4784 ishtar_common/admin.py:2530 msgid "{result['updated']} match key(s) updated." msgstr "" -#: archaeological_operations/tests.py:4735 ishtar_common/models_rest.py:371 +#: archaeological_operations/tests.py:4790 ishtar_common/models_rest.py:371 #, python-brace-format msgid "" "{ctype} - {distant_key}, {distant_label} not referenced in the database." msgstr "" -#: archaeological_operations/tests.py:4742 ishtar_common/models_rest.py:350 +#: archaeological_operations/tests.py:4797 ishtar_common/models_rest.py:350 #: ishtar_common/models_rest.py:356 #, python-brace-format msgid "{sheet_name} is not a correct sheet name." @@ -11184,6 +11183,10 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" +#: ishtar_common/models_imports.py:928 +msgid "Period" +msgstr "" + #: ishtar_common/models_imports.py:929 msgid "Report state" msgstr "" @@ -12021,13 +12024,13 @@ msgstr "" msgid "Map" msgstr "" -#: ishtar_common/templates/blocks/DataTables.html:302 -#: ishtar_common/templates/blocks/DataTables.html:393 +#: ishtar_common/templates/blocks/DataTables.html:303 +#: ishtar_common/templates/blocks/DataTables.html:394 msgid "Select all items" msgstr "" -#: ishtar_common/templates/blocks/DataTables.html:307 -#: ishtar_common/templates/blocks/DataTables.html:398 +#: ishtar_common/templates/blocks/DataTables.html:308 +#: ishtar_common/templates/blocks/DataTables.html:399 msgid "Deselect" msgstr "" -- cgit v1.2.3
{% trans "Period" %}{% trans "Number" %}
{% trans "Chronological period" %}{% trans "Number" %}
{{label|default:"-"}}{{nb}}