diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-04 21:44:27 +0100 |
| commit | cb11379a0928b99e7801710040ac90dd1665b5ef (patch) | |
| tree | 9f64e921fc66bbe0938e17c1f5325b83c4ccb73b | |
| parent | e62d26f17f7f0da10d7bf0f9c7d8895c88002021 (diff) | |
| parent | 0b0a146fbacde80528b7fb12bfe5719fdef40c85 (diff) | |
| download | Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.tar.bz2 Ishtar-cb11379a0928b99e7801710040ac90dd1665b5ef.zip | |
Merge branch 'master' into master-importers
Conflicts:
ishtar_common/fixtures/initial_importtypes-fr.json
27 files changed, 1098 insertions, 994 deletions
diff --git a/CHANGES.md b/CHANGES.md index 73754910d..ddb825759 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,19 @@ Ishtar changelog ================ +v0.99.10 (2017-02-04) +--------------------- + +### Features ### +- Admin: many changes on ordering, label and table columns +- Admin: add CSV export to general types +- Admin: add basic tests for general types +- Admin: add title types, formats and support types +- Fixtures: update all fixtures from reference +- Fixtures: add spatial ref system +- Makefile: add format, title type and support type to common fixtures, adapt fixtures +- Test - warehouse: explicit error on container creation form + 0.99.9 (2017-02-03) ------------------- diff --git a/Makefile.example b/Makefile.example index 37d439c10..7157efc37 100644 --- a/Makefile.example +++ b/Makefile.example @@ -174,6 +174,8 @@ fixtures_common: fixtures_common_importers fixtures_spatialrefsystem ishtar_common.sourcetype \ ishtar_common.operationtype \ ishtar_common.titletype \ + ishtar_common.supporttype \ + ishtar_common.format \ > '../ishtar_common/fixtures/initial_data-'$(default_data)'.json' fixtures_common_importers: 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 diff --git a/archaeological_files/fixtures/initial_data-fr.json b/archaeological_files/fixtures/initial_data-fr.json index 2d45ba017..fff42cfb7 100644 --- a/archaeological_files/fixtures/initial_data-fr.json +++ b/archaeological_files/fixtures/initial_data-fr.json @@ -62,7 +62,7 @@ "available": true, "txt_idx": "impact_study", "delay": 60, - "label": "Etude d'impact (EI)" + "label": "\u00c9tude d'impact (EI)" } }, { diff --git a/archaeological_files/locale/django.pot b/archaeological_files/locale/django.pot index 111ba45c4..3eecfc8cd 100644 --- a/archaeological_files/locale/django.pot +++ b/archaeological_files/locale/django.pot @@ -5,6 +5,7 @@ # Étienne Loks <etienne.loks@iggdrasil.net>, 2015. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata +# Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" diff --git a/archaeological_finds/fixtures/initial_data-fr.json b/archaeological_finds/fixtures/initial_data-fr.json index 334c1113e..341b351f8 100644 --- a/archaeological_finds/fixtures/initial_data-fr.json +++ b/archaeological_finds/fixtures/initial_data-fr.json @@ -1,5 +1,18 @@ [ { + "pk": 56, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "code": "M.MT", + "parent": 27, + "label": "Alliage cuivreux", + "recommendation": "", + "txt_idx": "copper-alloy" + } + }, + { "pk": 16, "model": "archaeological_finds.materialtype", "fields": { @@ -8,7 +21,7 @@ "code": "M.AT", "parent": null, "label": "Autre", - "recommendation": "gaffe ?", + "recommendation": "", "txt_idx": "other" } }, @@ -42,12 +55,12 @@ "pk": 45, "model": "archaeological_finds.materialtype", "fields": { - "comment": "sqqddgsdg", + "comment": "", "available": true, "code": "BRZ", - "parent": 27, + "parent": 56, "label": "Bronze", - "recommendation": "sdgsqfsq", + "recommendation": "", "txt_idx": "brz" } }, @@ -60,7 +73,7 @@ "code": "M.TC", "parent": 13, "label": "C\u00e9ramique", - "recommendation": "ras", + "recommendation": "", "txt_idx": "ceramic" } }, @@ -112,7 +125,7 @@ "code": "M.EP", "parent": 32, "label": "Enduit peint", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "painted_plaster" } }, @@ -138,7 +151,7 @@ "code": "M.OS", "parent": 39, "label": "Faune", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "animal_bone" } }, @@ -203,7 +216,7 @@ "code": "M.ID", "parent": null, "label": "Ind\u00e9termin\u00e9", - "recommendation": "ras", + "recommendation": "", "txt_idx": "unknown" } }, @@ -216,7 +229,7 @@ "code": "M.LP", "parent": 11, "label": "Lapidaire", - "recommendation": "ras", + "recommendation": "", "txt_idx": "lapidary" } }, @@ -229,7 +242,7 @@ "code": "M.LT", "parent": 11, "label": "Lithique", - "recommendation": "ras", + "recommendation": "", "txt_idx": "lithic" } }, @@ -242,7 +255,7 @@ "code": "M.AT", "parent": 16, "label": "Mat\u00e9riaux de construction autre", - "recommendation": "ras ou ???", + "recommendation": "", "txt_idx": "constr_material" } }, @@ -255,7 +268,7 @@ "code": "M.MT", "parent": null, "label": "M\u00e9tal", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "metal" } }, @@ -268,7 +281,7 @@ "code": "M.MT", "parent": 14, "label": "M\u00e9tal ferreux", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "iron_metal" } }, @@ -281,7 +294,7 @@ "code": "M.MT", "parent": 14, "label": "M\u00e9tal non ferreux", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "not_iron_metal" } }, @@ -294,7 +307,7 @@ "code": "M.MI", "parent": null, "label": "Min\u00e9ral", - "recommendation": "ras", + "recommendation": "", "txt_idx": "mineral" } }, @@ -307,7 +320,7 @@ "code": "M.MT", "parent": 14, "label": "Mon\u00e9taire", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "monetary" } }, @@ -320,7 +333,7 @@ "code": "M.?", "parent": null, "label": "Non \u00e9tudi\u00e9", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "not_studied" } }, @@ -333,7 +346,7 @@ "code": "M.OG", "parent": null, "label": "Organique", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "organic" } }, @@ -346,7 +359,7 @@ "code": "M.OG", "parent": 12, "label": "Organique non travaill\u00e9", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "raw_organic" } }, @@ -359,7 +372,7 @@ "code": "M.OG", "parent": 12, "label": "Organique travaill\u00e9", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "organicwork" } }, @@ -372,7 +385,7 @@ "code": "M.OS", "parent": 39, "label": "Os humain", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "human_bone" } }, @@ -384,8 +397,8 @@ "available": true, "code": "M.OS", "parent": 23, - "label": "Os (non travaill\u00e9)", - "recommendation": "gaffe", + "label": "Os non travaill\u00e9", + "recommendation": "", "txt_idx": "unworked_bone" } }, @@ -398,7 +411,7 @@ "code": "M.OS", "parent": 22, "label": "Os travaill\u00e9", - "recommendation": "gaffe !", + "recommendation": "", "txt_idx": "bonework" } }, @@ -406,12 +419,12 @@ "pk": 21, "model": "archaeological_finds.materialtype", "fields": { - "comment": "Tout ce qui est ni de l'industrie lithique, ni de la pierre de construction : meule, vaisselle, objet manufactur\u00e9 \u2026", + "comment": "Tout ce qui n'est ni de l'industrie lithique, ni de la pierre de construction : meule, vaisselle, objet manufactur\u00e9 \u2026", "available": true, "code": "M.MI", "parent": 11, "label": "Pierre autre", - "recommendation": "ras", + "recommendation": "", "txt_idx": "other_stone" } }, @@ -436,8 +449,8 @@ "available": true, "code": "P.NT", "parent": 16, - "label": "Pr\u00e9l\u00e8vement trait\u00e9 et \u00e9tudi\u00e9", - "recommendation": "ras ?? + d\u00e9lai de traitement ?", + "label": "Pr\u00e9l\u00e8vement non trait\u00e9", + "recommendation": "", "txt_idx": "sampling_not_processed" } }, @@ -450,7 +463,7 @@ "code": "P.TE", "parent": 16, "label": "Pr\u00e9l\u00e8vement trait\u00e9 et \u00e9tudi\u00e9", - "recommendation": "ras ?", + "recommendation": "", "txt_idx": "sampling_processed_studied" } }, @@ -463,7 +476,7 @@ "code": "P.NE", "parent": 16, "label": "Pr\u00e9l\u00e8vement trait\u00e9 non \u00e9tudi\u00e9", - "recommendation": "ras ??", + "recommendation": "", "txt_idx": "sampling_processed_not_studied" } }, @@ -476,7 +489,7 @@ "code": "M.AT", "parent": 16, "label": "Synth\u00e9tique", - "recommendation": "???", + "recommendation": "", "txt_idx": "synthetic" } }, @@ -489,7 +502,7 @@ "code": "M.TC", "parent": null, "label": "Terre cuite", - "recommendation": "ras", + "recommendation": "", "txt_idx": "earthenware" } }, @@ -502,7 +515,7 @@ "code": "M.TC", "parent": 13, "label": "Terre cuite architecturale", - "recommendation": "ras", + "recommendation": "", "txt_idx": "architect_earthenwork" } }, @@ -515,7 +528,7 @@ "code": "M.TC", "parent": 13, "label": "Terre cuite autre", - "recommendation": "ras ou pas ???", + "recommendation": "", "txt_idx": "other_earthenwork" } }, @@ -528,7 +541,7 @@ "code": "M.VR", "parent": null, "label": "Verre", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "glass" } }, @@ -541,7 +554,7 @@ "code": "M.VR", "parent": 15, "label": "Verre autre", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "glass_other" } }, @@ -554,7 +567,7 @@ "code": "M.VR", "parent": 15, "label": "Verre construction", - "recommendation": "gaffe", + "recommendation": "", "txt_idx": "glass_constr" } }, @@ -564,23 +577,57 @@ "fields": { "comment": "Le fait de mettre du mobilier dans un contenant. Que cela soit le conditionnement initial ou un re-conditionnement. ", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "Conditionnement", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "packaging" } }, { + "pk": 16, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Conservation-restauration", + "upstream_is_many": false, + "order": 10, + "txt_idx": "conservation" + } + }, + { + "pk": 14, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Consultation sur place", + "upstream_is_many": false, + "order": 10, + "txt_idx": "local_consultation" + } + }, + { "pk": 4, "model": "archaeological_finds.treatmenttype", "fields": { "comment": "D\u00e9placement de mobilier, entre deux d\u00e9p\u00f4ts : le mobilier ne peut pas \u00eatre stock\u00e9 ailleurs que dans un lieu consid\u00e9r\u00e9 comme un d\u00e9p\u00f4t.", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "D\u00e9placement", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "moving" } }, @@ -590,10 +637,12 @@ "fields": { "comment": "Processus qui permet d'\u00e9liminer le sel qui impr\u00e8gne un objet arch\u00e9ologique ou un lot d'objets.", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "D\u00e9salinisation", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "desalinisation" } }, @@ -603,10 +652,12 @@ "fields": { "comment": "Division d'un lot de mobilier en plusieurs lots.", "available": true, + "downstream_is_many": true, + "parent": null, "virtual": false, "label": "Division", "upstream_is_many": false, - "downstream_is_many": true, + "order": 10, "txt_idx": "split" } }, @@ -616,10 +667,12 @@ "fields": { "comment": "R\u00e9duction des oxydes d\u00e9velopp\u00e9s sur/dans un objet arch\u00e9ologique par l'usage de courant \u00e9lectrique.", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "\u00c9lectrolyse", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "electrolysis" } }, @@ -629,10 +682,12 @@ "fields": { "comment": "R\u00e9union de plusieurs objets ou lots mobiliers en un seul. Ce type de traitement peut impliquer ou non un reconditionnement.\r\n\r\nExemple : Remontage d'une c\u00e9ramique \u00e0 partir de tessons d\u00e9j\u00e0 pr\u00e9sents dans un contenant (pas de reconditionnement), regroupement d'une partie de la faune (os) d'une op\u00e9ration et cr\u00e9ation d'une nouvelle caisse dans ce but (reconditionnement \u00e0 faire).", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": false, "label": "Groupement", "upstream_is_many": true, - "downstream_is_many": false, + "order": 10, "txt_idx": "physical_grouping" } }, @@ -642,23 +697,72 @@ "fields": { "comment": "Regroupement d'un ensemble de mobilier. Exemple : ensemble des outils provenant d'une fouille, mobilier datant d'un site, tessonier virtuel, etc.", "available": true, + "downstream_is_many": false, + "parent": null, "virtual": true, "label": "Groupement virtuel", "upstream_is_many": true, - "downstream_is_many": false, + "order": 10, "txt_idx": "virtual_group" } }, { + "pk": 13, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Action de nettoyer le mobilier, d'ordinaire \u00e0 l'eau", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Lavage", + "upstream_is_many": false, + "order": 10, + "txt_idx": "washing" + } + }, + { + "pk": 15, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Marquage", + "upstream_is_many": false, + "order": 10, + "txt_idx": "marking" + } + }, + { + "pk": 18, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": 17, + "virtual": false, + "label": "Photographie", + "upstream_is_many": false, + "order": 10, + "txt_idx": "photo" + } + }, + { "pk": 9, "model": "archaeological_finds.treatmenttype", "fields": { "comment": "Photographie produisant un film (positif ou n\u00e9gatif).", "available": true, + "downstream_is_many": false, + "parent": 18, "virtual": false, "label": "Photographie argentique", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "regular_photography" } }, @@ -668,23 +772,57 @@ "fields": { "comment": "Prise de vue \u00e0 l'aide d'un appareil photo num\u00e9rique.", "available": true, + "downstream_is_many": false, + "parent": 18, "virtual": false, "label": "Photographie num\u00e9rique", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "digital_photography" } }, { + "pk": 17, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Prises de vue", + "upstream_is_many": false, + "order": 10, + "txt_idx": "shooting" + } + }, + { + "pk": 19, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "", + "available": true, + "downstream_is_many": false, + "parent": 17, + "virtual": false, + "label": "Radiographie", + "upstream_is_many": false, + "order": 10, + "txt_idx": "radioX" + } + }, + { "pk": 2, "model": "archaeological_finds.treatmenttype", "fields": { "comment": "Radiographie (rayon X) qui produit un ou des films radio.", "available": true, + "downstream_is_many": false, + "parent": 19, "virtual": false, "label": "Radiographie argentique", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "regular_x_ray" } }, @@ -694,18 +832,95 @@ "fields": { "comment": "Radiographie (rayon X) qui produit un ou des fichiers num\u00e9riques.", "available": true, + "downstream_is_many": false, + "parent": 19, "virtual": false, "label": "Radiographie num\u00e9rique", "upstream_is_many": false, - "downstream_is_many": false, + "order": 10, "txt_idx": "digital_x_ray" } }, { + "pk": 12, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Regroupement d\u2019\u00e9l\u00e9ments afin d'en remonter un. Ceci traduit le remontage physique des \u00e9l\u00e9ments. Ils constituent dor\u00e9navant un seul objet issu du remontage de plusieurs.", + "available": true, + "downstream_is_many": false, + "parent": null, + "virtual": false, + "label": "Remontage", + "upstream_is_many": true, + "order": 10, + "txt_idx": "reassembly" + } + }, + { + "pk": 6, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "cancelled", + "label": "Abandonn\u00e9" + } + }, + { + "pk": 3, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "completed", + "label": "Achev\u00e9" + } + }, + { + "pk": 5, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "to_be_confirmed", + "label": "\u00c0 confirmer" + } + }, + { + "pk": 2, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "In_progress", + "label": "En cours" + } + }, + { + "pk": 4, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "unknown", + "label": "Inconnu" + } + }, + { + "pk": 1, + "model": "archaeological_finds.treatmentstate", + "fields": { + "comment": "", + "available": true, + "txt_idx": "planned", + "label": "Pr\u00e9vu" + } + }, + { "pk": 4, "model": "archaeological_finds.conservatorystate", "fields": { - "comment": "l\u2019\u00e9tat de l\u2019objet n\u00e9cessite un traitement pr\u00e9ventif et/ou curatif.", + "comment": "L\u2019\u00e9tat de l\u2019objet n\u00e9cessite un traitement pr\u00e9ventif et/ou curatif.", "available": true, "txt_idx": "critical", "parent": null, @@ -716,7 +931,7 @@ "pk": 1, "model": "archaeological_finds.conservatorystate", "fields": { - "comment": "\u00c9tat \u00e0 d\u00e9termin\u00e9", + "comment": "L\u2019\u00e9tat de l\u2019objet est \u00e0 d\u00e9terminer.", "available": true, "txt_idx": "unknown", "parent": null, @@ -727,7 +942,7 @@ "pk": 3, "model": "archaeological_finds.conservatorystate", "fields": { - "comment": "l\u2019\u00e9tat de l\u2019objet n\u00e9cessite un traitement pr\u00e9ventif.", + "comment": "L\u2019\u00e9tat de l\u2019objet n\u00e9cessite un traitement pr\u00e9ventif.", "available": true, "txt_idx": "unstable", "parent": null, @@ -738,7 +953,7 @@ "pk": 2, "model": "archaeological_finds.conservatorystate", "fields": { - "comment": "l\u2019\u00e9tat de l\u2019objet est stable.", + "comment": "L\u2019\u00e9tat de l\u2019objet est stable.", "available": true, "txt_idx": "stable", "parent": null, @@ -746,6 +961,26 @@ } }, { + "pk": 1, + "model": "archaeological_finds.remarkabilitytype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "museable", + "label": "Mus\u00e9able" + } + }, + { + "pk": 5, + "model": "archaeological_finds.preservationtype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "to_wash", + "label": "\u00c0 laver" + } + }, + { "pk": 2, "model": "archaeological_finds.preservationtype", "fields": { @@ -5849,11 +6084,11 @@ "pk": 470, "model": "archaeological_finds.objecttype", "fields": { - "comment": null, + "comment": "", "available": true, - "txt_idx": "plaque-decorative-dharnachement", + "txt_idx": "plaque-decorative-de-harnachement", "parent": null, - "label": "plaque d\u00e9corative d'harnachement" + "label": "plaque d\u00e9corative de harnachement" } }, { @@ -7290,7 +7525,7 @@ "pk": 5, "model": "archaeological_finds.integritytype", "fields": { - "comment": "N'est plus pr\u00e9sent: perdu ?", + "comment": "N'est plus pr\u00e9sent : perdu ?", "available": true, "txt_idx": "not_there", "label": "Absent" diff --git a/archaeological_finds/locale/django.pot b/archaeological_finds/locale/django.pot index 819cf38bf..b25eac027 100644 --- a/archaeological_finds/locale/django.pot +++ b/archaeological_finds/locale/django.pot @@ -4,7 +4,6 @@ # Étienne Loks <etienne.loks at peacefrogs net>, 2010-2015. # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata -# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" diff --git a/archaeological_operations/admin.py b/archaeological_operations/admin.py index d8ce23662..3abf22eae 100644 --- a/archaeological_operations/admin.py +++ b/archaeological_operations/admin.py @@ -105,10 +105,16 @@ class ActTypeAdmin(GeneralTypeAdmin): list_filter = ('intented_to',) list_display = ['label', 'txt_idx', 'available', 'intented_to'] - admin.site.register(models.ActType, ActTypeAdmin) -general_models = [models.RemainType, models.ReportState] + +class ReportStateAdmin(GeneralTypeAdmin): + list_display = ['label', 'txt_idx', 'available', 'order', 'comment'] + +admin.site.register(models.ReportState, ReportStateAdmin) + + +general_models = [models.RemainType] for model in general_models: admin.site.register(model, GeneralTypeAdmin) diff --git a/archaeological_operations/fixtures/initial_data-fr.json b/archaeological_operations/fixtures/initial_data-fr.json index 9e9fd2bf7..9f514a097 100644 --- a/archaeological_operations/fixtures/initial_data-fr.json +++ b/archaeological_operations/fixtures/initial_data-fr.json @@ -14,6 +14,20 @@ } }, { + "pk": 909, + "model": "archaeological_operations.acttype", + "fields": { + "comment": "", + "available": true, + "code": "AR_demande", + "intented_to": "TF", + "label": "AR : demande de pr\u00eat", + "indexed": false, + "associated_template": [], + "txt_idx": "loan_demand_receipt" + } + }, + { "pk": 904, "model": "archaeological_operations.acttype", "fields": { @@ -294,6 +308,20 @@ } }, { + "pk": 910, + "model": "archaeological_operations.acttype", + "fields": { + "comment": "", + "available": true, + "code": "", + "intented_to": "T", + "label": "Constat d'\u00e9tat", + "indexed": false, + "associated_template": [], + "txt_idx": "observation_status" + } + }, + { "pk": 899, "model": "archaeological_operations.acttype", "fields": { @@ -708,7 +736,7 @@ "parent": 38, "end_date": 0, "order": 1, - "label": "Antiquit\u00e9 m\u00e9dit\u00e9rran\u00e9enne", + "label": "Antiquit\u00e9 m\u00e9diterran\u00e9enne", "start_date": 0, "txt_idx": "mediterranean_antiq" } @@ -890,7 +918,7 @@ "parent": null, "end_date": 1492, "order": 3000, - "label": "Moyen-\u00e2ge", + "label": "Moyen \u00c2ge", "start_date": 476, "txt_idx": "middle_age" } @@ -904,7 +932,7 @@ "parent": 27, "end_date": 1492, "order": 3700, - "label": "Bas moyen-\u00e2ge", + "label": "Bas Moyen \u00c2ge", "start_date": 1204, "txt_idx": "low_middle_age" } @@ -918,7 +946,7 @@ "parent": 27, "end_date": 1204, "order": 3800, - "label": "Moyen-\u00e2ge classique", + "label": "Moyen \u00c2ge classique", "start_date": 987, "txt_idx": "classic_middle_age" } @@ -932,7 +960,7 @@ "parent": 27, "end_date": 987, "order": 3900, - "label": "Haut moyen-\u00e2ge", + "label": "Haut Moyen \u00c2ge", "start_date": 476, "txt_idx": "high_middle_age" } @@ -960,7 +988,7 @@ "parent": 23, "end_date": 476, "order": 4700, - "label": "Bas-empire", + "label": "Bas Empire", "start_date": 192, "txt_idx": "low_empire" } @@ -974,7 +1002,7 @@ "parent": 23, "end_date": 192, "order": 4800, - "label": "Haut-empire", + "label": "Haut Empire", "start_date": -27, "txt_idx": "high-empire" } @@ -1942,22 +1970,22 @@ } }, { - "pk": 221, + "pk": 2, "model": "archaeological_operations.remaintype", "fields": { - "comment": null, + "comment": "", "available": true, - "txt_idx": "enclos", + "txt_idx": "enclosure", "label": "enclos" } }, { - "pk": 2, + "pk": 221, "model": "archaeological_operations.remaintype", "fields": { - "comment": "", + "comment": null, "available": true, - "txt_idx": "enclosure", + "txt_idx": "enclos", "label": "enclos" } }, @@ -2062,16 +2090,6 @@ } }, { - "pk": 4, - "model": "archaeological_operations.remaintype", - "fields": { - "comment": "", - "available": true, - "txt_idx": "pit", - "label": "fosse" - } - }, - { "pk": 6, "model": "archaeological_operations.remaintype", "fields": { @@ -2102,16 +2120,6 @@ } }, { - "pk": 8, - "model": "archaeological_operations.remaintype", - "fields": { - "comment": "", - "available": true, - "txt_idx": "burn", - "label": "foyer" - } - }, - { "pk": 234, "model": "archaeological_operations.remaintype", "fields": { @@ -2387,7 +2395,7 @@ "fields": { "comment": "", "available": true, - "txt_idx": "castral_thing", + "txt_idx": "motte-castrale", "label": "motte castrale" } }, @@ -2822,16 +2830,6 @@ } }, { - "pk": 7, - "model": "archaeological_operations.remaintype", - "fields": { - "comment": "", - "available": true, - "txt_idx": "post_hole", - "label": "trous de poteaux" - } - }, - { "pk": 304, "model": "archaeological_operations.remaintype", "fields": { @@ -2921,8 +2919,8 @@ "fields": { "comment": "", "available": true, - "tiny_label": null, - "label": "en relation vague avec", + "tiny_label": "", + "label": "En relation diffuse avec", "symmetrical": true, "inverse_relation": null, "order": 1, @@ -2947,7 +2945,7 @@ "pk": 3, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Ce rapport n'a pas encore \u00e9t\u00e9 re\u00e7u", + "comment": "Ce rapport n'a pas encore \u00e9t\u00e9 re\u00e7u.", "available": true, "txt_idx": "not_received", "order": 1, @@ -2958,7 +2956,7 @@ "pk": 1, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Rapport re\u00e7u non d\u00e9pouill\u00e9", + "comment": "Le rapport a \u00e9t\u00e9 re\u00e7u mais n'est pas encore d\u00e9pouill\u00e9.", "available": true, "txt_idx": "received", "order": 2, @@ -2966,54 +2964,43 @@ } }, { - "pk": 2, - "model": "archaeological_operations.reportstate", - "fields": { - "comment": "", - "available": true, - "txt_idx": "no_report", - "order": 2, - "label": "Rapport inexistant" - } - }, - { "pk": 7, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Plusieurs rapports re\u00e7us et non d\u00e9pouill\u00e9s", + "comment": "Plusieurs rapports ont \u00e9t\u00e9 re\u00e7us mais ne sont pas encore d\u00e9pouill\u00e9s.", "available": true, "txt_idx": "received__not_processed", "order": 3, - "label": "Re\u00e7us et NON d\u00e9pouill\u00e9s" + "label": "Re\u00e7us et non d\u00e9pouill\u00e9s" } }, { "pk": 10, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Les rapports ont \u00e9t\u00e9 re\u00e7us et d\u00e9pouill\u00e9s partiellement", + "comment": "Plusieurs rapports ont \u00e9t\u00e9 re\u00e7us mais ne sont que partiellement d\u00e9pouill\u00e9s.", "available": true, "txt_idx": "reports_received_partially_processed", "order": 4, - "label": "Re\u00e7us, un rapport d\u00e9pouill\u00e9, un autre non d\u00e9pouill\u00e9" + "label": "Re\u00e7us, partiellement d\u00e9pouill\u00e9s" } }, { - "pk": 4, + "pk": 9, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Il n'existe pas de rapport pour cette op\u00e9ration", + "comment": "Le rapport (unique) a \u00e9t\u00e9 re\u00e7u et d\u00e9pouill\u00e9.", "available": true, - "txt_idx": "no-report", + "txt_idx": "one_report_received_and_processed", "order": 4, - "label": "Rapport inexistant" + "label": "Re\u00e7u et d\u00e9pouill\u00e9" } }, { "pk": 8, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Tous les rapports ont \u00e9t\u00e9 re\u00e7us et n'ont pas \u00e9t\u00e9 encore d\u00e9pouill\u00e9s", + "comment": "Tous les rapports ont \u00e9t\u00e9 re\u00e7us mais n'ont pas \u00e9t\u00e9 encore d\u00e9pouill\u00e9s.", "available": true, "txt_idx": "received_and_processed", "order": 4, @@ -3021,14 +3008,14 @@ } }, { - "pk": 9, + "pk": 4, "model": "archaeological_operations.reportstate", "fields": { - "comment": "Rapport unique re\u00e7u et d\u00e9pouill\u00e9", + "comment": "Il n'existe pas de rapport pour cette op\u00e9ration.", "available": true, - "txt_idx": "one_report_received_and_processed", + "txt_idx": "no-report", "order": 4, - "label": "Re\u00e7u et d\u00e9pouill\u00e9" + "label": "Rapport inexistant" } } -] +]
\ No newline at end of file diff --git a/archaeological_warehouse/fixtures/initial_data-fr.json b/archaeological_warehouse/fixtures/initial_data-fr.json index 8a08bcb8c..a1b4f9254 100644 --- a/archaeological_warehouse/fixtures/initial_data-fr.json +++ b/archaeological_warehouse/fixtures/initial_data-fr.json @@ -1,5 +1,20 @@ [ { + "pk": 8, + "model": "archaeological_warehouse.containertype", + "fields": { + "comment": "Bac norme Europe plein 20002 - 200X150X118", + "available": true, + "reference": "20002", + "label": "Bac norme Europe plein 20002", + "volume": 3.0, + "width": 150, + "length": 200, + "height": 118, + "txt_idx": "20002" + } + }, + { "pk": 4, "model": "archaeological_warehouse.containertype", "fields": { @@ -7,7 +22,7 @@ "available": true, "reference": "a pr\u00e9ciser", "label": "Caisse Alibert standard", - "volume": 0, + "volume": 0.0, "width": 0, "length": null, "height": 0, @@ -20,9 +35,9 @@ "fields": { "comment": "", "available": true, - "reference": "Curver UNIBOX 20 lL", + "reference": "Curver UNIBOX 20 L", "label": "Curver UNIBOX 20 L", - "volume": 25, + "volume": 25.0, "width": 350, "length": null, "height": 165, @@ -37,7 +52,7 @@ "available": true, "reference": "Curver UNIBOX 29 L", "label": "Curver UNIBOX 29 L", - "volume": 37, + "volume": 37.0, "width": 355, "length": null, "height": 245, @@ -52,7 +67,7 @@ "available": true, "reference": "Curver UNIBOX 48 L", "label": "Curver UNIBOX 48 L", - "volume": 63, + "volume": 63.0, "width": 432, "length": null, "height": 280, @@ -60,10 +75,25 @@ } }, { + "pk": 9, + "model": "archaeological_warehouse.containertype", + "fields": { + "comment": "Bo\u00eetes herm\u00e9tiques Miflex 8L", + "available": true, + "reference": "Miflex 8L", + "label": "Miflex 8L", + "volume": null, + "width": 21, + "length": 29, + "height": 15, + "txt_idx": "Miflex_8L" + } + }, + { "pk": 6, "model": "archaeological_warehouse.warehousetype", "fields": { - "comment": "Pour le stockage de documents papier, rapports la plus part du temps.", + "comment": "Pour le stockage de documents papier, rapports la plupart du temps.", "available": true, "txt_idx": "library", "label": "Biblioth\u00e8que" @@ -73,7 +103,7 @@ "pk": 2, "model": "archaeological_warehouse.warehousetype", "fields": { - "comment": "Ce d\u00e9p\u00f4t est un centre de conservation et d'\u00e9tude. Il est d'ordinaire en convention avec l'\u00e9tat.", + "comment": "Ce d\u00e9p\u00f4t est un centre de conservation et d'\u00e9tude. Il est d'ordinaire en convention avec l'\u00c9tat.", "available": true, "txt_idx": "cce", "label": "CCE" @@ -93,7 +123,7 @@ "pk": 4, "model": "archaeological_warehouse.warehousetype", "fields": { - "comment": "Ce d\u00e9p\u00f4t poss\u00e8de une convention avec l'\u00e9tat pour conserver du mobilier qui est sous sa garde.", + "comment": "Ce d\u00e9p\u00f4t poss\u00e8de une convention avec l'\u00c9tat pour conserver du mobilier qui est sous sa garde.", "available": true, "txt_idx": "conventioned_warehouse", "label": "D\u00e9p\u00f4t conventionn\u00e9" @@ -103,10 +133,10 @@ "pk": 5, "model": "archaeological_warehouse.warehousetype", "fields": { - "comment": "Ce d\u00e9p\u00f4t est sous la responsabilit\u00e9 directe de l'Etat. Il peut en \u00eatre locataire ou propri\u00e9taire.", + "comment": "Ce d\u00e9p\u00f4t est sous la responsabilit\u00e9 directe de l'\u00c9tat. Il peut en \u00eatre locataire ou propri\u00e9taire.", "available": true, "txt_idx": "state_warehouse", - "label": "D\u00e9p\u00f4t de l'Etat" + "label": "D\u00e9p\u00f4t de l'\u00c9tat" } }, { @@ -128,5 +158,15 @@ "txt_idx": "restoration_laboratory", "label": "Laboratoire de restauration" } + }, + { + "pk": 8, + "model": "archaeological_warehouse.warehousetype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "museum", + "label": "Mus\u00e9e" + } } ]
\ No newline at end of file diff --git a/archaeological_warehouse/tests.py b/archaeological_warehouse/tests.py index 850af8218..691275876 100644 --- a/archaeological_warehouse/tests.py +++ b/archaeological_warehouse/tests.py @@ -180,7 +180,7 @@ class ContainerTest(FindInit, TestCase): "container_type": models.ContainerType.objects.all()[0].pk } form = forms.ContainerForm(data=data) - self.assertTrue(form.is_valid()) + self.assertTrue(form.is_valid(), msg="{}".format(form.errors)) self.container_number = models.Container.objects.count() self.create_user() form.save(self.user) diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index 219a6adeb..bcc0560b6 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -201,6 +201,7 @@ admin.site.register(models.GlobalVar, GlobalVarAdmin) class GeneralTypeAdmin(admin.ModelAdmin): list_display = ['label', 'txt_idx', 'available', 'comment'] + search_fields = ('label',) actions = ['import_generic', export_as_csv_action()] import_generic = gen_import_generic diff --git a/ishtar_common/fixtures/initial_data-fr.json b/ishtar_common/fixtures/initial_data-fr.json index 3c8aab20b..5f3205c74 100644 --- a/ishtar_common/fixtures/initial_data-fr.json +++ b/ishtar_common/fixtures/initial_data-fr.json @@ -1,22 +1,22 @@ [ { - "pk": 2, + "pk": 3, "model": "ishtar_common.authortype", "fields": { - "comment": "Il y a plusieurs \u00e0 une m\u00eame source. Au m\u00eame niveau de responsabilit\u00e9.", + "comment": "Cette personne est l'auteur principal de la source. Les autres auteurs sont des collaborateurs.", "available": true, - "txt_idx": "co_author", - "label": "Co-auteur " + "txt_idx": "main_author", + "label": "Auteur principal" } }, { - "pk": 3, + "pk": 2, "model": "ishtar_common.authortype", "fields": { - "comment": "Cette personne est l'auteur principal de la source. Les autres auteurs sont des collaborateurs.", + "comment": "Il y a plusieurs auteurs pour une m\u00eame source. Au m\u00eame niveau de responsabilit\u00e9.", "available": true, - "txt_idx": "main_author", - "label": "Auteur principal" + "txt_idx": "co_author", + "label": "Co-auteur " } }, { @@ -52,49 +52,6 @@ } }, { - "pk": 3, - "model": "ishtar_common.persontype", - "fields": { - "comment": "Responsables de dossiers d'arch\u00e9ologie", - "available": true, - "txt_idx": "sra_agent", - "groups": [ - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 13, - 14, - 15, - 16, - 17, - 18, - 21, - 22, - 23, - 24, - 25, - 26, - 27, - 28, - 29, - 30, - 31, - 32, - 33, - 34, - 35 - ], - "label": "Agent SRA (prescripteur)" - } - }, - { "pk": 6, "model": "ishtar_common.persontype", "fields": { @@ -117,6 +74,28 @@ } }, { + "pk": 9, + "model": "ishtar_common.persontype", + "fields": { + "comment": "Personnes pouvant intervenir sur les donn\u00e9es d'une op\u00e9ration sans en \u00eatre responsable", + "available": true, + "txt_idx": "collaborator", + "groups": [], + "label": "Collaborateur scientifique" + } + }, + { + "pk": 10, + "model": "ishtar_common.persontype", + "fields": { + "comment": "Personne demandant une action sur le mobilier (traitements)", + "available": true, + "txt_idx": "applicant", + "groups": [], + "label": "Demandeur" + } + }, + { "pk": 5, "model": "ishtar_common.persontype", "fields": { @@ -128,25 +107,53 @@ } }, { - "pk": 2, + "pk": 3, "model": "ishtar_common.persontype", "fields": { - "comment": "Article 13 D\u00e9cret 2004\r\n\r\nLe pr\u00e9fet de r\u00e9gion \u00e9dicte les prescriptions arch\u00e9ologiques, d\u00e9livre l'autorisation de fouille et d\u00e9signe le responsable scientifique de toute op\u00e9ration d'arch\u00e9ologie pr\u00e9ventive.\r\n\r\nLe responsable scientifique est l'interlocuteur du pr\u00e9fet de r\u00e9gion et le garant de la qualit\u00e9 scientifique de l'op\u00e9ration arch\u00e9ologique. A ce titre, il prend, dans le cadre de la mise en oeuvre du projet d'intervention de l'op\u00e9rateur, les d\u00e9cisions relatives \u00e0 la conduite scientifique de l'op\u00e9ration et \u00e0 l'\u00e9laboration du rapport dont il dirige la r\u00e9daction. Il peut \u00eatre diff\u00e9rent pour la r\u00e9alisation du diagnostic et pour la r\u00e9alisation de la fouille.", + "comment": "", "available": true, - "txt_idx": "head_scientist", + "txt_idx": "sra_agent", "groups": [ 30, + 31, 32, + 2, 1, 4, + 3, + 5, + 7, 6, + 8, + 9, + 10, + 13, + 14, 15, + 16, + 17, + 18, 21, + 22, + 23, + 24, 25, - 33, - 34, - 35 + 26, + 27, + 28, + 29 ], + "label": "Responsable de suivi scientifique" + } + }, + { + "pk": 2, + "model": "ishtar_common.persontype", + "fields": { + "comment": "Responsable d'op\u00e9ration arch\u00e9ologique", + "available": true, + "txt_idx": "head_scientist", + "groups": [], "label": "Responsable scientifique" } }, @@ -154,7 +161,7 @@ "pk": 4, "model": "ishtar_common.persontype", "fields": { - "comment": "Acc\u00e8s pour les secr\u00e9taires d'un SRA", + "comment": "", "available": true, "txt_idx": "secretarial_dept", "groups": [ @@ -178,14 +185,14 @@ 28, 29 ], - "label": "Secr\u00e9tariat SRA" + "label": "Secr\u00e9tariat" } - }, + }, { "pk": 5, "model": "ishtar_common.organizationtype", "fields": { - "comment": "Pour des entreprises, collectivit\u00e9s territoriales ou autres organisations", + "comment": "Pour des entreprises, collectivit\u00e9s territoriales ou autres organisations.", "available": true, "txt_idx": "general_contractor", "label": "Am\u00e9nageur" @@ -195,7 +202,7 @@ "pk": 7, "model": "ishtar_common.organizationtype", "fields": { - "comment": "Cette organisation et ses membres travaillent b\u00e9n\u00e9volement", + "comment": "Cette organisation et ses membres travaillent b\u00e9n\u00e9volement.", "available": true, "txt_idx": "volunteer", "label": "Association de b\u00e9n\u00e9voles" @@ -205,7 +212,7 @@ "pk": 6, "model": "ishtar_common.organizationtype", "fields": { - "comment": "Laboratoire de recherche du CNRS. Peut-\u00eatre une UMR et donc int\u00e9gr\u00e9 des chercheurs de l'universit\u00e9. n'inclus pas les \"laboratoires\" priv\u00e9s", + "comment": "Laboratoire de recherche public (CNRS). Peut \u00eatre une UMR et donc int\u00e9grer des chercheurs de l'universit\u00e9. ", "available": true, "txt_idx": "research_laboratory", "label": "Laboratoire de recherche" @@ -245,7 +252,7 @@ "pk": 2, "model": "ishtar_common.organizationtype", "fields": { - "comment": "D\u00e9cret 2004\r\n\r\n\"Op\u00e9rateurs\" les personnes qui r\u00e9alisent les op\u00e9rations arch\u00e9ologiques.", + "comment": "Selon le d\u00e9cret n\u00b0 2004-490 qui d\u00e9nomme \u00ab Op\u00e9rateurs \u00bb les personnes qui r\u00e9alisent les op\u00e9rations arch\u00e9ologiques.", "available": true, "txt_idx": "operator", "label": "Op\u00e9rateur d'arch\u00e9ologie pr\u00e9ventive" @@ -255,7 +262,7 @@ "pk": 8, "model": "ishtar_common.organizationtype", "fields": { - "comment": "les services qui d\u00e9livrent les autorisations requises pour les diff\u00e9rents projets (DDE, services\r\nurbanisme des collectivit\u00e9s, pr\u00e9fectures, Drire, etc.)", + "comment": "Les services qui d\u00e9livrent les autorisations requises pour les diff\u00e9rents projets (DDE, services\r\nurbanisme des collectivit\u00e9s, pr\u00e9fectures, Drire, etc.).", "available": true, "txt_idx": "planning_service", "label": "Service instructeur" @@ -275,70 +282,90 @@ "pk": 11, "model": "ishtar_common.organizationtype", "fields": { - "comment": "Par exmple une mairie portant un projet de fouille programm\u00e9e", + "comment": "Par exemple une mairie portant un projet de fouille programm\u00e9e.", "available": true, "txt_idx": "public_struct", "label": "Structure publique porteuse de projet programm\u00e9" } }, { - "pk": 11, + "pk": 18, "model": "ishtar_common.sourcetype", "fields": { - "comment": null, - "available": false, - "txt_idx": "RI", - "label": "Rapport interm\u00e9diaire" + "comment": "", + "available": true, + "txt_idx": "waterpaint", + "label": "Aquarelle" } }, { - "pk": 12, + "pk": 17, "model": "ishtar_common.sourcetype", "fields": { - "comment": null, - "available": false, - "txt_idx": "RF", - "label": "Rapport final" + "comment": "", + "available": true, + "txt_idx": "comics_book", + "label": "Bande dessin\u00e9e" } }, { - "pk": 3, + "pk": 14, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport li\u00e9 \u00e0 une autorisation de sondage.", + "comment": "", "available": true, - "txt_idx": "survey_report", - "label": "Rapport de sondage" + "txt_idx": "Mesh", + "label": "Mod\u00e8le 3D (mesh)" } }, { - "pk": 4, + "pk": 15, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport li\u00e9 \u00e0 un arr\u00eat\u00e9 de prescription de diagnostic arch\u00e9ologique.", + "comment": "", "available": true, - "txt_idx": "diagnostic_report", - "label": "Rapport de diagnostic" + "txt_idx": "point_cloud", + "label": "Mod\u00e8le 3D (nuage de points)" } }, { - "pk": 9, + "pk": 10, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport li\u00e9 \u00e0 une autorisation de prospection th\u00e9matique. Ce type de rapport passe d'ordinaire en CIRA.", + "comment": "", "available": true, - "txt_idx": "thematic_survey_report", - "label": "Rapport de prospection th\u00e9matique" + "txt_idx": "undefined", + "label": "Non pr\u00e9cis\u00e9" } }, { - "pk": 10, + "pk": 21, "model": "ishtar_common.sourcetype", "fields": { "comment": "", "available": true, - "txt_idx": "undefined", - "label": "Non pr\u00e9cis\u00e9" + "txt_idx": "photo_negative", + "label": "Photographie argentique (n\u00e9gatif)" + } + }, + { + "pk": 1, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "Tirage de photographie argentique.", + "available": true, + "txt_idx": "photo_print", + "label": "Photographie argentique (tirage)" + } + }, + { + "pk": 5, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "Source photographique num\u00e9rique.", + "available": true, + "txt_idx": "digital_photo", + "label": "Photographie num\u00e9rique" } }, { @@ -352,6 +379,46 @@ } }, { + "pk": 20, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "digital_x_ray", + "label": "Radiographie num\u00e9rique" + } + }, + { + "pk": 6, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "Rapport de laboratoire d'analyse.", + "available": true, + "txt_idx": "lab_report", + "label": "Rapport d'analyse" + } + }, + { + "pk": 4, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "Rapport li\u00e9 \u00e0 un arr\u00eat\u00e9 de prescription de diagnostic arch\u00e9ologique.", + "available": true, + "txt_idx": "diagnostic_report", + "label": "Rapport de diagnostic" + } + }, + { + "pk": 19, + "model": "ishtar_common.sourcetype", + "fields": { + "comment": "", + "available": true, + "txt_idx": "stange_report", + "label": "Rapport de nature ind\u00e9termin\u00e9e" + } + }, + { "pk": 8, "model": "ishtar_common.sourcetype", "fields": { @@ -362,33 +429,33 @@ } }, { - "pk": 7, + "pk": 9, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport li\u00e9 \u00e0 la restauration ou la stabilisation d'un lot de mobilier ou d'un objet isol\u00e9.", + "comment": "Rapport li\u00e9 \u00e0 une autorisation de prospection th\u00e9matique. Ce type de rapport passe d'ordinaire en CIRA.", "available": true, - "txt_idx": "restoration_report", - "label": "Rapport de restauration" + "txt_idx": "thematic_survey_report", + "label": "Rapport de prospection th\u00e9matique" } }, { - "pk": 6, + "pk": 7, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Rapport de laboratoire d'analyse.", + "comment": "Rapport li\u00e9 \u00e0 la restauration ou la stabilisation d'un lot de mobilier ou d'un objet isol\u00e9.", "available": true, - "txt_idx": "lab_report", - "label": "Rapport d'analyse" + "txt_idx": "restoration_report", + "label": "Rapport de restauration" } }, { - "pk": 5, + "pk": 3, "model": "ishtar_common.sourcetype", "fields": { - "comment": "Source photographique num\u00e9rique.", + "comment": "Rapport li\u00e9 \u00e0 une autorisation de sondage.", "available": true, - "txt_idx": "digital_photo", - "label": "Photographie num\u00e9rique" + "txt_idx": "survey_report", + "label": "Rapport de sondage" } }, { @@ -402,16 +469,6 @@ } }, { - "pk": 1, - "model": "ishtar_common.sourcetype", - "fields": { - "comment": "Photographie argentique sous une forme imprim\u00e9e.", - "available": true, - "txt_idx": "photo_print", - "label": "\u00c9preuve de photographie argentique" - } - }, - { "pk": 115, "model": "ishtar_common.operationtype", "fields": { @@ -532,6 +589,18 @@ } }, { + "pk": 133, + "model": "ishtar_common.operationtype", + "fields": { + "comment": "", + "available": true, + "label": "\u00c0 d\u00e9terminer", + "preventive": false, + "order": 1, + "txt_idx": "unknown" + } + }, + { "pk": 118, "model": "ishtar_common.operationtype", "fields": { @@ -556,6 +625,18 @@ } }, { + "pk": 132, + "model": "ishtar_common.operationtype", + "fields": { + "comment": null, + "available": true, + "label": "Diagnostic arch\u00e9ologique (programm\u00e9)", + "preventive": false, + "order": 1, + "txt_idx": "arch_diagnostic_research" + } + }, + { "pk": 131, "model": "ishtar_common.operationtype", "fields": { @@ -736,27 +817,27 @@ } }, { - "pk": 5, + "pk": 134, "model": "ishtar_common.operationtype", "fields": { - "comment": "Une campagne de prospection sur un th\u00e8me particulier", + "comment": "", "available": true, - "label": "Prospection th\u00e9matique", + "label": "Prospection sondage", "preventive": false, "order": 1, - "txt_idx": "thematic_survey" + "txt_idx": "survey_dig" } }, { - "pk": 116, + "pk": 5, "model": "ishtar_common.operationtype", "fields": { - "comment": "", - "available": false, + "comment": "Une campagne de prospection sur un th\u00e8me particulier", + "available": true, "label": "Prospection th\u00e9matique", "preventive": false, "order": 1, - "txt_idx": "thematic_prospection" + "txt_idx": "thematic_survey" } }, { @@ -794,451 +875,145 @@ "order": 1, "txt_idx": "sampling" } - }, - { - "pk": 115, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Autre \u00e9tude", - "preventive": true, - "order": 1, - "txt_idx": "other_study" - } - }, - { - "pk": 1, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "Une op\u00e9ration arch\u00e9ologique visant \u00e0 qualifier et quantifier la pr\u00e9sence de vestiges sur une surface donn\u00e9e.", - "available": true, - "label": "Diagnostic arch\u00e9ologique", - "preventive": true, - "order": 1, - "txt_idx": "arch_diagnostic" - } }, { - "pk": 7, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9tude de b\u00e2ti (pr\u00e9ventif)", - "preventive": true, - "order": 1, - "txt_idx": "building_study" - } - }, - { - "pk": 10, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9tude documentaire (pr\u00e9ventif)", - "preventive": true, - "order": 1, - "txt_idx": "documents_study" - } - }, - { - "pk": 12, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9valuation", - "preventive": true, - "order": 1, - "txt_idx": "evaluation" - } - }, - { - "pk": 113, - "model": "ishtar_common.operationtype", - "fields": { - "comment": null, - "available": true, - "label": "Fouille ancienne", - "preventive": true, - "order": 1, - "txt_idx": "ancient_excavation" - } - }, - { - "pk": 2, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "A pr\u00e9ciser", - "available": true, - "label": "Fouille arch\u00e9ologique pr\u00e9ventive", - "preventive": true, - "order": 1, - "txt_idx": "prev_excavation" - } - }, - { - "pk": 123, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection inventaire (pr\u00e9ventif)", - "preventive": true, - "order": 1, - "txt_idx": "inventory_survey" - } - }, - { - "pk": 124, - "model": "ishtar_common.operationtype", - "fields": { - "comment": null, - "available": false, - "label": "Prospection (pr\u00e9ventif)", - "preventive": true, - "order": 1, - "txt_idx": "survey" - } - }, - { - "pk": 22, - "model": "ishtar_common.operationtype", + "pk": 5, + "model": "ishtar_common.titletype", "fields": { "comment": null, "available": true, - "label": "Sauvetage urgent", - "preventive": true, - "order": 1, - "txt_idx": "emergency_excavation" - } - }, - { - "pk": 118, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Aide \u00e0 la pr\u00e9paration de publication", - "preventive": false, - "order": 1, - "txt_idx": "assistance_preparation_help" - } - }, - { - "pk": 130, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Aide \u00e0 l'\u00e9dition", - "preventive": false, - "order": 1, - "txt_idx": "AE" + "txt_idx": "dr", + "label": "Dr." } }, { - "pk": 132, - "model": "ishtar_common.operationtype", + "pk": 1, + "model": "ishtar_common.titletype", "fields": { "comment": null, "available": true, - "label": "Diagnostic arch\u00e9ologique (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "arch_diagnostic_research" - } - }, - { - "pk": 131, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Diffusion (pour les colloques, expo, s\u00e9minaires...)", - "preventive": false, - "order": 1, - "txt_idx": "communication" - } - }, - { - "pk": 8, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9tude de b\u00e2ti (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "building_study_research" - } - }, - { - "pk": 11, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "\u00c9tude documentaire (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "documents_study_research" + "txt_idx": "mr", + "label": "M." } }, { "pk": 3, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Fouille arch\u00e9ologique programm\u00e9e", - "preventive": false, - "order": 1, - "txt_idx": "prog_excavation" - } - }, - { - "pk": 13, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Fouille arch\u00e9ologique programm\u00e9e pluriannuelle", - "preventive": false, - "order": 1, - "txt_idx": "prog_excavation_multiyear" - } - }, - { - "pk": 122, - "model": "ishtar_common.operationtype", + "model": "ishtar_common.titletype", "fields": { "comment": "", "available": true, - "label": "Programme d'analyses", - "preventive": false, - "order": 1, - "txt_idx": "analysis_program" + "txt_idx": "mr-and-mrs", + "label": "M. et Mme" } }, { - "pk": 16, - "model": "ishtar_common.operationtype", + "pk": 2, + "model": "ishtar_common.titletype", "fields": { "comment": "", "available": true, - "label": "Projet Collectif de Recherche", - "preventive": false, - "order": 1, - "txt_idx": "collective_research_project" + "txt_idx": "miss", + "label": "Mlle" } }, { - "pk": 14, - "model": "ishtar_common.operationtype", + "pk": 4, + "model": "ishtar_common.titletype", "fields": { "comment": "", "available": true, - "label": "Prospection a\u00e9rienne", - "preventive": false, - "order": 1, - "txt_idx": "aerial_survey_research" - } - }, - { - "pk": 126, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection a\u00e9rienne (pr\u00e9ventif)", - "preventive": false, - "order": 1, - "txt_idx": "aerial_survey" + "txt_idx": "mrs", + "label": "Mme" } }, { - "pk": 117, - "model": "ishtar_common.operationtype", + "pk": 1, + "model": "ishtar_common.supporttype", "fields": { "comment": "", "available": true, - "label": "Prospection avec mat\u00e9riel sp\u00e9cialis\u00e9", - "preventive": false, - "order": 1, - "txt_idx": "specialized_eqp_prospection" + "txt_idx": "tracing-paper", + "label": "Papier calque" } }, { - "pk": 20, - "model": "ishtar_common.operationtype", + "pk": 2, + "model": "ishtar_common.supporttype", "fields": { "comment": "", "available": true, - "label": "Prospection avec relev\u00e9 d'art rupestre", - "preventive": false, - "order": 1, - "txt_idx": "rock_art_survey" + "txt_idx": "graph-paper", + "label": "Papier millim\u00e9tr\u00e9" } }, { - "pk": 120, - "model": "ishtar_common.operationtype", + "pk": 3, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "841 \u00d7 1189 mm", "available": true, - "label": "Prospection d\u00e9tecteur de m\u00e9taux", - "preventive": false, - "order": 1, - "txt_idx": "metal_detector_prospection" - } - }, - { - "pk": 114, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection diachronique", - "preventive": false, - "order": 1, - "txt_idx": "diachronic_prospection" + "txt_idx": "a0", + "label": "A0" } }, { - "pk": 17, - "model": "ishtar_common.operationtype", + "pk": 4, + "model": "ishtar_common.format", "fields": { - "comment": "", + "comment": "594 \u00d7 841 mm", "available": true, - "label": "Prospection inventaire", - "preventive": false, - "order": 1, - "txt_idx": "inventory_survey_research" - } - }, - { - "pk": 18, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "survey_research" + "txt_idx": "a1", + "label": "A1" } }, { "pk": 5, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "Une campagne de prospection sur un th\u00e8me particulier", - "available": true, - "label": "Prospection th\u00e9matique", - "preventive": false, - "order": 1, - "txt_idx": "thematic_survey" - } - }, - { - "pk": 116, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": false, - "label": "Prospection th\u00e9matique", - "preventive": false, - "order": 1, - "txt_idx": "thematic_prospection" - } - }, - { - "pk": 121, - "model": "ishtar_common.operationtype", + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "420 \u00d7 594 mm", "available": true, - "label": "Relev\u00e9 d'art rupestre", - "preventive": false, - "order": 1, - "txt_idx": "cave_art_record" + "txt_idx": "a2", + "label": "A2" } }, { - "pk": 21, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "Pas assez gros pour \u00eatre une fouille, mais porte n\u00e9anmoins atteinte au sous-sol.", - "available": false, - "label": "Sondage", - "preventive": false, - "order": 1, - "txt_idx": "sampling_research" - } - }, - { - "pk": 127, - "model": "ishtar_common.operationtype", - "fields": { - "comment": "", - "available": true, - "label": "Sondage (programm\u00e9)", - "preventive": false, - "order": 1, - "txt_idx": "sampling" - } - }, - { - "pk": 25, - "model": "ishtar_common.titletype", - "fields": { - "comment": null, - "available": true, - "txt_idx": "dr", - "label": "Dr." - } - }, - { - "pk": 21, - "model": "ishtar_common.titletype", + "pk": 2, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "297 \u00d7 420 mm", "available": true, - "txt_idx": "mr", - "label": "M." + "txt_idx": "a3", + "label": "A3" } }, { - "pk": 22, - "model": "ishtar_common.titletype", + "pk": 1, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "210 \u00d7 297 mm\r\n", "available": true, - "txt_idx": "ms", - "label": "Mlle" + "txt_idx": "a4", + "label": "A4" } }, { - "pk": 24, - "model": "ishtar_common.titletype", + "pk": 6, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "148 \u00d7 210 mm\r\n", "available": true, - "txt_idx": "md", - "label": "Mme" + "txt_idx": "a5", + "label": "A5" } }, { - "pk": 23, - "model": "ishtar_common.titletype", + "pk": 7, + "model": "ishtar_common.format", "fields": { - "comment": null, + "comment": "105 \u00d7 148 mm", "available": true, - "txt_idx": "mr and miss", - "label": "Mr and Mrs" + "txt_idx": "a6", + "label": "A6" } } -] +]
\ No newline at end of file diff --git a/ishtar_common/fixtures/initial_importtypes-fr.json b/ishtar_common/fixtures/initial_importtypes-fr.json index bb5977227..1b155ddf6 100644 --- a/ishtar_common/fixtures/initial_importtypes-fr.json +++ b/ishtar_common/fixtures/initial_importtypes-fr.json @@ -664,7 +664,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 4, - "description": "Label / Identifiant externe ", + "description": "Identifiant externe ", "regexp_pre_filter": null, "required": true, "label": "Identifiant externe", @@ -799,7 +799,7 @@ "description": "Identifiant parcelle", "regexp_pre_filter": null, "required": true, - "label": null, + "label": "Parcelle", "importer_type": 5 } }, @@ -847,7 +847,7 @@ "description": "Ref. du contenant / label temporaire utilis\u00e9 pour le mobilier = label libre = Label pour l'instant", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Libell\u00e9 contenant", "importer_type": 5 } }, @@ -859,7 +859,7 @@ "description": "Nombre d'\u00e9l\u00e9ments", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Nombre d'\u00e9l\u00e9ments", "importer_type": 5 } }, @@ -871,7 +871,7 @@ "description": "Poids", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Poids", "importer_type": 5 } }, @@ -883,7 +883,7 @@ "description": "Unit\u00e9 de poids", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Unit\u00e9 de poids", "importer_type": 5 } }, @@ -895,7 +895,7 @@ "description": "Date de d\u00e9couverte", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Date de d\u00e9couverte", "importer_type": 5 } }, @@ -907,7 +907,7 @@ "description": "\u00c9tat de conservation", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "\u00c9tat de conservation", "importer_type": 5 } }, @@ -919,7 +919,7 @@ "description": "Mesure de conservation", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Mesure de conservation", "importer_type": 5 } }, @@ -931,7 +931,7 @@ "description": "Commentaire", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Commentaire", "importer_type": 5 } }, @@ -955,7 +955,7 @@ "description": "Localisation topographique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Localisation topographique", "importer_type": 5 } }, @@ -967,7 +967,7 @@ "description": "Int\u00e9r\u00eat sp\u00e9cifique", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Int\u00e9r\u00eat sp\u00e9cifique", "importer_type": 5 } }, @@ -979,7 +979,7 @@ "description": "Description", "regexp_pre_filter": null, "required": false, - "label": null, + "label": "Description", "importer_type": 5 } }, @@ -991,7 +991,7 @@ "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", "regexp_pre_filter": null, "required": true, - "label": "CODE OPERATION", + "label": "Code op\u00e9ration", "importer_type": 17 } }, @@ -1192,7 +1192,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 18, - "description": "Pr\u00e9nom du responsable du suivi scientifique (ex\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci).", + "description": "Pr\u00e9nom du responsable du suivi scientifique. Exemple\u00a0: resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci.", "regexp_pre_filter": null, "required": false, "label": "Pr\u00e9nom du responsable du suivi scientifique", @@ -1204,7 +1204,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 19, - "description": "Nom du responsable du suivi scientifique (ex : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci).", + "description": "Nom du responsable du suivi scientifique. Exemple : resp. SRA ou pilote de l'op\u00e9ration, mais non responsable de celle-ci.", "regexp_pre_filter": null, "required": false, "label": "Nom du responsable du suivi scientifique", @@ -1276,7 +1276,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 25, - "description": "Date d'avis (ex\u00a0: avis de CIRA ou autre selon votre usage).", + "description": "Date d'avis. Exemple\u00a0: avis de CIRA ou autre selon votre usage.", "regexp_pre_filter": null, "required": false, "label": "Date d'avis", @@ -1447,7 +1447,7 @@ "description": "Code PATRIARCHE ou code UNIQUE de l'op\u00e9ration associ\u00e9e.", "regexp_pre_filter": null, "required": true, - "label": "CODE OPERATION", + "label": "Code op\u00e9ration", "importer_type": 18 } }, @@ -1492,10 +1492,10 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 5, - "description": "Label / Identifiant (externe) de l'UE, ex: \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\" etc.\r\nDoit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", + "description": "Identifiant (externe) de l'UE. Exemple : \"US 145\", \"Tranch\u00e9e 145\", \"145\", \"St 17\", etc. Doit \u00eatre unique pour une parcelle donn\u00e9e. Maximum 200 caract\u00e8res.", "regexp_pre_filter": null, "required": true, - "label": "Label UE", + "label": "Identifiant UE", "importer_type": 18 } }, @@ -1747,7 +1747,7 @@ "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", "regexp_pre_filter": null, "required": true, - "label": "CODE OPERATION", + "label": "Code op\u00e9ration", "importer_type": 19 } }, @@ -1843,7 +1843,7 @@ "description": "Code PATRIARCHE ou code num\u00e9rique (entier) UNIQUE pour une op\u00e9ration.", "regexp_pre_filter": null, "required": true, - "label": "CODE OPERATION", + "label": "Code op\u00e9ration", "importer_type": 20 } }, @@ -1963,7 +1963,7 @@ "description": "Type(s) de mat\u00e9riau(x) s\u00e9par\u00e9s par des \"&\". Exemple : \"m\u00e9tal & os\", \"LT\", \"Min\u00e9ral\", \"Granito\u00efde & Basalte & Ardoise\".", "regexp_pre_filter": null, "required": false, - "label": "Materiaux(x)", + "label": "Mat\u00e9riau(x)", "importer_type": 20 } }, @@ -2224,7 +2224,7 @@ "model": "ishtar_common.importercolumn", "fields": { "col_number": 33, - "description": "Code permettant de qualifier le mode de projection des donnes (SRS /EPSG). Exemple : \"2154\" pour le Lambert 93.", + "description": "Code permettant de qualifier le mode de projection des donn\u00e9es (SRS /EPSG). Exemple : \"2154\" pour le Lambert 93.", "regexp_pre_filter": null, "required": false, "label": "Syst\u00e8me de r\u00e9f\u00e9rence spatiale", diff --git a/ishtar_common/locale/django.pot b/ishtar_common/locale/django.pot index 458368a35..797aad587 100644 --- a/ishtar_common/locale/django.pot +++ b/ishtar_common/locale/django.pot @@ -6,7 +6,6 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata # Étienne Loks <etienne.loks@iggdrasil.net>, 2016. #zanata # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata -# Étienne Loks <etienne.loks@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" @@ -22,6 +21,10 @@ msgstr "" msgid "Related item" msgstr "" +#: admin.py:79 +msgid "Export selected as CSV file" +msgstr "" + #: data_importer.py:182 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." @@ -162,7 +165,7 @@ msgid "Template" msgstr "" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1539 models.py:2940 +#: forms_common.py:406 models.py:1539 models.py:2943 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -179,7 +182,7 @@ msgid "" msgstr "" #: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712 -#: models.py:2567 models.py:2749 models.py:2810 +#: models.py:2567 models.py:2749 models.py:2811 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "" @@ -198,7 +201,7 @@ msgstr "" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 #: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472 -#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926 +#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2929 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" @@ -247,7 +250,7 @@ msgid "Mobile phone" msgstr "" #: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144 -#: models.py:2446 models.py:2861 templates/sheet_ope.html:85 +#: models.py:2446 models.py:2864 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -290,7 +293,7 @@ msgid "Identity" msgstr "" #: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109 -#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104 +#: models.py:2545 models.py:2547 models.py:2861 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "" @@ -391,7 +394,7 @@ msgstr "" msgid "Send the new password by email?" msgstr "" -#: forms_common.py:628 forms_common.py:641 models.py:2941 +#: forms_common.py:628 forms_common.py:641 models.py:2944 msgid "Towns" msgstr "" @@ -407,7 +410,7 @@ msgstr "" msgid "Documentation informations" msgstr "" -#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835 +#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2836 msgid "Source type" msgstr "" @@ -419,37 +422,37 @@ msgstr "" msgid "Internal reference" msgstr "" -#: forms_common.py:783 models.py:2872 +#: forms_common.py:783 models.py:2875 msgid "Numerical ressource (web address)" msgstr "" -#: forms_common.py:784 models.py:2874 +#: forms_common.py:784 models.py:2877 msgid "Receipt date" msgstr "" -#: forms_common.py:786 models.py:2273 models.py:2876 +#: forms_common.py:786 models.py:2273 models.py:2879 msgid "Creation date" msgstr "" -#: forms_common.py:789 models.py:2879 +#: forms_common.py:789 models.py:2882 msgid "Receipt date in documentation" msgstr "" #: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687 -#: models.py:2004 models.py:2559 models.py:2886 +#: models.py:2004 models.py:2559 models.py:2889 msgid "Comment" msgstr "" #: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762 -#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128 +#: models.py:1936 models.py:1978 models.py:2888 templates/sheet_ope.html:128 msgid "Description" msgstr "" -#: forms_common.py:796 models.py:2887 +#: forms_common.py:796 models.py:2890 msgid "Additional information" msgstr "" -#: forms_common.py:798 forms_common.py:830 models.py:2889 +#: forms_common.py:798 forms_common.py:830 models.py:2892 msgid "Has a duplicate" msgstr "" @@ -464,7 +467,7 @@ msgid "" "p>" msgstr "" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2816 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "" @@ -477,7 +480,7 @@ msgstr "" msgid "Would you like to delete this documentation?" msgstr "" -#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812 +#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2813 msgid "Author type" msgstr "" @@ -489,7 +492,7 @@ msgstr "" msgid "There are identical authors." msgstr "" -#: forms_common.py:893 models.py:2816 models.py:2868 +#: forms_common.py:893 models.py:2817 models.py:2871 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -507,7 +510,7 @@ msgstr "" msgid "Deletion" msgstr "" -#: ishtar_menu.py:39 models.py:1268 views.py:1548 +#: ishtar_menu.py:39 models.py:1268 views.py:1549 msgid "Global variables" msgstr "" @@ -539,15 +542,15 @@ msgstr "" msgid "Imports" msgstr "" -#: ishtar_menu.py:112 views.py:1556 +#: ishtar_menu.py:112 views.py:1557 msgid "New import" msgstr "" -#: ishtar_menu.py:116 views.py:1570 +#: ishtar_menu.py:116 views.py:1571 msgid "Current imports" msgstr "" -#: ishtar_menu.py:120 views.py:1606 +#: ishtar_menu.py:120 views.py:1607 msgid "Old imports" msgstr "" @@ -591,7 +594,7 @@ msgstr "" msgid "Creator" msgstr "" -#: models.py:956 models.py:2952 models.py:3008 +#: models.py:956 models.py:2955 models.py:3011 msgid "Order" msgstr "" @@ -886,11 +889,11 @@ msgstr "" msgid "Operation source" msgstr "" -#: models.py:1722 views.py:1364 views.py:1414 +#: models.py:1722 views.py:1365 views.py:1415 msgid "Archaeological files" msgstr "" -#: models.py:1724 views.py:1367 views.py:1422 +#: models.py:1724 views.py:1368 views.py:1423 msgid "Context records" msgstr "" @@ -1022,11 +1025,11 @@ msgstr "" msgid "Importer - Targets keys" msgstr "" -#: models.py:2112 models.py:2851 models.py:2864 +#: models.py:2112 models.py:2867 msgid "Format" msgstr "" -#: models.py:2113 models.py:2956 +#: models.py:2113 models.py:2959 msgid "Operation type" msgstr "" @@ -1090,11 +1093,11 @@ msgstr "" msgid "Context record relation type" msgstr "" -#: models.py:2132 models.py:3014 +#: models.py:2132 models.py:3017 msgid "Spatial reference system" msgstr "" -#: models.py:2133 models.py:2843 +#: models.py:2133 models.py:2845 msgid "Support type" msgstr "" @@ -1380,75 +1383,79 @@ msgstr "" msgid "Author types" msgstr "" -#: models.py:2836 +#: models.py:2837 msgid "Source types" msgstr "" -#: models.py:2844 +#: models.py:2846 msgid "Support types" msgstr "" -#: models.py:2852 -msgid "Formats" +#: models.py:2853 +msgid "Format type" msgstr "" -#: models.py:2859 -msgid "External ID" +#: models.py:2854 +msgid "Format types" msgstr "" #: models.py:2862 +msgid "External ID" +msgstr "" + +#: models.py:2865 msgid "Support" msgstr "" -#: models.py:2866 +#: models.py:2869 msgid "Scale" msgstr "" -#: models.py:2880 +#: models.py:2883 msgid "Item number" msgstr "" -#: models.py:2881 +#: models.py:2884 msgid "Ref." msgstr "" -#: models.py:2884 +#: models.py:2887 msgid "Internal ref." msgstr "" -#: models.py:2927 +#: models.py:2930 msgid "Surface (m2)" msgstr "" -#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2931 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "" -#: models.py:2953 +#: models.py:2956 msgid "Is preventive" msgstr "" -#: models.py:2957 +#: models.py:2960 msgid "Operation types" msgstr "" -#: models.py:2986 +#: models.py:2989 msgid "Preventive" msgstr "" -#: models.py:2987 +#: models.py:2990 msgid "Research" msgstr "" -#: models.py:3010 +#: models.py:3013 msgid "Authority name" msgstr "" -#: models.py:3011 +#: models.py:3014 msgid "Authority SRID" msgstr "" -#: models.py:3015 +#: models.py:3018 msgid "Spatial reference systems" msgstr "" @@ -1512,48 +1519,48 @@ msgstr "" msgid "Treatment" msgstr "" -#: views.py:1303 views.py:1346 +#: views.py:1304 views.py:1347 msgid "Operation not permitted." msgstr "" -#: views.py:1305 +#: views.py:1306 #, python-format msgid "New %s" msgstr "" -#: views.py:1365 views.py:1418 +#: views.py:1366 views.py:1419 msgid "Operations" msgstr "" -#: views.py:1369 views.py:1425 +#: views.py:1370 views.py:1426 msgid "Finds" msgstr "" -#: views.py:1618 templates/ishtar/import_list.html:43 +#: views.py:1619 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "" -#: views.py:1633 +#: views.py:1634 msgid "Delete import" msgstr "" -#: views.py:1672 +#: views.py:1673 msgid "Merge persons" msgstr "" -#: views.py:1696 +#: views.py:1697 msgid "Select the main person" msgstr "" -#: views.py:1705 +#: views.py:1706 msgid "Merge organization" msgstr "" -#: views.py:1715 +#: views.py:1716 msgid "Select the main organization" msgstr "" -#: views.py:1755 views.py:1771 +#: views.py:1756 views.py:1772 msgid "Corporation manager" msgstr "" diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 6e655776d..979b29b33 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2844,8 +2844,9 @@ post_delete.connect(post_save_cache, sender=SupportType) class Format(GeneralType): class Meta: - verbose_name = _(u"Format") - verbose_name_plural = _(u"Formats") + verbose_name = _(u"Format type") + verbose_name_plural = _(u"Format types") + ordering = ['label'] post_save.connect(post_save_cache, sender=Format) post_delete.connect(post_save_cache, sender=Format) diff --git a/translations/fr/archaeological_context_records.po b/translations/fr/archaeological_context_records.po index 633a55cec..9de748717 100644 --- a/translations/fr/archaeological_context_records.po +++ b/translations/fr/archaeological_context_records.po @@ -6,13 +6,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-02-02 10:17-0500\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" +"PO-Revision-Date: 2017-02-04 08:33-0500\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -264,11 +266,13 @@ msgid "Dating types" msgstr "Types de datation" #: models.py:47 -msgid "Dating quality" +#, fuzzy +msgid "Dating quality type" msgstr "Qualité de datation" #: models.py:48 -msgid "Dating qualities" +#, fuzzy +msgid "Dating quality types" msgstr "Qualités de datation" #: models.py:62 @@ -364,24 +368,24 @@ msgid "" "\"Terminus Ante Quem\" the context record can't have been created after this " "date" msgstr "" -"« Terminus Ante Quem » l'Unité d'Enregistrement ne peut avoir été créée " -"après cette date" +"« Terminus Ante Quem ». L'Unité d'Enregistrement ne peut avoir été créée " +"après cette date." #: models.py:209 msgid "Estimation of a \"Terminus Ante Quem\"" -msgstr "Estimation d'un « Terminus Ante Quem »" +msgstr "Estimation d'un « Terminus Ante Quem »." #: models.py:212 msgid "" "\"Terminus Post Quem\" the context record can't have been created before " "this date" msgstr "" -"« Terminus Post Quem » l'Unité d'Enregistrement ne peut avoir été créée " -"avant cette date" +"« Terminus Post Quem ». L'Unité d'Enregistrement ne peut avoir été créée " +"avant cette date." #: models.py:216 msgid "Estimation of a \"Terminus Post Quem\"" -msgstr "Estimation d'un « Terminus Post Quem »" +msgstr "Estimation d'un « Terminus Post Quem »." #: models.py:224 msgid "Point" diff --git a/translations/fr/archaeological_files.po b/translations/fr/archaeological_files.po index 61dcf1376..8d6fffb7a 100644 --- a/translations/fr/archaeological_files.po +++ b/translations/fr/archaeological_files.po @@ -8,13 +8,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-02 10:01-0500\n" "Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_files_pdl.po b/translations/fr/archaeological_files_pdl.po index 949555adc..2d7bc969e 100644 --- a/translations/fr/archaeological_files_pdl.po +++ b/translations/fr/archaeological_files_pdl.po @@ -5,13 +5,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2016. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2016-11-14 05:33-0500\n" "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1)\n" "X-Generator: Zanata 3.9.6\n" diff --git a/translations/fr/archaeological_finds.po b/translations/fr/archaeological_finds.po index 88e73087a..efdc8db6e 100644 --- a/translations/fr/archaeological_finds.po +++ b/translations/fr/archaeological_finds.po @@ -6,13 +6,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-02 09:58-0500\n" "Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -188,15 +190,13 @@ msgstr "" "ratio est conservé).</p>" #: forms.py:278 -msgid "" -"You should at least provide X, Y and the spatial reference system used." +msgid "You should at least provide X, Y and the spatial reference system used." msgstr "" "Vous devez au minimum fournir X, Y et le système de référence spatiale " "utilisé." #: forms.py:287 -msgid "" -"Coordinates are not relevant for the spatial reference system used: {}." +msgid "Coordinates are not relevant for the spatial reference system used: {}." msgstr "" "Les coordonnées ne sont pas pertinentes pour le système de référence " "spatiale utilisé : {}." diff --git a/translations/fr/archaeological_operations.po b/translations/fr/archaeological_operations.po index df903a8ec..9ed814ced 100644 --- a/translations/fr/archaeological_operations.po +++ b/translations/fr/archaeological_operations.po @@ -8,13 +8,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" "PO-Revision-Date: 2017-02-02 10:02-0500\n" "Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -390,8 +392,7 @@ msgstr "" #: forms.py:891 msgid "The excavation end date cannot be before the start date." -msgstr "" -"La date de fin de chantier ne peut être antérieure à la date de début." +msgstr "La date de fin de chantier ne peut être antérieure à la date de début." #: forms.py:919 #, python-format diff --git a/translations/fr/archaeological_warehouse.po b/translations/fr/archaeological_warehouse.po index 7071aec57..1f0c213ab 100644 --- a/translations/fr/archaeological_warehouse.po +++ b/translations/fr/archaeological_warehouse.po @@ -6,13 +6,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-02-02 10:17-0500\n" -"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" +"PO-Revision-Date: 2017-02-04 08:26-0500\n" +"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -176,7 +178,7 @@ msgstr "Contenants" #: models.py:37 msgid "Warehouse types" -msgstr "Types de dépôts" +msgstr "Types de dépôt" #: models.py:56 models.py:186 msgid "External ID" diff --git a/translations/fr/ishtar_common.po b/translations/fr/ishtar_common.po index a5cd454fd..0c705f691 100644 --- a/translations/fr/ishtar_common.po +++ b/translations/fr/ishtar_common.po @@ -8,13 +8,15 @@ # Valérie-Emma Leroux <emma@iggdrasil.net>, 2017. #zanata msgid "" msgstr "" -"MIME-Version: 1.0\n" -"Content-Transfer-Encoding: 8bit\n" -"Content-Type: text/plain; charset=UTF-8\n" -"PO-Revision-Date: 2017-02-03 04:25-0500\n" -"Last-Translator: Étienne Loks <etienne.loks@iggdrasil.net>\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2017-02-04 21:29+0100\n" +"PO-Revision-Date: 2017-02-04 04:55-0500\n" +"Last-Translator: Valérie-Emma Leroux <emma@iggdrasil.net>\n" "Language-Team: \n" "Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" "X-Generator: Zanata 3.9.6\n" @@ -30,6 +32,11 @@ msgstr "courriel" msgid "Related item" msgstr "Élément associé" +#: admin.py:79 +#, fuzzy +msgid "Export selected as CSV file" +msgstr "Export en CSV - complet" + #: data_importer.py:182 #, python-format msgid "\"%(value)s\" is too long. The max length is %(length)d characters." @@ -175,7 +182,7 @@ msgid "Template" msgstr "Patron" #: forms_common.py:41 forms_common.py:59 forms_common.py:182 -#: forms_common.py:406 models.py:1539 models.py:2940 +#: forms_common.py:406 models.py:1539 models.py:2943 #: templates/blocks/JQueryAdvancedTown.html:19 #: templates/ishtar/sheet_organization.html:13 msgid "Town" @@ -199,7 +206,7 @@ msgstr "" "commune Saint-Denis dans le département français de Seine-Saint-Denis.</p>" #: forms_common.py:68 forms_common.py:855 ishtar_menu.py:47 models.py:1712 -#: models.py:2567 models.py:2749 models.py:2810 +#: models.py:2567 models.py:2749 models.py:2811 #: templates/ishtar/sheet_person.html:4 msgid "Person" msgstr "Personne" @@ -220,7 +227,7 @@ msgstr "Organisation" #: forms_common.py:173 forms_common.py:210 forms_common.py:322 #: forms_common.py:376 forms_common.py:446 models.py:1094 models.py:1472 -#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2926 +#: models.py:1758 models.py:1977 models.py:2444 models.py:2553 models.py:2929 #: templates/ishtar/sheet_organization.html:8 #: templates/ishtar/sheet_organization.html:21 msgid "Name" @@ -269,7 +276,7 @@ msgid "Mobile phone" msgstr "Téléphone portable" #: forms_common.py:211 forms_common.py:325 forms_common.py:449 models.py:2144 -#: models.py:2446 models.py:2861 templates/sheet_ope.html:85 +#: models.py:2446 models.py:2864 templates/sheet_ope.html:85 #: templates/sheet_ope.html.py:105 templates/sheet_ope.html:126 #: templates/ishtar/import_list.html:13 #: templates/ishtar/sheet_organization.html:23 @@ -312,7 +319,7 @@ msgid "Identity" msgstr "Identité" #: forms_common.py:371 forms_common.py:773 forms_common.py:822 models.py:2109 -#: models.py:2545 models.py:2547 models.py:2858 templates/sheet_ope.html:104 +#: models.py:2545 models.py:2547 models.py:2861 templates/sheet_ope.html:104 #: templates/ishtar/blocks/window_tables/documents.html:7 msgid "Title" msgstr "Titre" @@ -413,7 +420,7 @@ msgstr "Ce nom d'utilisateur existe déjà." msgid "Send the new password by email?" msgstr "Envoyer le nouveau mot de passe par courriel ?" -#: forms_common.py:628 forms_common.py:641 models.py:2941 +#: forms_common.py:628 forms_common.py:641 models.py:2944 msgid "Towns" msgstr "Communes" @@ -429,7 +436,7 @@ msgstr "Seul un choix peut être coché." msgid "Documentation informations" msgstr "Information sur le document" -#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2835 +#: forms_common.py:775 forms_common.py:823 models.py:2110 models.py:2836 msgid "Source type" msgstr "Type de document" @@ -441,37 +448,37 @@ msgstr "Référence" msgid "Internal reference" msgstr "Référence interne" -#: forms_common.py:783 models.py:2872 +#: forms_common.py:783 models.py:2875 msgid "Numerical ressource (web address)" msgstr "Ressource numérique (adresse web)" -#: forms_common.py:784 models.py:2874 +#: forms_common.py:784 models.py:2877 msgid "Receipt date" msgstr "Date de réception" -#: forms_common.py:786 models.py:2273 models.py:2876 +#: forms_common.py:786 models.py:2273 models.py:2879 msgid "Creation date" msgstr "Date de création" -#: forms_common.py:789 models.py:2879 +#: forms_common.py:789 models.py:2882 msgid "Receipt date in documentation" msgstr "Date de réception en documentation" #: forms_common.py:791 forms_common.py:827 models.py:376 models.py:687 -#: models.py:2004 models.py:2559 models.py:2886 +#: models.py:2004 models.py:2559 models.py:2889 msgid "Comment" msgstr "Commentaire" #: forms_common.py:793 forms_common.py:826 models.py:1096 models.py:1762 -#: models.py:1936 models.py:1978 models.py:2885 templates/sheet_ope.html:128 +#: models.py:1936 models.py:1978 models.py:2888 templates/sheet_ope.html:128 msgid "Description" msgstr "Description" -#: forms_common.py:796 models.py:2887 +#: forms_common.py:796 models.py:2890 msgid "Additional information" -msgstr "Informations supplémentaires" +msgstr "Information supplémentaire" -#: forms_common.py:798 forms_common.py:830 models.py:2889 +#: forms_common.py:798 forms_common.py:830 models.py:2892 msgid "Has a duplicate" msgstr "Existe en doublon" @@ -488,20 +495,20 @@ msgstr "" "<p>Les images trop grandes sont retaillées en : %(width)dx%(height)d (le " "ratio est conservé).</p>" -#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2815 +#: forms_common.py:819 forms_common.py:848 forms_common.py:882 models.py:2816 #: templates/ishtar/wizard/wizard_person_deletion.html:124 msgid "Author" msgstr "Auteur" #: forms_common.py:829 msgid "Additional informations" -msgstr "Informations complémentaires" +msgstr "Informations supplémentaires" #: forms_common.py:840 msgid "Would you like to delete this documentation?" msgstr "Voulez-vous supprimer ce document ?" -#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2812 +#: forms_common.py:856 models.py:2111 models.py:2803 models.py:2813 msgid "Author type" msgstr "Type d'auteur" @@ -513,7 +520,7 @@ msgstr "Sélection d'auteur" msgid "There are identical authors." msgstr "Il y a des auteurs identiques." -#: forms_common.py:893 models.py:2816 models.py:2868 +#: forms_common.py:893 models.py:2817 models.py:2871 #: templates/sheet_ope.html:106 #: templates/ishtar/blocks/window_tables/documents.html:9 msgid "Authors" @@ -531,7 +538,7 @@ msgstr "Ajout/modification" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:39 models.py:1268 views.py:1548 +#: ishtar_menu.py:39 models.py:1268 views.py:1549 msgid "Global variables" msgstr "Variables globales" @@ -563,15 +570,15 @@ msgstr "Fusion manuelle" msgid "Imports" msgstr "Imports" -#: ishtar_menu.py:112 views.py:1556 +#: ishtar_menu.py:112 views.py:1557 msgid "New import" msgstr "Nouvel import" -#: ishtar_menu.py:116 views.py:1570 +#: ishtar_menu.py:116 views.py:1571 msgid "Current imports" msgstr "Imports en cours" -#: ishtar_menu.py:120 views.py:1606 +#: ishtar_menu.py:120 views.py:1607 msgid "Old imports" msgstr "Anciens imports" @@ -615,7 +622,7 @@ msgstr "Dernier éditeur" msgid "Creator" msgstr "Créateur" -#: models.py:956 models.py:2952 models.py:3008 +#: models.py:956 models.py:2955 models.py:3011 msgid "Order" msgstr "Ordre" @@ -937,11 +944,11 @@ msgstr "Parcelles" msgid "Operation source" msgstr "Documentation de l'opération" -#: models.py:1722 views.py:1364 views.py:1414 +#: models.py:1722 views.py:1365 views.py:1415 msgid "Archaeological files" msgstr "Dossiers" -#: models.py:1724 views.py:1367 views.py:1422 +#: models.py:1724 views.py:1368 views.py:1423 msgid "Context records" msgstr "Unités d'Enregistrement" @@ -1073,11 +1080,11 @@ msgstr "Importeur - Clé de rapprochement" msgid "Importer - Targets keys" msgstr "Importeur - Clés de rapprochement" -#: models.py:2112 models.py:2851 models.py:2864 +#: models.py:2112 models.py:2867 msgid "Format" msgstr "Format" -#: models.py:2113 models.py:2956 +#: models.py:2113 models.py:2959 msgid "Operation type" msgstr "Type d'opération" @@ -1141,11 +1148,11 @@ msgstr "Type d'identification" msgid "Context record relation type" msgstr "Type de relations entre Unités d'Enregistrement" -#: models.py:2132 models.py:3014 +#: models.py:2132 models.py:3017 msgid "Spatial reference system" msgstr "Système de référence spatiale" -#: models.py:2133 models.py:2843 +#: models.py:2133 models.py:2845 msgid "Support type" msgstr "Type de support" @@ -1433,75 +1440,81 @@ msgstr "" msgid "Author types" msgstr "Types d'auteur" -#: models.py:2836 +#: models.py:2837 msgid "Source types" msgstr "Types de document" -#: models.py:2844 +#: models.py:2846 msgid "Support types" msgstr "Types de support" -#: models.py:2852 -msgid "Formats" +#: models.py:2853 +#, fuzzy +msgid "Format type" +msgstr "Format" + +#: models.py:2854 +#, fuzzy +msgid "Format types" msgstr "Formats" -#: models.py:2859 +#: models.py:2862 msgid "External ID" msgstr "Identifiant externe" -#: models.py:2862 +#: models.py:2865 msgid "Support" msgstr "Support" -#: models.py:2866 +#: models.py:2869 msgid "Scale" msgstr "Échelle" -#: models.py:2880 +#: models.py:2883 msgid "Item number" msgstr "Numéro d'élément" -#: models.py:2881 +#: models.py:2884 msgid "Ref." msgstr "Réf." -#: models.py:2884 +#: models.py:2887 msgid "Internal ref." msgstr "Réf. interne" -#: models.py:2927 +#: models.py:2930 msgid "Surface (m2)" msgstr "Surface (m2)" -#: models.py:2928 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 +#: models.py:2931 templates/sheet_ope.html:46 templates/sheet_ope.html.py:107 msgid "Localisation" msgstr "Localisation" -#: models.py:2953 +#: models.py:2956 msgid "Is preventive" msgstr "Est du préventif" -#: models.py:2957 +#: models.py:2960 msgid "Operation types" msgstr "Types d'opération" -#: models.py:2986 +#: models.py:2989 msgid "Preventive" msgstr "Préventif" -#: models.py:2987 +#: models.py:2990 msgid "Research" msgstr "Programmé" -#: models.py:3010 +#: models.py:3013 msgid "Authority name" msgstr "Registre" -#: models.py:3011 +#: models.py:3014 msgid "Authority SRID" msgstr "SRID" -#: models.py:3015 +#: models.py:3018 msgid "Spatial reference systems" msgstr "Systèmes de référence spatiale" @@ -1565,48 +1578,48 @@ msgstr "Demande de traitement" msgid "Treatment" msgstr "Traitement" -#: views.py:1303 views.py:1346 +#: views.py:1304 views.py:1347 msgid "Operation not permitted." msgstr "Opération non permise." -#: views.py:1305 +#: views.py:1306 #, python-format msgid "New %s" msgstr "Nouveau %s" -#: views.py:1365 views.py:1418 +#: views.py:1366 views.py:1419 msgid "Operations" msgstr "Opérations" -#: views.py:1369 views.py:1425 +#: views.py:1370 views.py:1426 msgid "Finds" msgstr "Mobilier" -#: views.py:1618 templates/ishtar/import_list.html:43 +#: views.py:1619 templates/ishtar/import_list.html:43 msgid "Link unmatched items" msgstr "Associer les éléments non rapprochés" -#: views.py:1633 +#: views.py:1634 msgid "Delete import" msgstr "Supprimer un import" -#: views.py:1672 +#: views.py:1673 msgid "Merge persons" msgstr "Fusionner des personnes" -#: views.py:1696 +#: views.py:1697 msgid "Select the main person" msgstr "Choisir la personne principale" -#: views.py:1705 +#: views.py:1706 msgid "Merge organization" msgstr "Fusionner des organisations" -#: views.py:1715 +#: views.py:1716 msgid "Select the main organization" msgstr "Sélectionner l'organisation principale" -#: views.py:1755 views.py:1771 +#: views.py:1756 views.py:1772 msgid "Corporation manager" msgstr "Représentant de la personne morale" @@ -1675,8 +1688,7 @@ msgstr "L'équipe %(app_name)s" #: templates/base.html:41 msgid "Searches in the shortcut menu deal with all items." -msgstr "" -"Les recherches dans le menu de raccourci concernent tous les éléments." +msgstr "Les recherches dans le menu de raccourci concernent tous les éléments." #: templates/base.html:42 msgid "Searches in the shortcut menu deal with only your items." @@ -2349,8 +2361,8 @@ msgid "" "Powered by <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s - " "a free software under AGPL v3 license." msgstr "" -"Propulsé par <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s -" -" logiciel libre sous licence AGPL v3." +"Propulsé par <a href=\"https://ishtar-archeo.net/\">Ishtar</a> v%(VERSION)s " +"- logiciel libre sous licence AGPL v3." #: templates/ishtar/blocks/window_nav.html:6 msgid "Previous version" diff --git a/version.py b/version.py index f9e9cf869..9bde12a00 100644 --- a/version.py +++ b/version.py @@ -1,4 +1,4 @@ -VERSION = (0, 99, 9) +VERSION = (0, 99, 10) def get_version(): |