diff options
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/admin.py | 18 | ||||
| -rw-r--r-- | archaeological_context_records/fixtures/initial_data-fr.json | 320 | ||||
| -rw-r--r-- | archaeological_context_records/locale/django.pot | 6 | ||||
| -rw-r--r-- | archaeological_context_records/models.py | 6 |
4 files changed, 182 insertions, 168 deletions
diff --git a/archaeological_context_records/admin.py b/archaeological_context_records/admin.py index bd2579afb..353d75925 100644 --- a/archaeological_context_records/admin.py +++ b/archaeological_context_records/admin.py @@ -61,11 +61,25 @@ admin.site.register(models.RecordRelations, RecordRelationsAdmin) class RelationTypeAdmin(admin.ModelAdmin): list_display = ('label', 'txt_idx', 'tiny_label', 'available', - 'symmetrical', 'inverse_relation', 'comment') + 'symmetrical', 'inverse_relation', 'order', 'comment') admin.site.register(models.RelationType, RelationTypeAdmin) +class UnitAdmin(admin.ModelAdmin): + list_display = ['label', 'txt_idx', 'parent', 'available', 'order', 'comment'] + +admin.site.register(models.Unit, UnitAdmin) + + +class IdentificationTypeAdmin(admin.ModelAdmin): + list_display = ['label', 'txt_idx', 'available', 'order', 'comment'] + +admin.site.register(models.IdentificationType, IdentificationTypeAdmin) + + general_models = [models.DatingType, models.DatingQuality, - models.Unit, models.ActivityType, models.IdentificationType] + models.ActivityType] for model in general_models: admin.site.register(model, GeneralTypeAdmin) + + diff --git a/archaeological_context_records/fixtures/initial_data-fr.json b/archaeological_context_records/fixtures/initial_data-fr.json index 019940ea3..22b96aa41 100644 --- a/archaeological_context_records/fixtures/initial_data-fr.json +++ b/archaeological_context_records/fixtures/initial_data-fr.json @@ -34,7 +34,7 @@ "pk": 2, "model": "archaeological_context_records.activitytype", "fields": { - "comment": "Unit\u00e9 \u00e9labor\u00e9e par l'homme, comme une mur ou un sol am\u00e9nag\u00e9 par exemple.", + "comment": "Unit\u00e9 \u00e9labor\u00e9e par l'homme, comme un mur ou un sol am\u00e9nag\u00e9 par exemple.", "available": true, "txt_idx": "construction", "order": 1100, @@ -42,25 +42,25 @@ } }, { - "pk": 3, + "pk": 4, "model": "archaeological_context_records.activitytype", "fields": { - "comment": "Unit\u00e9 r\u00e9sultant de l'arr\u00eat d'anthropisation.", + "comment": "Unit\u00e9 li\u00e9e \u00e0 l'anthropisation elle-m\u00eame.", "available": true, - "txt_idx": "desertion", - "order": 1200, - "label": "Abandon" + "txt_idx": "occupation", + "order": 1300, + "label": "Occupation" } }, { - "pk": 4, + "pk": 3, "model": "archaeological_context_records.activitytype", "fields": { - "comment": "Unit\u00e9 li\u00e9e \u00e0 l'anthropisation elle-m\u00eame.", + "comment": "Unit\u00e9 r\u00e9sultant de l'arr\u00eat d'anthropisation.", "available": true, - "txt_idx": "occupation", - "order": 1300, - "label": "Occupation" + "txt_idx": "desertion", + "order": 1500, + "label": "Abandon" } }, { @@ -70,223 +70,199 @@ "comment": "", "available": true, "txt_idx": "unknown", - "order": 100, + "order": 10, "label": "Ind\u00e9termin\u00e9" } }, { - "pk": 1, + "pk": 12, "model": "archaeological_context_records.identificationtype", "fields": { - "comment": "Niveau cultiv\u00e9 ou non, actuel.", + "comment": "", "available": true, - "txt_idx": "soil", + "txt_idx": "windthrow", "order": 1000, - "label": "Terre v\u00e9g\u00e9tale" + "label": "Chablis" } }, { - "pk": 2, + "pk": 11, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "masonry", - "order": 1100, - "label": "Ma\u00e7onnerie" + "txt_idx": "colluvial_unit", + "order": 1000, + "label": "Colluvions" } }, { - "pk": 3, + "pk": 13, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "wall", - "order": 1200, - "label": "Mur" + "txt_idx": "filling", + "order": 1000, + "label": "Comblement" } }, { - "pk": 4, + "pk": 10, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "occupation_level", - "order": 1300, - "label": "Niveau d'occupation" + "txt_idx": "digging", + "order": 1000, + "label": "Creusement" } }, { - "pk": 5, + "pk": 2, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "desertion_level", - "order": 1400, - "label": "Niveau d'abandon" + "txt_idx": "masonry", + "order": 1000, + "label": "Ma\u00e7onnerie" } }, { - "pk": 6, + "pk": 3, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "geological_level", - "order": 1400, - "label": "Niveau g\u00e9ologique" + "txt_idx": "wall", + "order": 1000, + "label": "Mur" } }, { - "pk": 7, + "pk": 5, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "embankment", - "order": 1500, - "label": "Remblai" + "txt_idx": "desertion_level", + "order": 1000, + "label": "Niveau d'abandon" } }, { - "pk": 8, + "pk": 4, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "archaeological_soil", - "order": 1600, - "label": "Sol arch\u00e9ologique" + "txt_idx": "occupation_level", + "order": 1000, + "label": "Niveau d'occupation" } }, { - "pk": 9, + "pk": 6, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "foundation_level", - "order": 1700, - "label": "Radier" + "txt_idx": "geological_level", + "order": 1000, + "label": "Niveau g\u00e9ologique" } }, { - "pk": 11, + "pk": 9, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "colluvial_unit", - "order": 1800, - "label": "Colluvions" + "txt_idx": "foundation_level", + "order": 1000, + "label": "Radier" } }, { - "pk": 10, + "pk": 7, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "digging", - "order": 1800, - "label": "Creusement" + "txt_idx": "embankment", + "order": 1000, + "label": "Remblai" } }, { - "pk": 12, + "pk": 8, "model": "archaeological_context_records.identificationtype", "fields": { "comment": "", "available": true, - "txt_idx": "windthrow", - "order": 1900, - "label": "Chablis" + "txt_idx": "archaeological_soil", + "order": 1000, + "label": "Sol arch\u00e9ologique" } }, { - "pk": 13, + "pk": 1, "model": "archaeological_context_records.identificationtype", "fields": { - "comment": "", + "comment": "Niveau cultiv\u00e9 ou non, actuel.", "available": true, - "txt_idx": "filling", - "order": 2000, - "label": "Comblement" + "txt_idx": "soil", + "order": 1000, + "label": "Terre v\u00e9g\u00e9tale" } }, { - "pk": 13, + "pk": 7, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, "parent": null, - "label": "Secteur", - "order": 1, - "txt_idx": "sector" - } - }, - { - "pk": 12, - "model": "archaeological_context_records.unit", - "fields": { - "comment": "Un truc impie", - "available": true, - "parent": null, - "label": "Structure", - "order": 1, - "txt_idx": "structure" + "label": "Alt\u00e9ration", + "order": 100, + "txt_idx": "alteration" } }, { - "pk": 9, + "pk": 10, "model": "archaeological_context_records.unit", "fields": { - "comment": "Unit\u00e9 g\u00e9n\u00e9rale (d'ordinaire virtuelle) pouvant regrouper du mobilier trouver en dehors d'un contexte spatialis\u00e9 : mobilier trouver lors d'un d\u00e9capage, sous une semelle d'un fouilleur, dans les d\u00e9blais, etc.", + "comment": "Unit\u00e9 repr\u00e9sentant une partie d'un niveau d\u00e9coup\u00e9 en carr\u00e9s r\u00e9f\u00e9renc\u00e9s.", "available": true, "parent": null, - "label": "Hors contexte", - "order": 1, - "txt_idx": "not_in_context" + "label": "Carr\u00e9", + "order": 100, + "txt_idx": "square" } }, { - "pk": 14, + "pk": 4, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, "parent": null, - "label": "Zone", - "order": 2, - "txt_idx": "zone" - } - }, - { - "pk": 10, - "model": "archaeological_context_records.unit", - "fields": { - "comment": "Unit\u00e9 repr\u00e9sentant une partie d'un niveau d\u00e9coup\u00e9 en carr\u00e9s r\u00e9f\u00e9renc\u00e9s.", - "available": true, - "parent": null, - "label": "Carr\u00e9", - "order": 10, - "txt_idx": "square" + "label": "Couche", + "order": 100, + "txt_idx": "layer" } }, { - "pk": 1, + "pk": 5, "model": "archaeological_context_records.unit", "fields": { - "comment": "Cette unit\u00e9 n'a pas de volume", + "comment": "", "available": true, - "parent": null, - "label": "N\u00e9gative", + "parent": 4, + "label": "Couche construite", "order": 100, - "txt_idx": "negative" + "txt_idx": "builded_layer" } }, { @@ -297,7 +273,7 @@ "available": true, "parent": 1, "label": "Creusement", - "order": 110, + "order": 100, "txt_idx": "digging" } }, @@ -309,32 +285,44 @@ "available": true, "parent": 1, "label": "D\u00e9rasement", - "order": 120, + "order": 100, "txt_idx": "partial_destruction" } }, { - "pk": 4, + "pk": 9, "model": "archaeological_context_records.unit", "fields": { - "comment": "", + "comment": "Unit\u00e9 g\u00e9n\u00e9rale (d'ordinaire virtuelle) pouvant regrouper du mobilier trouv\u00e9 en dehors d'un contexte spatialis\u00e9 : mobilier trouv\u00e9 lors d'un d\u00e9capage, sous une semelle d'un fouilleur, dans les d\u00e9blais, etc.", "available": true, "parent": null, - "label": "Couche", - "order": 200, - "txt_idx": "layer" + "label": "Hors contexte", + "order": 100, + "txt_idx": "not_in_context" } }, { - "pk": 5, + "pk": 8, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, - "parent": 4, - "label": "Couche construite", - "order": 210, - "txt_idx": "builded_layer" + "parent": 7, + "label": "Impact thermique", + "order": 100, + "txt_idx": "thermal_impact" + } + }, + { + "pk": 1, + "model": "archaeological_context_records.unit", + "fields": { + "comment": "Cette unit\u00e9 n'a pas de volume.", + "available": true, + "parent": null, + "label": "N\u00e9gative", + "order": 100, + "txt_idx": "negative" } }, { @@ -345,32 +333,32 @@ "available": true, "parent": 4, "label": "Remblai", - "order": 220, + "order": 100, "txt_idx": "embankment" } }, { - "pk": 7, + "pk": 13, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, "parent": null, - "label": "Alt\u00e9ration", - "order": 300, - "txt_idx": "alteration" + "label": "Secteur", + "order": 100, + "txt_idx": "sector" } }, { - "pk": 8, + "pk": 12, "model": "archaeological_context_records.unit", "fields": { "comment": "", "available": true, - "parent": 7, - "label": "Impact thermique", - "order": 310, - "txt_idx": "thermal_impact" + "parent": null, + "label": "Structure", + "order": 100, + "txt_idx": "structure" } }, { @@ -381,11 +369,23 @@ "available": true, "parent": null, "label": "Tranch\u00e9e", - "order": 500, + "order": 100, "txt_idx": "trench" } }, { + "pk": 14, + "model": "archaeological_context_records.unit", + "fields": { + "comment": "", + "available": true, + "parent": null, + "label": "Zone", + "order": 100, + "txt_idx": "zone" + } + }, + { "pk": 1, "model": "archaeological_context_records.datingtype", "fields": { @@ -409,9 +409,9 @@ "pk": 2, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "Une UE en rempli une autre (qui doit \u00eatre vraisemblablement une US de creusement)", + "comment": "UE en remplissant une autre (qui doit \u00eatre vraisemblablement une US de creusement)", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Comble", "symmetrical": false, "inverse_relation": 10, @@ -420,6 +420,20 @@ } }, { + "pk": 1, + "model": "archaeological_context_records.relationtype", + "fields": { + "comment": "UE en coupant une autre", + "available": true, + "tiny_label": "", + "label": "Coupe", + "symmetrical": false, + "inverse_relation": 8, + "order": 1, + "txt_idx": "cutting" + } + }, + { "pk": 8, "model": "archaeological_context_records.relationtype", "fields": { @@ -451,9 +465,9 @@ "pk": 3, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "UE est situ\u00e9e au-dessus d'une autre", + "comment": "UE situ\u00e9e au-dessus d'une autre", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Est au-dessus de", "symmetrical": false, "inverse_relation": 7, @@ -465,10 +479,10 @@ "pk": 10, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "", + "comment": "UE remplie par une autre", "available": true, - "tiny_label": null, - "label": "Est-combl\u00e9 par", + "tiny_label": "", + "label": "Est combl\u00e9 par", "symmetrical": false, "inverse_relation": 2, "order": 1, @@ -479,9 +493,9 @@ "pk": 7, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "UE est situ\u00e9e en-dessous d'une autre", + "comment": "UE situ\u00e9e en-dessous d'une autre", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Est en-dessous de", "symmetrical": false, "inverse_relation": 3, @@ -493,9 +507,9 @@ "pk": 6, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "Cette unit\u00e9 d'enregistrement fait partie d'une autre", + "comment": "UE faisant partie d'une autre", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Est inclus dans", "symmetrical": false, "inverse_relation": 5, @@ -507,9 +521,9 @@ "pk": 5, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "Cette Unit\u00e9 d\u2019enregistrement en inclut (regroupe) d'autres (ex: tranch\u00e9e / structures ou entre structure / US, etc.)", + "comment": "UE en incluant (regroupant) d'autres (ex: tranch\u00e9e / structures ou entre structure / US, etc.)", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Inclut", "symmetrical": false, "inverse_relation": 6, @@ -518,26 +532,12 @@ } }, { - "pk": 1, - "model": "archaeological_context_records.relationtype", - "fields": { - "comment": "UE recoupant une autre", - "available": true, - "tiny_label": null, - "label": "Recoupe", - "symmetrical": false, - "inverse_relation": 8, - "order": 1, - "txt_idx": "cutting" - } - }, - { "pk": 4, "model": "archaeological_context_records.relationtype", "fields": { - "comment": "A pr\u00e9ciser ", + "comment": "\u00c0 pr\u00e9ciser ", "available": true, - "tiny_label": null, + "tiny_label": "", "label": "Relation indirecte", "symmetrical": true, "inverse_relation": null, @@ -545,4 +545,4 @@ "txt_idx": "indirect_relation" } } -] +]
\ No newline at end of file diff --git a/archaeological_context_records/locale/django.pot b/archaeological_context_records/locale/django.pot index 75e6a2160..e42400f29 100644 --- a/archaeological_context_records/locale/django.pot +++ b/archaeological_context_records/locale/django.pot @@ -3,7 +3,7 @@ # This file is distributed under the same license as the Ishtar package. # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata -# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" @@ -253,11 +253,11 @@ msgid "Dating types" msgstr "" #: models.py:47 -msgid "Dating quality" +msgid "Dating quality type" msgstr "" #: models.py:48 -msgid "Dating qualities" +msgid "Dating quality types" msgstr "" #: models.py:62 diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py index 75074c514..9714673e6 100644 --- a/archaeological_context_records/models.py +++ b/archaeological_context_records/models.py @@ -44,8 +44,8 @@ post_delete.connect(post_save_cache, sender=DatingType) class DatingQuality(GeneralType): class Meta: - verbose_name = _(u"Dating quality") - verbose_name_plural = _(u"Dating qualities") + verbose_name = _(u"Dating quality type") + verbose_name_plural = _(u"Dating quality types") ordering = ('label',) post_save.connect(post_save_cache, sender=DatingQuality) post_delete.connect(post_save_cache, sender=DatingQuality) @@ -82,7 +82,7 @@ class Unit(GeneralType): class Meta: verbose_name = _(u"Unit Type") verbose_name_plural = _(u"Unit Types") - ordering = ('order',) + ordering = ('order', 'label') def __unicode__(self): return self.label |