From e6d8b1448df10c98c1964231c308395632bebaf1 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Jul 2013 00:49:32 +0200 Subject: Archaeological finds: move initial_data to prevent overload --- archaeological_finds/fixtures/initial_data-fr.json | 231 +++++++++++++++++++++ archaeological_finds/fixtures/initial_data.json | 231 --------------------- 2 files changed, 231 insertions(+), 231 deletions(-) create mode 100644 archaeological_finds/fixtures/initial_data-fr.json delete mode 100644 archaeological_finds/fixtures/initial_data.json diff --git a/archaeological_finds/fixtures/initial_data-fr.json b/archaeological_finds/fixtures/initial_data-fr.json new file mode 100644 index 000000000..b29ea6b8e --- /dev/null +++ b/archaeological_finds/fixtures/initial_data-fr.json @@ -0,0 +1,231 @@ +[ + { + "pk": 1, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": null, + "label": "M\u00e9tal", + "recommendation": "Hygrom\u00e9trie contr\u00f4l\u00e9e, variation de temp\u00e9rature faible", + "txt_idx": "metal" + } + }, + { + "pk": 2, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": null, + "label": "Os", + "recommendation": "Hygrom\u00e9trie contr\u00f4l\u00e9e, variations de temp\u00e9rature faible", + "txt_idx": "bone" + } + }, + { + "pk": 3, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": 2, + "label": "Os animal", + "recommendation": "idem os", + "txt_idx": "animal_bone" + } + }, + { + "pk": 4, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": 2, + "label": "Os humain", + "recommendation": "idem os", + "txt_idx": "human_bone" + } + }, + { + "pk": 5, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": null, + "label": "Verre", + "recommendation": "fragile, oxydation, etc.", + "txt_idx": "glass" + } + }, + { + "pk": 6, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": null, + "label": "C\u00e9ramique", + "recommendation": "a d\u00e9tailler", + "txt_idx": "ceramic" + } + }, + { + "pk": 7, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": null, + "label": "Min\u00e9ral", + "recommendation": "a d\u00e9tailler", + "txt_idx": "mineral" + } + }, + { + "pk": 8, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": null, + "label": "\u00c9cofact", + "recommendation": "on en veut pas !", + "txt_idx": "ecofact" + } + }, + { + "pk": 9, + "model": "archaeological_finds.materialtype", + "fields": { + "comment": "", + "available": true, + "parent": 1, + "label": "Bronze", + "recommendation": "blah", + "txt_idx": "bronze" + } + }, + { + "pk": 1, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Le fait de mettre du mobilier dans un contenant. Que cela soit le conditionnement initial ou un re-conditionnement. ", + "available": true, + "txt_idx": "packaging", + "virtual": false, + "label": "Conditionnement" + } + }, + { + "pk": 2, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Un lot mobilier ou un objet isol\u00e9 subit une radiographie (rayon X) qui produit un ou des films radio.", + "available": true, + "txt_idx": "regular_x_ray", + "virtual": false, + "label": "Radiographie argentique" + } + }, + { + "pk": 3, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Un lot mobilier ou un objet isol\u00e9 subit une radiographie (rayon X) qui produit un ou des fichiers num\u00e9riques.", + "available": true, + "txt_idx": "digital_x_ray", + "virtual": false, + "label": "Radiographie num\u00e9rique" + } + }, + { + "pk": 4, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "D\u00e9placement de mobilier, entre deux d\u00e9p\u00f4ts : le mobilier ne peut pas \u00eatre stocker ailleurs que dans un lieu consid\u00e9r\u00e9 comme un d\u00e9p\u00f4t.", + "available": true, + "txt_idx": "moving", + "virtual": false, + "label": "D\u00e9placement" + } + }, + { + "pk": 5, + "model": "archaeological_finds.treatmenttype", + "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, + "txt_idx": "virtual_group", + "virtual": true, + "label": "Groupement virtuel" + } + }, + { + "pk": 7, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Division d'un lot de mobilier en plusieurs lots", + "available": true, + "txt_idx": "split", + "virtual": false, + "label": "Division" + } + }, + { + "pk": 6, + "model": "archaeological_finds.treatmenttype", + "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, + "txt_idx": "physical_grouping", + "virtual": false, + "label": "Groupement" + } + }, + { + "pk": 8, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Prise de vue \u00e0 l'aide d'un appareil photo num\u00e9rique", + "available": true, + "txt_idx": "digital_photography", + "virtual": false, + "label": "Photographie num\u00e9rique" + } + }, + { + "pk": 9, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Photographie produisant un film (positif ou n\u00e9gatif)", + "available": true, + "txt_idx": "regular_photography", + "virtual": false, + "label": "Photographie argentique" + } + }, + { + "pk": 10, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "Processus qui permet \u00e9liminer le sel qui impr\u00e8gne un objet arch\u00e9ologique ou lot d'objets.", + "available": true, + "txt_idx": "desalinisation", + "virtual": false, + "label": "D\u00e9salinisation" + } + }, + { + "pk": 11, + "model": "archaeological_finds.treatmenttype", + "fields": { + "comment": "R\u00e9duction des oxydes d\u00e9velopp\u00e9s sur/dans un objet arch\u00e9ologique par l'usage de courant \u00e9lectrique.", + "available": true, + "txt_idx": "electrolysis", + "virtual": false, + "label": "Electrolyse" + } + } +] diff --git a/archaeological_finds/fixtures/initial_data.json b/archaeological_finds/fixtures/initial_data.json deleted file mode 100644 index b29ea6b8e..000000000 --- a/archaeological_finds/fixtures/initial_data.json +++ /dev/null @@ -1,231 +0,0 @@ -[ - { - "pk": 1, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": null, - "label": "M\u00e9tal", - "recommendation": "Hygrom\u00e9trie contr\u00f4l\u00e9e, variation de temp\u00e9rature faible", - "txt_idx": "metal" - } - }, - { - "pk": 2, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": null, - "label": "Os", - "recommendation": "Hygrom\u00e9trie contr\u00f4l\u00e9e, variations de temp\u00e9rature faible", - "txt_idx": "bone" - } - }, - { - "pk": 3, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": 2, - "label": "Os animal", - "recommendation": "idem os", - "txt_idx": "animal_bone" - } - }, - { - "pk": 4, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": 2, - "label": "Os humain", - "recommendation": "idem os", - "txt_idx": "human_bone" - } - }, - { - "pk": 5, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": null, - "label": "Verre", - "recommendation": "fragile, oxydation, etc.", - "txt_idx": "glass" - } - }, - { - "pk": 6, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": null, - "label": "C\u00e9ramique", - "recommendation": "a d\u00e9tailler", - "txt_idx": "ceramic" - } - }, - { - "pk": 7, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": null, - "label": "Min\u00e9ral", - "recommendation": "a d\u00e9tailler", - "txt_idx": "mineral" - } - }, - { - "pk": 8, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": null, - "label": "\u00c9cofact", - "recommendation": "on en veut pas !", - "txt_idx": "ecofact" - } - }, - { - "pk": 9, - "model": "archaeological_finds.materialtype", - "fields": { - "comment": "", - "available": true, - "parent": 1, - "label": "Bronze", - "recommendation": "blah", - "txt_idx": "bronze" - } - }, - { - "pk": 1, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "Le fait de mettre du mobilier dans un contenant. Que cela soit le conditionnement initial ou un re-conditionnement. ", - "available": true, - "txt_idx": "packaging", - "virtual": false, - "label": "Conditionnement" - } - }, - { - "pk": 2, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "Un lot mobilier ou un objet isol\u00e9 subit une radiographie (rayon X) qui produit un ou des films radio.", - "available": true, - "txt_idx": "regular_x_ray", - "virtual": false, - "label": "Radiographie argentique" - } - }, - { - "pk": 3, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "Un lot mobilier ou un objet isol\u00e9 subit une radiographie (rayon X) qui produit un ou des fichiers num\u00e9riques.", - "available": true, - "txt_idx": "digital_x_ray", - "virtual": false, - "label": "Radiographie num\u00e9rique" - } - }, - { - "pk": 4, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "D\u00e9placement de mobilier, entre deux d\u00e9p\u00f4ts : le mobilier ne peut pas \u00eatre stocker ailleurs que dans un lieu consid\u00e9r\u00e9 comme un d\u00e9p\u00f4t.", - "available": true, - "txt_idx": "moving", - "virtual": false, - "label": "D\u00e9placement" - } - }, - { - "pk": 5, - "model": "archaeological_finds.treatmenttype", - "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, - "txt_idx": "virtual_group", - "virtual": true, - "label": "Groupement virtuel" - } - }, - { - "pk": 7, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "Division d'un lot de mobilier en plusieurs lots", - "available": true, - "txt_idx": "split", - "virtual": false, - "label": "Division" - } - }, - { - "pk": 6, - "model": "archaeological_finds.treatmenttype", - "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, - "txt_idx": "physical_grouping", - "virtual": false, - "label": "Groupement" - } - }, - { - "pk": 8, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "Prise de vue \u00e0 l'aide d'un appareil photo num\u00e9rique", - "available": true, - "txt_idx": "digital_photography", - "virtual": false, - "label": "Photographie num\u00e9rique" - } - }, - { - "pk": 9, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "Photographie produisant un film (positif ou n\u00e9gatif)", - "available": true, - "txt_idx": "regular_photography", - "virtual": false, - "label": "Photographie argentique" - } - }, - { - "pk": 10, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "Processus qui permet \u00e9liminer le sel qui impr\u00e8gne un objet arch\u00e9ologique ou lot d'objets.", - "available": true, - "txt_idx": "desalinisation", - "virtual": false, - "label": "D\u00e9salinisation" - } - }, - { - "pk": 11, - "model": "archaeological_finds.treatmenttype", - "fields": { - "comment": "R\u00e9duction des oxydes d\u00e9velopp\u00e9s sur/dans un objet arch\u00e9ologique par l'usage de courant \u00e9lectrique.", - "available": true, - "txt_idx": "electrolysis", - "virtual": false, - "label": "Electrolyse" - } - } -] -- cgit v1.2.3 From 1cdb4224ef8a46af1dd0df43f24602633d54d753 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Jul 2013 00:51:13 +0200 Subject: Archaeological finds: Add code field to material types --- .../0003_auto__add_field_materialtype_code.py | 599 +++++++++++++++++++++ archaeological_finds/models.py | 1 + 2 files changed, 600 insertions(+) create mode 100644 archaeological_finds/migrations/0003_auto__add_field_materialtype_code.py diff --git a/archaeological_finds/migrations/0003_auto__add_field_materialtype_code.py b/archaeological_finds/migrations/0003_auto__add_field_materialtype_code.py new file mode 100644 index 000000000..76b84a4bb --- /dev/null +++ b/archaeological_finds/migrations/0003_auto__add_field_materialtype_code.py @@ -0,0 +1,599 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'MaterialType.code' + db.add_column('archaeological_finds_materialtype', 'code', + self.gf('django.db.models.fields.CharField')(max_length=10, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'MaterialType.code' + db.delete_column('archaeological_finds_materialtype', 'code') + + + models = { + 'archaeological_context_records.activitytype': { + 'Meta': {'object_name': 'ActivityType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_context_records.contextrecord': { + 'Meta': {'object_name': 'ContextRecord'}, + 'activity': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.ActivityType']", 'null': 'True', 'blank': 'True'}), + 'datings': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_context_records.Dating']", 'symmetrical': 'False'}), + 'depth': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'filling': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'has_furniture': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identification': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.IdentificationType']", 'null': 'True', 'blank': 'True'}), + 'interpretation': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'length': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'location': ('django.db.models.fields.CharField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Operation']"}), + 'parcel': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'context_record'", 'to': "orm['archaeological_operations.Parcel']"}), + 'taq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'taq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'thickness': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'tpq': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'tpq_estimated': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'unit': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['archaeological_context_records.Unit']"}), + 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.dating': { + 'Meta': {'object_name': 'Dating'}, + 'dating_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingType']", 'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'period': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']"}), + 'quality': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.DatingQuality']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_context_records.datingquality': { + 'Meta': {'object_name': 'DatingQuality'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_context_records.datingtype': { + 'Meta': {'object_name': 'DatingType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_context_records.identificationtype': { + 'Meta': {'object_name': 'IdentificationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_context_records.unit': { + 'Meta': {'object_name': 'Unit'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Unit']", 'null': 'True', 'blank': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_files.file': { + 'Meta': {'ordering': "['-year', '-numeric_reference']", 'object_name': 'File'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'default': 'datetime.date.today'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'file_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.FileType']"}), + 'general_contractor': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100', 'null': 'True', 'blank': 'True'}), + 'numeric_reference': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'permit_reference': ('django.db.models.fields.CharField', [], {'max_length': '60', 'null': 'True', 'blank': 'True'}), + 'permit_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.PermitType']", 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'reception_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'related_file': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.File']", 'null': 'True', 'blank': 'True'}), + 'saisine_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_files.SaisineType']", 'null': 'True', 'blank': 'True'}), + 'total_developed_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'total_surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'town_planning_service': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Organization']"}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'file'", 'symmetrical': 'False', 'to': "orm['ishtar_common.Town']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'default': '2013'}) + }, + 'archaeological_files.filetype': { + 'Meta': {'object_name': 'FileType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_files.permittype': { + 'Meta': {'object_name': 'PermitType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_files.saisinetype': { + 'Meta': {'object_name': 'SaisineType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'delay': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_finds.basefind': { + 'Meta': {'object_name': 'BaseFind'}, + 'context_record': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'base_finds'", 'to': "orm['archaeological_context_records.ContextRecord']"}), + 'description': ('django.db.models.fields.TextField', [], {}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'is_isolated': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '60'}), + 'material_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}) + }, + 'archaeological_finds.find': { + 'Meta': {'object_name': 'Find'}, + 'base_finds': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'find'", 'symmetrical': 'False', 'to': "orm['archaeological_finds.BaseFind']"}), + 'container': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'finds'", 'null': 'True', 'to': "orm['archaeological_warehouse.Container']"}), + 'dating': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_context_records.Dating']"}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'upstream_treatment'", 'null': 'True', 'to': "orm['archaeological_finds.Treatment']"}), + 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '60'}), + 'material_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.MaterialType']"}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'upstream_treatment': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'downstream_treatment'", 'null': 'True', 'to': "orm['archaeological_finds.Treatment']"}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.findsource': { + 'Meta': {'object_name': 'FindSource'}, + 'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.Author']", 'symmetrical': 'False'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'find': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Find']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}) + }, + 'archaeological_finds.historicalbasefind': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalBaseFind'}, + 'context_record_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'index': ('django.db.models.fields.IntegerField', [], {'default': '0'}), + 'is_isolated': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '60'}), + 'material_index': ('django.db.models.fields.IntegerField', [], {'default': '0'}) + }, + 'archaeological_finds.historicalfind': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalFind'}, + 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'dating_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'downstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'find_number': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '60'}), + 'material_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'upstream_treatment_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'volume': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'weight': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.historicaltreatment': { + 'Meta': {'ordering': "('-history_date', '-history_id')", 'object_name': 'HistoricalTreatment'}, + 'container_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'history_id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'history_modifier_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'history_type': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'history_user': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'blank': 'True'}), + 'location_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'person_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'treatment_type_id': ('django.db.models.fields.IntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}) + }, + 'archaeological_finds.materialtype': { + 'Meta': {'object_name': 'MaterialType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.MaterialType']", 'null': 'True', 'blank': 'True'}), + 'recommendation': ('django.db.models.fields.TextField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_finds.property': { + 'Meta': {'object_name': 'Property'}, + 'administrative_act': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.AdministrativeAct']"}), + 'end_date': ('django.db.models.fields.DateField', [], {}), + 'find': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.Find']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Person']"}), + 'start_date': ('django.db.models.fields.DateField', [], {}) + }, + 'archaeological_finds.treatment': { + 'Meta': {'object_name': 'Treatment'}, + 'container': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Container']", 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']", 'null': 'True', 'blank': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Person']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'treatment_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_finds.TreatmentType']"}) + }, + 'archaeological_finds.treatmentsource': { + 'Meta': {'object_name': 'TreatmentSource'}, + 'associated_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.Author']", 'symmetrical': 'False'}), + 'creation_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'internal_reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), + 'receipt_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '25', 'null': 'True', 'blank': 'True'}), + 'source_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.SourceType']"}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '300'}), + 'treatment': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'source'", 'to': "orm['archaeological_finds.Treatment']"}) + }, + 'archaeological_finds.treatmenttype': { + 'Meta': {'object_name': 'TreatmentType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'virtual': ('django.db.models.fields.BooleanField', [], {'default': 'False'}) + }, + 'archaeological_operations.acttype': { + 'Meta': {'object_name': 'ActType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'intented_to': ('django.db.models.fields.CharField', [], {'max_length': '1'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_operations.administrativeact': { + 'Meta': {'object_name': 'AdministrativeAct'}, + 'act_object': ('django.db.models.fields.CharField', [], {'max_length': '200'}), + 'act_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.ActType']"}), + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'administrative_act'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}), + 'operator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}), + 'ref_sra': ('django.db.models.fields.CharField', [], {'max_length': '15', 'null': 'True', 'blank': 'True'}), + 'scientific': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'signatory': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'signature_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.operation': { + 'Meta': {'object_name': 'Operation'}, + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'operations'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'cira_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'cira_rapporteur': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'code_dracar': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'code_patriarche': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'common_name': ('django.db.models.fields.CharField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), + 'cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'eas_number': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'effective_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'excavation_end_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_cost': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'fnap_financing': ('django.db.models.fields.FloatField', [], {'null': 'True', 'blank': 'True'}), + 'geoarchaeological_context_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'in_charge': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'+'", 'null': 'True', 'to': "orm['ishtar_common.Person']"}), + 'large_area_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'negative_result': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}), + 'operation_code': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'operation_type': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['archaeological_operations.OperationType']"}), + 'operator_reference': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'optional_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'periods': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.Period']", 'symmetrical': 'False'}), + 'remains': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['archaeological_operations.RemainType']", 'symmetrical': 'False'}), + 'scheduled_man_days': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'towns': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.Town']", 'symmetrical': 'False'}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'zoning_prescription': ('django.db.models.fields.NullBooleanField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.operationtype': { + 'Meta': {'ordering': "['label']", 'object_name': 'OperationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'preventive': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_operations.parcel': { + 'Meta': {'object_name': 'Parcel'}, + 'associated_file': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_files.File']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'operation': ('django.db.models.fields.related.ForeignKey', [], {'blank': 'True', 'related_name': "'parcels'", 'null': 'True', 'to': "orm['archaeological_operations.Operation']"}), + 'parcel_number': ('django.db.models.fields.CharField', [], {'max_length': '6'}), + 'section': ('django.db.models.fields.CharField', [], {'max_length': '4'}), + 'town': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parcels'", 'to': "orm['ishtar_common.Town']"}), + 'year': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_operations.period': { + 'Meta': {'object_name': 'Period'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'end_date': ('django.db.models.fields.IntegerField', [], {}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'parent': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_operations.Period']", 'null': 'True', 'blank': 'True'}), + 'start_date': ('django.db.models.fields.IntegerField', [], {}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_operations.remaintype': { + 'Meta': {'object_name': 'RemainType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'archaeological_warehouse.container': { + 'Meta': {'object_name': 'Container'}, + 'comment': ('django.db.models.fields.TextField', [], {}), + 'container_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.ContainerType']"}), + 'history_date': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'location': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.Warehouse']"}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '40'}) + }, + 'archaeological_warehouse.containertype': { + 'Meta': {'object_name': 'ContainerType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'height': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'length': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'reference': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}), + 'volume': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'width': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'archaeological_warehouse.warehouse': { + 'Meta': {'object_name': 'Warehouse'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '40'}), + 'person_in_charge': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Person']", 'null': 'True', 'blank': 'True'}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'warehouse_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['archaeological_warehouse.WarehouseType']"}) + }, + 'archaeological_warehouse.warehousetype': { + 'Meta': {'object_name': 'WarehouseType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'ishtar_common.arrondissement': { + 'Meta': {'object_name': 'Arrondissement'}, + 'department': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}) + }, + 'ishtar_common.author': { + 'Meta': {'object_name': 'Author'}, + 'author_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.AuthorType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'person': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Person']"}) + }, + 'ishtar_common.authortype': { + 'Meta': {'object_name': 'AuthorType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'ishtar_common.canton': { + 'Meta': {'object_name': 'Canton'}, + 'arrondissement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Arrondissement']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}) + }, + 'ishtar_common.department': { + 'Meta': {'ordering': "['number']", 'object_name': 'Department'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'number': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '3'}) + }, + 'ishtar_common.organization': { + 'Meta': {'object_name': 'Organization'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'organization_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.OrganizationType']"}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.organizationtype': { + 'Meta': {'object_name': 'OrganizationType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'ishtar_common.person': { + 'Meta': {'object_name': 'Person'}, + 'address': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'address_complement': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'attached_to': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Organization']", 'null': 'True', 'blank': 'True'}), + 'country': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}), + 'email': ('django.db.models.fields.CharField', [], {'max_length': '40', 'null': 'True', 'blank': 'True'}), + 'history_modifier': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['auth.User']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mobile_phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '30'}), + 'person_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.PersonType']"}), + 'phone': ('django.db.models.fields.CharField', [], {'max_length': '18', 'null': 'True', 'blank': 'True'}), + 'postal_code': ('django.db.models.fields.CharField', [], {'max_length': '10', 'null': 'True', 'blank': 'True'}), + 'surname': ('django.db.models.fields.CharField', [], {'max_length': '20', 'null': 'True', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '2'}), + 'town': ('django.db.models.fields.CharField', [], {'max_length': '30', 'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.persontype': { + 'Meta': {'object_name': 'PersonType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'rights': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ishtar_common.WizardStep']", 'symmetrical': 'False'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'ishtar_common.sourcetype': { + 'Meta': {'object_name': 'SourceType'}, + 'available': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'comment': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'txt_idx': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + 'ishtar_common.town': { + 'Meta': {'ordering': "['numero_insee']", 'object_name': 'Town'}, + 'canton': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Canton']", 'null': 'True', 'blank': 'True'}), + 'center': ('django.contrib.gis.db.models.fields.PointField', [], {'srid': '27572', 'null': 'True', 'blank': 'True'}), + 'departement': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Department']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'numero_insee': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '6'}), + 'surface': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}) + }, + 'ishtar_common.wizard': { + 'Meta': {'ordering': "['url_name']", 'object_name': 'Wizard'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'url_name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}) + }, + 'ishtar_common.wizardstep': { + 'Meta': {'ordering': "['wizard', 'order']", 'object_name': 'WizardStep'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'order': ('django.db.models.fields.IntegerField', [], {}), + 'url_name': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'wizard': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ishtar_common.Wizard']"}) + } + } + + complete_apps = ['archaeological_finds'] \ No newline at end of file diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index 9c1e72e38..4d44e67fd 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -32,6 +32,7 @@ if WAREHOUSE_AVAILABLE: from archaeological_warehouse.models import Warehouse, Container class MaterialType(GeneralType): + code = models.CharField(_(u"Code"), max_length=10, blank=True, null=True) recommendation = models.TextField(_(u"Recommendation")) parent = models.ForeignKey("MaterialType", blank=True, null=True, verbose_name=_(u"Parent material")) -- cgit v1.2.3 From a0a21a9c053d70cce3478c0d931883a394dfc17f Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Jul 2013 01:07:15 +0200 Subject: Update french translation --- .../locale/fr/LC_MESSAGES/django.po | 117 +++++++----- .../locale/fr/LC_MESSAGES/django.po | 209 +++++++++++---------- 2 files changed, 177 insertions(+), 149 deletions(-) diff --git a/archaeological_finds/locale/fr/LC_MESSAGES/django.po b/archaeological_finds/locale/fr/LC_MESSAGES/django.po index a441e2807..40c7acd6e 100644 --- a/archaeological_finds/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_finds/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-22 00:38+0200\n" +"POT-Creation-Date: 2013-07-17 01:03+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks \n" "Language-Team: \n" @@ -18,40 +18,40 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: forms.py:48 ishtar_menu.py:27 models.py:188 models.py:222 models.py:270 +#: forms.py:48 ishtar_menu.py:27 models.py:194 models.py:229 models.py:278 msgid "Find" msgstr "Mobilier" -#: forms.py:51 forms.py:182 models.py:44 models.py:117 +#: forms.py:51 forms.py:182 models.py:45 models.py:123 msgid "ID" msgstr "Identifiant" -#: forms.py:53 forms.py:93 forms.py:129 models.py:45 models.py:118 -#: models.py:234 +#: forms.py:53 forms.py:93 forms.py:129 models.py:46 models.py:124 +#: models.py:241 msgid "Description" msgstr "Description" -#: forms.py:55 forms.py:94 models.py:48 +#: forms.py:55 forms.py:94 models.py:49 msgid "Is isolated?" msgstr "Est isolé ?" -#: forms.py:57 forms.py:92 forms.py:186 models.py:40 models.py:120 +#: forms.py:57 forms.py:92 forms.py:186 models.py:41 models.py:126 msgid "Material type" msgstr "Type de matériau" -#: forms.py:59 forms.py:188 models.py:121 +#: forms.py:59 forms.py:188 models.py:127 msgid "Volume (l)" msgstr "Volume (l)" -#: forms.py:60 forms.py:189 models.py:122 +#: forms.py:60 forms.py:189 models.py:128 msgid "Weight (g)" msgstr "Poids (g)" -#: forms.py:61 forms.py:190 models.py:123 +#: forms.py:61 forms.py:190 models.py:129 msgid "Find number" msgstr "Mobilier (en nombre)" -#: forms.py:64 models.py:128 +#: forms.py:64 models.py:134 msgid "Dating" msgstr "Datation" @@ -59,11 +59,11 @@ msgstr "Datation" msgid "Period" msgstr "Période" -#: forms.py:71 forms.py:131 models.py:242 models.py:274 +#: forms.py:71 forms.py:131 models.py:249 models.py:282 msgid "Start date" msgstr "Date de début" -#: forms.py:73 forms.py:133 models.py:243 models.py:275 +#: forms.py:73 forms.py:133 models.py:250 models.py:283 msgid "End date" msgstr "Date de fin" @@ -91,15 +91,15 @@ msgstr "Recherche de mobilier" msgid "Base treatment" msgstr "Traitement de base" -#: forms.py:119 models.py:228 models.py:236 +#: forms.py:119 models.py:235 models.py:243 msgid "Treatment type" msgstr "Type de traitement" -#: forms.py:120 models.py:240 models.py:273 +#: forms.py:120 models.py:247 models.py:281 msgid "Person" msgstr "Individu" -#: forms.py:124 models.py:238 +#: forms.py:124 models.py:245 msgid "Location" msgstr "Lieu" @@ -107,7 +107,7 @@ msgstr "Lieu" msgid "Upstream finds" msgstr "Mobilier amont" -#: forms.py:146 models.py:189 +#: forms.py:146 models.py:195 msgid "Finds" msgstr "Mobilier" @@ -184,138 +184,154 @@ msgid "Deletion" msgstr "Suppression" #: models.py:35 +msgid "Code" +msgstr "" + +#: models.py:36 msgid "Recommendation" msgstr "Recommendation" -#: models.py:37 +#: models.py:38 msgid "Parent material" msgstr "Matériau parent" -#: models.py:41 +#: models.py:42 msgid "Material types" msgstr "Types de matériaux" -#: models.py:47 +#: models.py:48 msgid "Context Record" msgstr "Unité d'Enregistrement" -#: models.py:55 models.py:114 +#: models.py:56 models.py:120 msgid "Base find" msgstr "Mobilier de base" -#: models.py:56 +#: models.py:57 msgid "Base finds" msgstr "Mobiliers de base" -#: models.py:58 +#: models.py:59 +msgid "Can view all Base find" +msgstr "Peut voir tous le mobilier de base" + +#: models.py:60 msgid "Can view own Base find" msgstr "Peut voir son propre Mobilier de base" -#: models.py:59 +#: models.py:61 msgid "Can add own Base find" msgstr "Peut ajouter son propre Mobilier de base" -#: models.py:60 +#: models.py:62 msgid "Can change own Base find" msgstr "Peut changer son propre Mobilier de base" -#: models.py:61 +#: models.py:63 msgid "Can delete own Base find" msgstr "Peut supprimer son propre Mobilier de base" -#: models.py:116 +#: models.py:122 msgid "Order" msgstr "Ordre" -#: models.py:125 +#: models.py:131 msgid "Upstream treatment" msgstr "Traitement amont" -#: models.py:127 +#: models.py:133 msgid "Downstream treatment" msgstr "Traitement aval" -#: models.py:130 models.py:232 +#: models.py:136 models.py:239 msgid "Container" msgstr "Contenant" -#: models.py:191 +#: models.py:197 +msgid "Can view all Find" +msgstr "Peut voir tout le mobilier" + +#: models.py:198 msgid "Can view own Find" msgstr "Peut voir son propre mobilier" -#: models.py:192 +#: models.py:199 msgid "Can add own Find" msgstr "Peut ajouter son propre mobilier" -#: models.py:193 +#: models.py:200 msgid "Can change own Find" msgstr "Peut changer son propre mobilier" -#: models.py:194 +#: models.py:201 msgid "Can delete own Find" msgstr "Peut supprimer son propre mobilier" -#: models.py:220 +#: models.py:227 msgid "Find documentation" msgstr "Documentation de mobilier" -#: models.py:221 +#: models.py:228 msgid "Find documentations" msgstr "Documentations de mobilier" -#: models.py:226 +#: models.py:233 msgid "Virtual" msgstr "Virtuel" -#: models.py:229 +#: models.py:236 msgid "Treatment types" msgstr "Types de traitements" -#: models.py:247 models.py:266 +#: models.py:254 models.py:274 msgid "Treatment" msgstr "Traitement" -#: models.py:248 +#: models.py:255 msgid "Treatments" msgstr "Traitements" -#: models.py:250 +#: models.py:257 +msgid "Can view all Treatment" +msgstr "Peut voir tous les Traitements" + +#: models.py:258 msgid "Can view own Treatment" msgstr "Peut voir son propre Traitement" -#: models.py:251 +#: models.py:259 msgid "Can add own Treatment" msgstr "Peut ajouter son propre Traitement" -#: models.py:252 +#: models.py:260 msgid "Can change own Treatment" msgstr "Peut changer son propre Traitement" -#: models.py:253 +#: models.py:261 msgid "Can delete own Treatment" msgstr "Peut supprimer son propre traitement" -#: models.py:259 +#: models.py:267 msgid "by" msgstr "par" -#: models.py:264 +#: models.py:272 msgid "Treatment documentation" msgstr "Documentation d'un traitement" -#: models.py:265 +#: models.py:273 msgid "Treament documentations" msgstr "Documentations des traitements" -#: models.py:272 +#: models.py:280 msgid "Administrative act" msgstr "Acte administratif" -#: models.py:278 +#: models.py:286 msgid "Property" msgstr "Propriété" -#: models.py:279 +#: models.py:287 msgid "Properties" msgstr "Propriétés" @@ -346,4 +362,3 @@ msgstr "Opération : " #: wizards.py:67 msgid "Current context record: " msgstr "Unité d'Enregistrement : " - diff --git a/archaeological_operations/locale/fr/LC_MESSAGES/django.po b/archaeological_operations/locale/fr/LC_MESSAGES/django.po index 1a647285d..67d561394 100644 --- a/archaeological_operations/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_operations/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-04-17 00:39+0200\n" +"POT-Creation-Date: 2013-07-17 01:05+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks \n" "Language-Team: \n" @@ -18,12 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: forms.py:57 forms.py:111 forms.py:325 forms.py:346 forms.py:350 -#: models.py:327 templates/ishtar/sheet_operation.html:63 +#: forms.py:57 forms.py:111 forms.py:340 forms.py:361 forms.py:365 +#: models.py:339 templates/ishtar/sheet_operation.html:63 msgid "Parcels" msgstr "Parcelles" -#: forms.py:60 forms.py:303 models.py:321 +#: forms.py:60 forms.py:318 models.py:333 #: templates/ishtar/dashboards/dashboard_operation.html:302 #: templates/ishtar/dashboards/dashboard_operation.html:315 #: templates/ishtar/dashboards/dashboard_operation.html:485 @@ -31,17 +31,17 @@ msgstr "Parcelles" msgid "Town" msgstr "Commune" -#: forms.py:62 forms.py:134 forms.py:226 models.py:81 models.py:319 +#: forms.py:62 forms.py:131 forms.py:223 models.py:81 models.py:331 #: templates/ishtar/sheet_operation.html:61 #: templates/ishtar/sheet_operation.html:82 msgid "Year" msgstr "Année" -#: forms.py:65 models.py:322 templates/ishtar/sheet_operation.html:62 +#: forms.py:65 models.py:334 templates/ishtar/sheet_operation.html:62 msgid "Section" msgstr "Section" -#: forms.py:67 models.py:323 +#: forms.py:67 models.py:335 msgid "Parcel number" msgstr "Numéro de parcelle" @@ -57,107 +57,107 @@ msgstr "Il y a des parcelles identiques." msgid "Name (full text search)" msgstr "Nom (recherche texte intégral)" -#: forms.py:122 forms.py:216 forms.py:435 models.py:39 models.py:88 +#: forms.py:119 forms.py:213 forms.py:450 models.py:39 models.py:88 msgid "Operation type" msgstr "Type d'opération" -#: forms.py:129 models.py:80 +#: forms.py:126 models.py:80 msgid "In charge" msgstr "Responsable" -#: forms.py:130 models.py:90 +#: forms.py:127 models.py:90 msgid "Remains" msgstr "Vestiges" -#: forms.py:132 forms.py:370 forms.py:384 models.py:93 +#: forms.py:129 forms.py:385 forms.py:399 models.py:93 #: templates/ishtar/sheet_operation.html:150 msgid "Periods" msgstr "Périodes" -#: forms.py:135 +#: forms.py:132 msgid "Started before" msgstr "Commencé avant" -#: forms.py:137 +#: forms.py:134 msgid "Started after" msgstr "Commencé après" -#: forms.py:139 +#: forms.py:136 msgid "Ended before" msgstr "Terminé avant" -#: forms.py:141 +#: forms.py:138 msgid "Ended after" msgstr "Terminé après" -#: forms.py:143 +#: forms.py:140 msgid "Parcel (section/number)" msgstr "Parcelle (section/numéro)" -#: forms.py:144 +#: forms.py:141 msgid "Is open?" msgstr "Est ouvert ?" -#: forms.py:159 forms.py:429 views.py:137 +#: forms.py:156 forms.py:444 views.py:137 msgid "Operation search" msgstr "Recherche d'opérations" -#: forms.py:171 forms.py:431 +#: forms.py:168 forms.py:446 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: forms.py:199 forms.py:485 templates/ishtar/sheet_operation.html:5 +#: forms.py:196 forms.py:500 templates/ishtar/sheet_operation.html:5 msgid "General" msgstr "Général" -#: forms.py:205 models.py:274 +#: forms.py:202 models.py:282 msgid "Person in charge of the operation" msgstr "Responsable d'opération" -#: forms.py:212 models.py:258 models.py:286 +#: forms.py:209 models.py:266 models.py:295 msgid "Archaelogical file" msgstr "Dossier archéologique" -#: forms.py:218 models.py:60 models.py:75 models.py:360 +#: forms.py:215 models.py:60 models.py:75 models.py:384 msgid "Start date" msgstr "Date de début" -#: forms.py:220 models.py:76 +#: forms.py:217 models.py:76 msgid "Excavation end date" msgstr "Date de fin de chantier" -#: forms.py:223 templates/ishtar/dashboards/dashboard_operation.html:315 +#: forms.py:220 templates/ishtar/dashboards/dashboard_operation.html:315 msgid "Total surface (m²)" msgstr "Surface totale des terrains (m²)" -#: forms.py:230 models.py:82 models.py:166 +#: forms.py:227 models.py:82 models.py:174 msgid "Operation code" msgstr "Code de l'opération" -#: forms.py:233 models.py:118 +#: forms.py:230 models.py:125 msgid "Generic name" msgstr "Nom générique" -#: forms.py:235 models.py:116 +#: forms.py:232 models.py:123 msgid "Operator reference" msgstr "Référence de l'opérateur" -#: forms.py:242 models.py:120 +#: forms.py:252 models.py:127 msgid "Comment" msgstr "Commentaire" -#: forms.py:255 +#: forms.py:265 msgid "" "If you want to set an excavation end date you have to provide a start date." msgstr "" "Avant de renseigner la date de fin de chantier, il est nécessaire de " "renseigner une date de début." -#: forms.py:258 +#: forms.py:268 msgid "The excavation end date cannot be before the start date." msgstr "La date de fin de chantier ne peut être avant la date de début." -#: forms.py:270 +#: forms.py:282 #, python-format msgid "" "Operation code already exist for year: %(year)d - use a value bigger than " @@ -166,86 +166,90 @@ msgstr "" "Ce code d'opération existe déjà pour l'année %(year)d - utilisez une valeur " "plus grande que %(last_val)d" -#: forms.py:276 +#: forms.py:286 +msgid "Bad operation code" +msgstr "Mauvais code d'opération" + +#: forms.py:291 msgid "Preventive informations - excavation" msgstr "Information archéologie préventive - fouille" -#: forms.py:277 models.py:92 +#: forms.py:292 models.py:92 #: templates/ishtar/dashboards/dashboard_operation.html:498 msgid "Cost (€)" msgstr "Cout (€)" -#: forms.py:278 models.py:94 +#: forms.py:293 models.py:94 msgid "Scheduled man-days" msgstr "Jours-hommes prévus" -#: forms.py:280 models.py:96 +#: forms.py:295 models.py:96 msgid "Optional man-days" msgstr "Jours-hommes optionnels" -#: forms.py:282 models.py:98 +#: forms.py:297 models.py:98 msgid "Effective man-days" msgstr "Jours-hommes effectifs" -#: forms.py:291 +#: forms.py:306 msgid "Preventive informations - diagnostic" msgstr "Information archéologie préventive - diagnostic" -#: forms.py:294 models.py:111 +#: forms.py:309 models.py:111 msgid "Prescription on zoning" msgstr "Prescription sur zonage" -#: forms.py:296 models.py:113 +#: forms.py:311 models.py:113 msgid "Prescription on large area" msgstr "Prescription sur une vaste surface" -#: forms.py:298 models.py:115 +#: forms.py:313 models.py:115 msgid "Prescription on geoarchaeological context" msgstr "Prescription sur un contexte géoarchéologique" -#: forms.py:301 forms.py:322 models.py:91 +#: forms.py:316 forms.py:337 models.py:91 msgid "Towns" msgstr "Communes" -#: forms.py:327 models.py:326 models.py:359 +#: forms.py:342 models.py:338 models.py:383 #: templates/ishtar/sheet_operation.html:127 #: templates/ishtar/sheet_operation.html:154 msgid "Parcel" msgstr "Parcelle" -#: forms.py:353 forms.py:367 models.py:56 +#: forms.py:368 forms.py:382 models.py:56 msgid "Remain types" msgstr "Types de vestige" -#: forms.py:356 models.py:55 +#: forms.py:371 models.py:55 msgid "Remain type" msgstr "Type de vestige" -#: forms.py:363 +#: forms.py:378 msgid "There are identical remain types" msgstr "Il y a des types de vestige identiques." -#: forms.py:373 +#: forms.py:388 msgid "Period" msgstr "Période" -#: forms.py:380 +#: forms.py:395 msgid "There are identical periods" msgstr "Il y a des périodes identiques." -#: forms.py:388 +#: forms.py:403 msgid "Would you like to close this operation?" msgstr "Voulez vous clore cette opération ?" -#: forms.py:392 +#: forms.py:407 msgid "Would you like to delete this operation?" msgstr "Voulez vous supprimer cette opération ?" -#: forms.py:400 models.py:253 +#: forms.py:415 models.py:261 msgid "Index" msgstr "Index" -#: forms.py:423 +#: forms.py:438 #, python-format msgid "" "Index already exist for operation: %(operation)s - use a value bigger than " @@ -254,52 +258,52 @@ msgstr "" "Cet index existe déjà pour l'opération : %(operation)s, utilisez une valeur " "plus grande que %(last_val)d" -#: forms.py:434 +#: forms.py:449 msgid "Operation's town" msgstr "Commune de l'opération" -#: forms.py:437 +#: forms.py:452 msgid "Operation's year" msgstr "Année de l'opération" -#: forms.py:448 +#: forms.py:463 msgid "Documentation search" msgstr "Recherche de document" -#: forms.py:450 +#: forms.py:465 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: forms.py:458 forms.py:488 models.py:264 models.py:272 +#: forms.py:473 forms.py:503 models.py:272 models.py:280 msgid "Act type" msgstr "Type d'acte" -#: forms.py:468 +#: forms.py:483 msgid "Administrative act search" msgstr "Recherche d'actes administratifs" -#: forms.py:480 +#: forms.py:495 msgid "You should select an administrative act." msgstr "Vous devez sélectionner un acte administratif." -#: forms.py:489 models.py:280 +#: forms.py:504 models.py:289 msgid "Signatory" msgstr "Signataire" -#: forms.py:493 models.py:289 +#: forms.py:508 models.py:298 msgid "Object" msgstr "Objet" -#: forms.py:495 models.py:287 +#: forms.py:510 models.py:296 msgid "Signature date" msgstr "Date de signature" -#: forms.py:509 +#: forms.py:524 msgid "Would you like to delete this administrative act?" msgstr "Voulez vous supprimer cet acte administratif ?" -#: ishtar_menu.py:27 models.py:124 models.py:240 models.py:251 models.py:259 -#: models.py:282 models.py:318 +#: ishtar_menu.py:27 models.py:131 models.py:248 models.py:259 models.py:267 +#: models.py:291 models.py:330 msgid "Operation" msgstr "Opération" @@ -323,7 +327,7 @@ msgstr "Clotûre" msgid "Deletion" msgstr "Suppression" -#: ishtar_menu.py:50 models.py:295 +#: ishtar_menu.py:50 models.py:305 msgid "Administrative act" msgstr "Acte administratif" @@ -343,7 +347,7 @@ msgstr "Tableau de bord" msgid "General informations" msgstr "Informations générales" -#: ishtar_menu.py:93 models.py:125 +#: ishtar_menu.py:93 models.py:132 #: templates/ishtar/dashboards/dashboard_operation.html:9 msgid "Operations" msgstr "Opérations" @@ -360,7 +364,7 @@ msgstr "Types d'opération" msgid "Order" msgstr "Ordre" -#: models.py:61 models.py:361 +#: models.py:61 models.py:385 msgid "End date" msgstr "Date de fin" @@ -380,7 +384,7 @@ msgstr "Types de période" msgid "Closing date" msgstr "Date de clotûre" -#: models.py:86 models.py:316 +#: models.py:86 models.py:328 msgid "File" msgstr "Dossier" @@ -388,118 +392,126 @@ msgstr "Dossier" msgid "Surface (m²)" msgstr "Area (m²)" -#: models.py:127 +#: models.py:134 +msgid "Can view all Operation" +msgstr "Peut voir toutes les Opérations" + +#: models.py:135 msgid "Can view own Operation" msgstr "Peut voir sa propre Opération" -#: models.py:128 +#: models.py:136 msgid "Can add own Operation" msgstr "Peut ajouter sa propre Opération" -#: models.py:129 +#: models.py:137 msgid "Can change own Operation" msgstr "Peut changer sa propre Opération" -#: models.py:130 +#: models.py:138 msgid "Can delete own Operation" msgstr "Peut supprimer sa propre Opération" -#: models.py:134 +#: models.py:142 msgid "Intercommunal" msgstr "Intercommunal" -#: models.py:181 +#: models.py:189 msgid "This operation code already exists for this year" msgstr "Cet code d'opération existe déjà pour cette année." -#: models.py:241 templates/ishtar/dashboards/dashboard_operation.html:273 +#: models.py:249 templates/ishtar/dashboards/dashboard_operation.html:273 #: templates/ishtar/dashboards/dashboard_operation.html:286 #: templates/ishtar/dashboards/dashboard_operation.html:456 #: templates/ishtar/dashboards/dashboard_operation.html:469 msgid "Department" msgstr "Département" -#: models.py:249 +#: models.py:257 msgid "Operation documentation" msgstr "Documentation d'une opération" -#: models.py:250 +#: models.py:258 msgid "Operation documentations" msgstr "Documentations des opérations" -#: models.py:261 +#: models.py:269 msgid "Intended to" msgstr "Destiné à" -#: models.py:265 +#: models.py:273 msgid "Act types" msgstr "Types d'acte" -#: models.py:276 +#: models.py:284 msgid "Archaeological preventive operator" msgstr "Opérateur d'archéologie préventive" -#: models.py:278 +#: models.py:287 msgid "Person in charge of the scientific part" msgstr "Responsable scientifique" -#: models.py:296 templates/ishtar/sheet_operation.html:80 +#: models.py:306 templates/ishtar/sheet_operation.html:80 msgid "Administrative acts" msgstr "Actes administratifs" -#: models.py:299 +#: models.py:309 +msgid "Can view all Administrative act" +msgstr "Peut voir tout les Actes administratifs" + +#: models.py:311 msgid "Can view own Administrative act" msgstr "Peut voir son propre Acte administratif" -#: models.py:301 +#: models.py:313 msgid "Can add own Administrative act" msgstr "Peut ajouter son propre Acte administratif" -#: models.py:303 +#: models.py:315 msgid "Can change own Administrative act" msgstr "Peut changer son propre Acte administratif" -#: models.py:305 +#: models.py:317 msgid "Can delete own Administrative act" msgstr "Peut supprimer son propre Acte administratif" -#: models.py:358 +#: models.py:382 msgid "Owner" msgstr "Propriétaire" -#: models.py:364 +#: models.py:388 msgid "Parcel owner" msgstr "Propriétaire de parcelle" -#: models.py:365 +#: models.py:389 msgid "Parcel owners" msgstr "Propriétaires de parcelle" -#: models.py:389 +#: models.py:413 msgid "Recorded" msgstr "Enregistré" -#: models.py:390 +#: models.py:414 msgid "Effective" msgstr "Effectif" -#: models.py:391 +#: models.py:415 msgid "Active" msgstr "Actif" -#: models.py:392 +#: models.py:416 msgid "Field completed" msgstr "Terrain achevé" -#: models.py:393 +#: models.py:417 msgid "Associated report" msgstr "Rapport associé" -#: models.py:394 +#: models.py:418 msgid "Closed" msgstr "Fermé" -#: models.py:395 +#: models.py:419 msgid "Documented and closed" msgstr "Documenté et clôt" @@ -785,8 +797,9 @@ msgid "Material type" msgstr "Type de matériau" #: templates/ishtar/sheet_operation.html:149 +msgctxt "short" msgid "Context record" -msgstr "Unité d'Enregistrement" +msgstr "UE" #: templates/ishtar/sheet_operation.html:152 msgid "Weight" -- cgit v1.2.3 From 87f02bed4a257e0ac5c92ce7df7f39234d42ce61 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Jul 2013 01:15:27 +0200 Subject: Update french translation --- .../locale/fr/LC_MESSAGES/django.po | 4 ++-- .../locale/fr/LC_MESSAGES/django.po | 26 +++++++++++++--------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/archaeological_finds/locale/fr/LC_MESSAGES/django.po b/archaeological_finds/locale/fr/LC_MESSAGES/django.po index 40c7acd6e..a0f7245a4 100644 --- a/archaeological_finds/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_finds/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 01:03+0200\n" +"POT-Creation-Date: 2013-07-17 01:13+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks \n" "Language-Team: \n" @@ -185,7 +185,7 @@ msgstr "Suppression" #: models.py:35 msgid "Code" -msgstr "" +msgstr "Code" #: models.py:36 msgid "Recommendation" diff --git a/archaeological_operations/locale/fr/LC_MESSAGES/django.po b/archaeological_operations/locale/fr/LC_MESSAGES/django.po index 67d561394..1f2e7f7e9 100644 --- a/archaeological_operations/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_operations/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-07-17 01:05+0200\n" +"POT-Creation-Date: 2013-07-17 01:14+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks \n" "Language-Team: \n" @@ -70,7 +70,7 @@ msgid "Remains" msgstr "Vestiges" #: forms.py:129 forms.py:385 forms.py:399 models.py:93 -#: templates/ishtar/sheet_operation.html:150 +#: templates/ishtar/sheet_operation.html:151 msgid "Periods" msgstr "Périodes" @@ -213,7 +213,7 @@ msgstr "Communes" #: forms.py:342 models.py:338 models.py:383 #: templates/ishtar/sheet_operation.html:127 -#: templates/ishtar/sheet_operation.html:154 +#: templates/ishtar/sheet_operation.html:155 msgid "Parcel" msgstr "Parcelle" @@ -771,12 +771,12 @@ msgid "Chronology" msgstr "Chronologie" #: templates/ishtar/sheet_operation.html:126 -#: templates/ishtar/sheet_operation.html:151 +#: templates/ishtar/sheet_operation.html:152 msgid "Description" msgstr "Description" #: templates/ishtar/sheet_operation.html:137 -#: templates/ishtar/sheet_operation.html:170 +#: templates/ishtar/sheet_operation.html:172 msgid "Details" msgstr "Détails" @@ -793,31 +793,35 @@ msgid "Find" msgstr "Mobilier" #: templates/ishtar/sheet_operation.html:148 +msgid "Id by material type" +msgstr "Id. par type matériau" + +#: templates/ishtar/sheet_operation.html:149 msgid "Material type" msgstr "Type de matériau" -#: templates/ishtar/sheet_operation.html:149 +#: templates/ishtar/sheet_operation.html:150 msgctxt "short" msgid "Context record" msgstr "UE" -#: templates/ishtar/sheet_operation.html:152 +#: templates/ishtar/sheet_operation.html:153 msgid "Weight" msgstr "Poids" -#: templates/ishtar/sheet_operation.html:153 +#: templates/ishtar/sheet_operation.html:154 msgid "Numbers" msgstr "Nombre" -#: templates/ishtar/sheet_operation.html:174 +#: templates/ishtar/sheet_operation.html:176 msgid "No find associated to context record" msgstr "Pas de mobilier associé à cette Unité d'Enregistrement" -#: templates/ishtar/sheet_operation.html:177 +#: templates/ishtar/sheet_operation.html:179 msgid "No find associated to parcel" msgstr "Pas de mobilier associé à cette parcelle" -#: templates/ishtar/sheet_operation.html:177 +#: templates/ishtar/sheet_operation.html:179 msgid "(no context record)" msgstr "(pas d'Unité d'Enregistrement)" -- cgit v1.2.3 From 29601ea7460e8489426d36fe734bdd81bed11bcc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Jul 2013 01:16:33 +0200 Subject: Better display of finds in sheets --- .../templates/ishtar/sheet_contextrecord.html | 11 ++++++----- archaeological_finds/models.py | 4 ++-- .../templates/ishtar/sheet_operation.html | 4 +++- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index d8e06f022..7fd004362 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -100,8 +100,9 @@ {%trans "Finds"%} {% trans "Find" %} + {% trans "Id by material type" %} {% trans "Material type" %} - {% trans "Context record" %} + {% trans "Context record" context "short"%} {% trans "Periods" %} {% trans "Description" %} {% trans "Weight" %} @@ -111,14 +112,14 @@ {% for find in item.base_finds.all %} - {{ find.full_label }} + {{ find.full_label }} {# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #} {# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #} - {{ find.material_type_label }} + {{ find.material_type_label }} {# Displayed as (Patriarche operation code)-(Record unit label)-(material code)-(Finds label indexed by material type). #} {# or displayed as (Year)-(index)-(Record unit label)-(material code)-(Finds label indexed by material type) #} - - {{find.context_record}} + {{ find.material|default:"" }} + {{find.context_record.label}} {{ find.get_last_find.dating}}{# TODO .all|join:", " ? #} {{ find.get_last_find.description }} {{ find.get_last_find.weight }} diff --git a/archaeological_finds/models.py b/archaeological_finds/models.py index 4d44e67fd..c7ed9083e 100644 --- a/archaeological_finds/models.py +++ b/archaeological_finds/models.py @@ -72,11 +72,11 @@ class BaseFind(BaseHistorizedItem, OwnPerms): return finds and finds[0] def full_label(self): - return self._real_label() or self._temp_label() + return self._real_label() or self._temp_label() or u"" def material_type_label(self): find = self.get_last_find() - finds = [find and unicode(find.material_type) or ''] + finds = [find and find.material_type.code or ''] ope = self.context_record.operation finds += [ope.code_patriarche or \ (unicode(ope.year) + "-" + unicode(ope.operation_code))] diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 3a6a20e74..1e43c7112 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -145,8 +145,9 @@ {%trans "Finds"%} {% trans "Find" %} + {% trans "Id by material type" %} {% trans "Material type" %} - {% trans "Context record" %} + {% trans "Context record" context "short"%} {% trans "Periods" %} {% trans "Description" %} {% trans "Weight" %} @@ -161,6 +162,7 @@ {# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #} {# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #} {{ find.material_type_label }} + {{ find.material|default:"" }} {{find.context_record.label}} {{ find.get_last_find.dating}}{# TODO .all|join:", " ? #} {{ find.get_last_find.description }} -- cgit v1.2.3 From 06824fcb9a58226cb017ae5104aefa48874754f6 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Jul 2013 01:26:58 +0200 Subject: Update french translation --- .../locale/fr/LC_MESSAGES/django.po | 332 +++++++++++++++++---- 1 file changed, 280 insertions(+), 52 deletions(-) diff --git a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po b/archaeological_context_records/locale/fr/LC_MESSAGES/django.po index e456b0d52..741d61ee4 100644 --- a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_context_records/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: alpha\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-22 00:33+0200\n" +"POT-Creation-Date: 2013-07-17 01:20+0200\n" "PO-Revision-Date: 2010-12-09\n" "Last-Translator: Étienne Loks \n" "Language-Team: \n" @@ -22,7 +22,7 @@ msgstr "" msgid "Year" msgstr "Année" -#: forms.py:47 forms.py:141 models.py:39 +#: forms.py:47 forms.py:149 models.py:39 msgid "Period" msgstr "Période" @@ -30,155 +30,161 @@ msgstr "Période" msgid "Unit type" msgstr "Type d'unité" -#: forms.py:57 forms.py:204 views.py:45 +#: forms.py:49 +msgid "Parcel (section/number)" +msgstr "" + +#: forms.py:65 forms.py:212 views.py:48 msgid "Context record search" msgstr "Recherche d'Unité d'Enregistrement" -#: forms.py:69 +#: forms.py:77 msgid "You should at least select one context record." msgstr "Vous devez sélectionner au moins une Unité d'Enregistrement." -#: forms.py:75 +#: forms.py:83 msgid "General" msgstr "Général" -#: forms.py:79 models.py:95 +#: forms.py:87 models.py:95 templates/ishtar/sheet_contextrecord.html:110 msgid "Parcel" msgstr "Parcelle" -#: forms.py:80 models.py:99 +#: forms.py:88 models.py:99 msgid "ID" msgstr "Identifiant" -#: forms.py:82 models.py:100 +#: forms.py:90 models.py:100 templates/ishtar/sheet_contextrecord.html:23 +#: templates/ishtar/sheet_contextrecord.html:107 msgid "Description" msgstr "Description" -#: forms.py:84 models.py:101 +#: forms.py:92 models.py:101 msgid "Length (cm)" msgstr "Longueur (cm)" -#: forms.py:85 models.py:102 +#: forms.py:93 models.py:102 msgid "Width (cm)" msgstr "Largeur (cm)" -#: forms.py:86 models.py:103 +#: forms.py:94 models.py:103 msgid "Thickness (cm)" msgstr "Épaisseur (cm)" -#: forms.py:87 models.py:104 +#: forms.py:95 models.py:104 msgid "Depth (cm)" msgstr "Profondeur (cm)" -#: forms.py:88 models.py:109 +#: forms.py:96 models.py:109 msgid "Unit" msgstr "Unité" -#: forms.py:90 models.py:105 +#: forms.py:98 models.py:105 msgid "Location" msgstr "Lieu" -#: forms.py:131 +#: forms.py:139 msgid "This ID already exist for this operation." msgstr "Cet identifiant existe déjà pour cette opération." -#: forms.py:136 forms.py:157 models.py:48 +#: forms.py:144 forms.py:165 models.py:48 msgid "Dating" msgstr "Datation" -#: forms.py:142 models.py:40 +#: forms.py:150 models.py:40 msgid "Start date" msgstr "Date de début" -#: forms.py:143 models.py:41 +#: forms.py:151 models.py:41 msgid "End date" msgstr "Date de fin" -#: forms.py:144 models.py:44 +#: forms.py:152 models.py:44 msgid "Quality" msgstr "Qualité" -#: forms.py:146 models.py:30 models.py:42 +#: forms.py:154 models.py:30 models.py:42 msgid "Dating type" msgstr "Type de datation" -#: forms.py:160 forms.py:167 models.py:114 +#: forms.py:168 forms.py:175 models.py:114 +#: templates/ishtar/sheet_contextrecord.html:32 msgid "Interpretation" msgstr "Interpretation" -#: forms.py:163 +#: forms.py:171 msgid "Has furniture?" msgstr "A du matériel ?" -#: forms.py:165 models.py:113 +#: forms.py:173 models.py:113 msgid "Filling" msgstr "Remplissage" -#: forms.py:169 models.py:129 +#: forms.py:177 models.py:129 msgid "Activity" msgstr "Activité" -#: forms.py:171 models.py:127 +#: forms.py:179 models.py:127 msgid "Identification" msgstr "Identification" -#: forms.py:173 models.py:116 +#: forms.py:181 models.py:116 msgid "TAQ" msgstr "TAQ" -#: forms.py:174 models.py:119 +#: forms.py:182 models.py:119 msgid "Estimated TAQ" msgstr "TAQ estimé" -#: forms.py:176 models.py:121 +#: forms.py:184 models.py:121 msgid "TPQ" msgstr "TPQ" -#: forms.py:177 models.py:124 +#: forms.py:185 models.py:124 msgid "Estimated TPQ" msgstr "TPQ estimé" -#: forms.py:190 +#: forms.py:198 msgid "Operation search" msgstr "Recherche d'opérations" -#: forms.py:192 +#: forms.py:200 msgid "You should select an operation." msgstr "Vous devez sélectionner une opération." -#: forms.py:197 +#: forms.py:205 msgid "Would you like to delete this context record?" msgstr "Voulez vous supprimer cette Unité d'Enregistrement ?" -#: forms.py:206 +#: forms.py:214 msgid "You should select a context record." msgstr "Vous devez sélectionner une Unité d'Enregistrement." -#: forms.py:210 +#: forms.py:218 msgid "Town of the operation" msgstr "Commune de l'opération" -#: forms.py:212 +#: forms.py:220 msgid "Year of the operation" msgstr "Année de l'opération" -#: forms.py:214 +#: forms.py:222 msgid "Period of the context record" msgstr "Période de l'Unité d'Enregistrement" -#: forms.py:216 +#: forms.py:224 msgid "Unit type of the context record" msgstr "Type d'unité de l'Unité d'Enregistrement" -#: forms.py:229 +#: forms.py:237 msgid "Documentation search" msgstr "Recherche de document" -#: forms.py:231 +#: forms.py:239 msgid "You should select a document." msgstr "Vous devez sélectionner un document." -#: ishtar_menu.py:28 models.py:199 +#: ishtar_menu.py:28 models.py:200 msgid "Context record" msgstr "Unité d'Enregistrement" @@ -286,55 +292,59 @@ msgstr "" msgid "Estimation of a \"Terminus Post Quem\"" msgstr "Estimation d'un « Terminus Post Quem »" -#: models.py:133 models.py:134 +#: models.py:133 models.py:134 templates/ishtar/sheet_contextrecord.html:6 msgid "Context Record" msgstr "Unité d'Enregistrement" #: models.py:136 +msgid "Can view all Context Record" +msgstr "Peut voir toutes les Unités d'Enregistrement" + +#: models.py:137 msgid "Can view own Context Record" msgstr "Peut voir sa propre Unité d'Enregistrement" -#: models.py:137 +#: models.py:138 msgid "Can add own Context Record" msgstr "Peut ajouter sa propre Unité d'Enregistrement" -#: models.py:138 +#: models.py:139 msgid "Can change own Context Record" msgstr "Peut changer sa propre Unité d'Enregistrement" -#: models.py:139 +#: models.py:140 msgid "Can delete own Context Record" msgstr "Peut supprimer sa propre Unité d'Enregistrement" -#: models.py:196 +#: models.py:197 msgid "Context record documentation" msgstr "Documentation d'une Unité d'Enregistrement" -#: models.py:197 +#: models.py:198 msgid "Context record documentations" msgstr "Documentations des Unités d'Enregistrement" -#: views.py:54 +#: views.py:57 msgid "New context record" msgstr "Nouvelle Unité d'Enregistrement" -#: views.py:63 +#: views.py:66 msgid "Context record modification" msgstr "Modification d'une Unité d'Enregistrement" -#: views.py:69 +#: views.py:72 msgid "Context record deletion" msgstr "Suppression d'une Unité d'Enregistrement" -#: views.py:77 +#: views.py:80 msgid "Context record: new source" msgstr "Unité d'Enregistrement : nouvelle documentation associée" -#: views.py:85 +#: views.py:88 msgid "Context record: source modification" msgstr "Unité d'Enregistrement : modification d'une documentation associée" -#: views.py:91 +#: views.py:94 msgid "Context record: source deletion" msgstr "Unité d'Enregistrement : suppression d'une documentation associée" @@ -342,3 +352,221 @@ msgstr "Unité d'Enregistrement : suppression d'une documentation associée" msgid "Current operation: " msgstr "Opération : " +#: templates/ishtar/sheet_contextrecord.html:4 +msgid "Export as:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:4 +msgid "OpenOffice.org file" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:4 +msgid "PDF file" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:9 +msgid "Complete ID:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:11 +#: templates/ishtar/sheet_contextrecord.html:54 +msgid "Patriarche OA code not yet recorded!" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:12 +msgid "Temporary ID:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:16 +#: templates/ishtar/sheet_contextrecord.html:67 +msgid "Type:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:18 +msgid "Chronology:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:19 +msgid "Place:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:20 +msgid "Parcel:" +msgstr "Parcelle :" + +#: templates/ishtar/sheet_contextrecord.html:25 +msgid "Description:" +msgstr "Description :" + +#: templates/ishtar/sheet_contextrecord.html:26 +msgid "Length (cm):" +msgstr "Longueur (cm) :" + +#: templates/ishtar/sheet_contextrecord.html:27 +msgid "Width (cm):" +msgstr "Largeur (cm) :" + +#: templates/ishtar/sheet_contextrecord.html:28 +msgid "Depth (cm):" +msgstr "Profondeur (cm) :" + +#: templates/ishtar/sheet_contextrecord.html:34 +msgid "Activity:" +msgstr "Activité :" + +#: templates/ishtar/sheet_contextrecord.html:35 +msgid "Identification:" +msgstr "Identification :" + +#: templates/ishtar/sheet_contextrecord.html:36 +msgid "Interpretation:" +msgstr "Interpretation :" + +#: templates/ishtar/sheet_contextrecord.html:40 +msgid "Datations" +msgstr "Datations" + +#: templates/ishtar/sheet_contextrecord.html:41 +msgid "TAQ:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:42 +msgid "TAQ estimated:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:43 +msgid "TPQ:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:44 +msgid "TPQ estimated:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:48 +msgid "Operation resume" +msgstr "Résumé de l'opération" + +#: templates/ishtar/sheet_contextrecord.html:49 +msgid "Year:" +msgstr "Année :" + +#: templates/ishtar/sheet_contextrecord.html:50 +msgid "Numerical reference:" +msgstr "Référence numérique :" + +#: templates/ishtar/sheet_contextrecord.html:52 +msgid "Patriarche OA code:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:57 +msgid "Head scientist:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:59 +msgid "State:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:61 +msgid "Active file" +msgstr "Dossier actif" + +#: templates/ishtar/sheet_contextrecord.html:63 +msgid "Closed operation" +msgstr "Opération fermée" + +#: templates/ishtar/sheet_contextrecord.html:64 +msgid "Closing date:" +msgstr "Date de clotûre :" + +#: templates/ishtar/sheet_contextrecord.html:65 +msgid "by" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:68 +msgid "Remains:" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:69 +msgid "Periods:" +msgstr "Périodes :" + +#: templates/ishtar/sheet_contextrecord.html:70 +msgid "Comment:" +msgstr "Commentaires :" + +#: templates/ishtar/sheet_contextrecord.html:71 +msgid "Localisation" +msgstr "Lieu" + +#: templates/ishtar/sheet_contextrecord.html:72 +msgid "Towns:" +msgstr "Villes :" + +#: templates/ishtar/sheet_contextrecord.html:73 +msgid "Related operation:" +msgstr "Opération associée :" + +#: templates/ishtar/sheet_contextrecord.html:76 +msgid "No operation linked to this context unit!" +msgstr "" + +#: templates/ishtar/sheet_contextrecord.html:80 +msgid "Documents" +msgstr "Documentation" + +#: templates/ishtar/sheet_contextrecord.html:82 +msgid "Title" +msgstr "Titre" + +#: templates/ishtar/sheet_contextrecord.html:83 +msgid "Type" +msgstr "Type" + +#: templates/ishtar/sheet_contextrecord.html:84 +msgid "Authors" +msgstr "Auteurs" + +#: templates/ishtar/sheet_contextrecord.html:95 +msgid "No document associated to this context record" +msgstr "Pas de document assocuée à cette Unité d'Enregistrement" + +#: templates/ishtar/sheet_contextrecord.html:100 +msgid "Finds" +msgstr "Mobilier" + +#: templates/ishtar/sheet_contextrecord.html:102 +msgid "Find" +msgstr "Mobilier" + +#: templates/ishtar/sheet_contextrecord.html:103 +msgid "Id by material type" +msgstr "Id. par type matériau" + +#: templates/ishtar/sheet_contextrecord.html:104 +msgid "Material type" +msgstr "Type de matériau" + +#: templates/ishtar/sheet_contextrecord.html:105 +msgctxt "short" +msgid "Context record" +msgstr "UE" + +#: templates/ishtar/sheet_contextrecord.html:106 +msgid "Periods" +msgstr "Périodes" + +#: templates/ishtar/sheet_contextrecord.html:108 +msgid "Weight" +msgstr "Poids" + +#: templates/ishtar/sheet_contextrecord.html:109 +msgid "Numbers" +msgstr "Nombre" + +#: templates/ishtar/sheet_contextrecord.html:128 +msgid "Details" +msgstr "Détails" + +#: templates/ishtar/sheet_contextrecord.html:132 +msgid "No find associated to this context record" +msgstr "Pas de mobilier associé à cette Unité d'Enregistrement" -- cgit v1.2.3