diff options
| -rw-r--r-- | archaeological_finds/forms.py | 16 | ||||
| -rw-r--r-- | archaeological_finds/migrations/0119_auto_20240223_1105.py | 33 | ||||
| -rw-r--r-- | archaeological_finds/models_finds.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 2 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_museum_find.html | 2 | ||||
| -rw-r--r-- | locale/fr/LC_MESSAGES/django.po | 8 |
6 files changed, 51 insertions, 18 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index d8b087c3c..4c72646cc 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -267,7 +267,7 @@ class BasicFindForm(CustomForm, ManageOldType): "museum_former_collection", "museum_inventory_entry_year", "museum_inventory_conformity", - "museum_non_conformity_comment", + "museum_conformity_comment", "museum_inventory_transcript", "museum_original_repro", "museum_allocation_date", @@ -336,7 +336,7 @@ class BasicFindForm(CustomForm, ManageOldType): "museum_former_collection", "museum_inventory_entry_year", "museum_inventory_conformity", - "museum_non_conformity_comment", + "museum_conformity_comment", "museum_inventory_transcript", "museum_original_repro", "museum_allocation_date", @@ -410,8 +410,8 @@ class BasicFindForm(CustomForm, ManageOldType): museum_inventory_conformity = forms.ChoiceField( label=_("Conformity with inventory"), required=False, choices=[] ) - museum_non_conformity_comment = forms.CharField( - label=_("Comment of non-conformity"), widget=forms.Textarea, required=False + museum_conformity_comment = forms.CharField( + label=_("Comment on conformity"), widget=forms.Textarea, required=False ) museum_original_repro = forms.ChoiceField( label=_("Original/reproduction"), required=False, choices=[] @@ -641,7 +641,7 @@ class FindForm(BasicFindForm): "museum_former_collection", "museum_inventory_entry_year", "museum_inventory_conformity", - "museum_non_conformity_comment", + "museum_conformity_comment", "museum_original_repro", "museum_allocation_date", "museum_purchase_price", @@ -1529,7 +1529,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): "museum_inventory_entry_year_before", "museum_inventory_entry_year_after", "museum_inventory_conformity", - "museum_non_conformity_comment", + "museum_conformity_comment", "museum_inventory_transcript", "museum_original_repro", "museum_allocation_date_before", @@ -1561,7 +1561,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): "museum_inventory_entry_year_before", "museum_inventory_entry_year_after", "museum_inventory_conformity", - "museum_non_conformity_comment", + "museum_conformity_comment", "museum_inventory_transcript", "museum_original_repro", "museum_allocation_date_before", @@ -1913,7 +1913,7 @@ class FindSelect(GeoItemSelect, PeriodSelect): museum_inventory_conformity = forms.ChoiceField( label=_("Museum - Conformity with inventory"), choices=[] ) - museum_non_conformity_comment = forms.CharField(label=_("Museum - Comment of non-conformity")) + museum_conformity_comment = forms.CharField(label=_("Museum - Comment on conformity")) museum_inventory_transcript = forms.CharField(label=_("Museum - Inventory transcript")) museum_original_repro = forms.ChoiceField( label=_("Museum - Original/reproduction"), choices=[] diff --git a/archaeological_finds/migrations/0119_auto_20240223_1105.py b/archaeological_finds/migrations/0119_auto_20240223_1105.py new file mode 100644 index 000000000..11b192332 --- /dev/null +++ b/archaeological_finds/migrations/0119_auto_20240223_1105.py @@ -0,0 +1,33 @@ +# Generated by Django 2.2.24 on 2024-02-23 11:05 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('archaeological_finds', '0118_auto_20240222_1745'), + ] + + operations = [ + migrations.RenameField( + model_name='find', + old_name='museum_non_conformity_comment', + new_name='museum_conformity_comment', + ), + migrations.RenameField( + model_name='historicalfind', + old_name='museum_non_conformity_comment', + new_name='museum_conformity_comment', + ), + migrations.AlterField( + model_name='find', + name='museum_conformity_comment', + field=models.TextField(blank=True, default='', verbose_name='Comment on conformity'), + ), + migrations.AlterField( + model_name='historicalfind', + name='museum_conformity_comment', + field=models.TextField(blank=True, default='', verbose_name='Comment on conformity'), + ), + ] diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py index e56430c77..e87925170 100644 --- a/archaeological_finds/models_finds.py +++ b/archaeological_finds/models_finds.py @@ -1736,9 +1736,9 @@ class Find( pgettext_lazy("key for text search", "museum-inventory-conformity"), "museum_inventory_conformity__label__iexact" ), - "museum_non_conformity_comment": SearchAltName( - pgettext_lazy("key for text search", "museum-non-conformity-comment"), - "museum_non_conformity_comment__iexact" + "museum_conformity_comment": SearchAltName( + pgettext_lazy("key for text search", "museum-conformity-comment"), + "museum_conformity_comment__iexact" ), "museum_inventory_transcript": SearchAltName( pgettext_lazy("key for text search", "museum-inventory-transcript"), @@ -2174,7 +2174,7 @@ class Find( InventoryConformity, blank=True, null=True, on_delete=models.SET_NULL, verbose_name=_("Conformity with inventory"), ) - museum_non_conformity_comment = models.TextField(_("Comment of non-conformity"), blank=True, default="") + museum_conformity_comment = models.TextField(_("Comment on conformity"), blank=True, default="") museum_inventory_transcript = models.TextField(_("Inventory transcript"), blank=True, default="") museum_original_repro = models.ForeignKey( OriginalReproduction, blank=True, null=True, on_delete=models.SET_NULL, diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 3bea6d5cd..c88bff96a 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -235,7 +235,7 @@ {% field_flex_multiple_obj "Former collection" item "museum_former_collections" %} {% field_flex "Inventory entry year" item.museum_inventory_entry_year %} {% field_flex "Conformity with inventory" item.museum_inventory_conformity %} - {% field_flex "Comment of non-conformity" item.museum_non_conformity_comment %} + {% field_flex "Comment on conformity" item.museum_conformity_comment %} {% field_flex "Inventory transcript" item.museum_inventory_transcript %} {% field_flex "Original/reproduction" item.museum_original_repro %} {% field_flex "Date of museum allocation" item.museum_allocation_date|date:"SHORT_DATE_FORMAT" %} diff --git a/archaeological_finds/templates/ishtar/sheet_museum_find.html b/archaeological_finds/templates/ishtar/sheet_museum_find.html index 7fee6cde0..7f8b2c506 100644 --- a/archaeological_finds/templates/ishtar/sheet_museum_find.html +++ b/archaeological_finds/templates/ishtar/sheet_museum_find.html @@ -163,7 +163,7 @@ {% field_flex_multiple_obj "Type of marking" item "museum_marking_type" %} {% field_flex "Marking details" item.mark "<pre>" "</pre>" %} {% field_flex "Conformity with inventory" item.museum_inventory_conformity %} - {% field_flex "Comment of non-conformity" item.museum_non_conformity_comment %} + {% field_flex "Comment on conformity" item.museum_conformity_comment %} {% field_flex "Inventory entry year" item.museum_inventory_entry_year %} {% field_flex "Inventory transcript" item.museum_inventory_transcript %} {% field_flex "Original/reproduction" item.museum_original_repro %} diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 3362ef24c..335cc6b42 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -3369,8 +3369,8 @@ msgid "Conformity with inventory" msgstr "Conformité avec l’inventaire" #: archaeological_finds/forms.py:414 archaeological_finds/models_finds.py:2177 -msgid "Comment of non-conformity" -msgstr "Précisions sur non-conformité" +msgid "Comment on conformity" +msgstr "Précisions sur la conformité" #: archaeological_finds/forms.py:417 archaeological_finds/models_finds.py:2181 msgid "Original/reproduction" @@ -4173,8 +4173,8 @@ msgid "Museum - Conformity with inventory" msgstr "Musée - Conformité avec l’inventaire" #: archaeological_finds/forms.py:1916 -msgid "Museum - Comment of non-conformity" -msgstr "Musée - Précisions sur non-conformité" +msgid "Museum - Comment on conformity" +msgstr "Musée - Précisions sur la conformité" #: archaeological_finds/forms.py:1917 msgid "Museum - Inventory transcript" |