Changeset 305d2e3

Timestamp:

05/25/12 16:36:58 (12 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, dev2, diadems, generic, lam, nlivemulti, release/1.4.4, storage

Children:

24b54bd

Parents:

d7de29b

git-author:

yomguy <yomguy@…> (05/25/12 16:36:58)

git-committer:

yomguy <yomguy@…> (05/25/12 16:36:58)

Message:

reorganize many models, add various item fields, add enums, add migr and trans

Location:

telemeta

Files:

• admin.py (modified) (1 diff)
• locale/de/LC_MESSAGES/django.mo (modified) (previous)
• locale/de/LC_MESSAGES/django.po (modified) (19 diffs)
• locale/de/LC_MESSAGES/djangojs.mo (modified) (previous)
• locale/de/LC_MESSAGES/djangojs.po (modified) (1 diff)
• locale/fr/LC_MESSAGES/django.mo (modified) (previous)
• locale/fr/LC_MESSAGES/django.po (modified) (19 diffs)
• locale/fr/LC_MESSAGES/djangojs.mo (modified) (previous)
• locale/fr/LC_MESSAGES/djangojs.po (modified) (1 diff)
• migrations/0018_auto__del_originallocation__add_organization__add_rights__add_field_me.py (added)
• models/enum.py (modified) (1 diff)
• models/format.py (modified) (1 diff)
• models/language.py (modified) (1 diff)
• models/location.py (modified) (10 diffs)
• models/media.py (modified) (2 diffs)

telemeta/admin.py

@@ -100 +100 @@
 
 admin.site.register(Location, LocationAdmin)
-#admin.site.register(LocationType)
+admin.site.register(LocationType)
 admin.site.register(LocationAlias, LocationAliasAdmin)
 admin.site.register(LocationRelation, LocationRelationAdmin)

telemeta/locale/de/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-24 15:16+0200\n"
+"POT-Creation-Date: 2012-05-25 16:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -27 +27 @@
 msgstr ""
 
-#: models/enum.py:41 models/enum.py:139 models/media.py:475
+#: models/enum.py:41 models/enum.py:139 models/media.py:489
 #: models/system.py:103
 msgid "value"
@@ -64 +64 @@
 msgstr ""
 
-#: models/enum.py:113 models/media.py:335
+#: models/enum.py:113 models/media.py:339
 msgid "vernacular style"
 msgstr ""
 
-#: models/enum.py:120 models/media.py:337
+#: models/enum.py:120 models/media.py:341
 msgid "generic style"
 msgstr ""
 
-#: models/enum.py:127 models/media.py:446
+#: models/enum.py:127 models/media.py:460
 msgid "keyword"
 msgstr ""
@@ -84 +84 @@
 msgstr ""
 
-#: models/enum.py:153 models/enum.py:157 models/media.py:325
+#: models/enum.py:153 models/enum.py:157 models/media.py:329
 msgid "population / social group"
 msgstr ""
@@ -90 +90 @@
 #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
 #: models/language.py:54 models/location.py:51 models/location.py:158
-#: models/media.py:474
+#: models/media.py:488
 msgid "name"
 msgstr ""
 
-#: models/enum.py:172 models/format.py:74
+#: models/enum.py:172 models/format.py:75
 msgid "tape wheel diameter (cm)"
 msgstr ""
@@ -106 +106 @@
 msgstr ""
 
-#: models/enum.py:193 models/format.py:77
+#: models/enum.py:193 models/format.py:78
 msgid "tape speed (m/s)"
 msgstr ""
 
-#: models/enum.py:200 models/format.py:79
+#: models/enum.py:200 models/format.py:80
 msgid "tape vendor"
 msgstr ""
 
-#: models/enum.py:207 models/format.py:68
+#: models/enum.py:207 models/format.py:69
 msgid "number of channels"
 msgstr ""
 
-#: models/enum.py:214 models/format.py:66
-msgid "original location"
-msgstr ""
-
-#: models/format.py:56 models/media.py:376 models/media.py:435
-#: models/media.py:445 models/media.py:456 models/media.py:472
-#: models/media.py:493 models/media.py:539 models/media.py:560
+#: models/enum.py:214 models/media.py:346
+msgid "organization"
+msgstr ""
+
+#: models/enum.py:221 models/media.py:350
+msgid "rights"
+msgstr ""
+
+#: models/format.py:56 models/media.py:390 models/media.py:449
+#: models/media.py:459 models/media.py:470 models/media.py:486
+#: models/media.py:507 models/media.py:553 models/media.py:574
 msgid "item"
 msgstr ""
@@ -132 +136 @@
 msgstr ""
 
-#: models/format.py:60
+#: models/format.py:60 models/media.py:354
 msgid "original code"
 msgstr ""
@@ -152 +156 @@
 msgstr ""
 
-#: models/format.py:69
+#: models/format.py:66
+msgid "original location"
+msgstr ""
+
+#: models/format.py:70
 msgid "audio quality"
 msgstr ""
 
-#: models/format.py:70
+#: models/format.py:71
 msgid "recording system"
 msgstr ""
 
-#: models/format.py:75
+#: models/format.py:76
 msgid "tape thickness (um)"
 msgstr ""
 
-#: models/format.py:80
+#: models/format.py:81
 msgid "tape reference"
 msgstr ""
 
-#: models/format.py:81
+#: models/format.py:82
 msgid "sticker presence"
 msgstr ""
 
-#: models/format.py:85
+#: models/format.py:86
 msgid "format"
 msgstr ""
@@ -188 +196 @@
 msgstr ""
 
-#: models/instrument.py:80 models/location.py:170
+#: models/instrument.py:80 models/location.py:171
 msgid "alias"
 msgstr ""
@@ -220 +228 @@
 msgstr ""
 
+#: models/language.py:63
+msgid "languages"
+msgstr ""
+
 #: models/location.py:49
 msgid "country"
@@ -240 +252 @@
 msgstr ""
 
-#: models/location.py:58 models/location.py:171 models/location.py:187
+#: models/location.py:58 models/location.py:172 models/location.py:188
 msgid "authoritative"
 msgstr ""
 
-#: models/location.py:112 models/location.py:169 models/location.py:184
-#: models/media.py:321
+#: models/location.py:112 models/location.py:170 models/location.py:185
+#: models/media.py:325
 msgid "location"
 msgstr ""
@@ -253 +265 @@
 msgstr ""
 
-#: models/location.py:179
+#: models/location.py:166
+msgid "lieux types"
+msgstr ""
+
+#: models/location.py:180
 msgid "location aliases"
 msgstr ""
 
-#: models/location.py:185
+#: models/location.py:186
 msgid "ancestor location"
+msgstr ""
+
+#: models/location.py:194
+msgid "location relations"
 msgstr ""
 
@@ -274 +294 @@
 
 #: models/media.py:77 models/media.py:97 models/media.py:193
-#: models/media.py:352
+#: models/media.py:347
 msgid "public access"
 msgstr ""
 
 #: models/media.py:93 models/media.py:123 models/media.py:171
-#: models/media.py:312 models/media.py:494 models/media.py:510
-#: models/media.py:542
+#: models/media.py:312 models/media.py:508 models/media.py:524
+#: models/media.py:556
 msgid "title"
 msgstr ""
 
-#: models/media.py:94 models/media.py:125 models/media.py:511
-#: models/media.py:544
+#: models/media.py:94 models/media.py:125 models/media.py:525
+#: models/media.py:558
 msgid "description"
 msgstr ""
 
-#: models/media.py:95 models/media.py:218 models/media.py:346
+#: models/media.py:95 models/media.py:218 models/media.py:353
 msgid "code"
 msgstr ""
 
-#: models/media.py:96 models/media.py:170 models/media.py:349
+#: models/media.py:96 models/media.py:170
 msgid "reference"
 msgstr ""
 
-#: models/media.py:124 models/media.py:543 models/media.py:562
+#: models/media.py:124 models/media.py:557 models/media.py:576
 #: models/system.py:115
 msgid "date"
 msgstr ""
 
-#: models/media.py:126 models/media.py:561
+#: models/media.py:126 models/media.py:575
 msgid "mime_type"
 msgstr ""
@@ -314 +334 @@
 msgstr ""
 
-#: models/media.py:129 models/media.py:354
+#: models/media.py:129 models/media.py:368
 msgid "file"
 msgstr ""
@@ -326 +346 @@
 msgstr ""
 
-#: models/media.py:176 models/media.py:644
+#: models/media.py:176 models/media.py:658
 msgid "recording year (from)"
 msgstr ""
 
-#: models/media.py:177 models/media.py:645
+#: models/media.py:177 models/media.py:659
 msgid "recording year (until)"
 msgstr ""
@@ -338 +358 @@
 msgstr ""
 
-#: models/media.py:184 models/media.py:314
+#: models/media.py:184 models/media.py:356
 msgid "recordist"
 msgstr ""
@@ -394 +414 @@
 msgstr ""
 
-#: models/media.py:219 models/media.py:347
+#: models/media.py:219
 msgid "old code"
 msgstr ""
 
-#: models/media.py:220 models/media.py:357
+#: models/media.py:220 models/media.py:371
 msgid "approximative duration"
 msgstr ""
@@ -426 +446 @@
 msgstr ""
 
-#: models/media.py:284 models/media.py:402
+#: models/media.py:284 models/media.py:416
 msgid "computed duration"
 msgstr ""
 
-#: models/media.py:292 models/media.py:298 models/media.py:316
+#: models/media.py:292 models/media.py:298 models/media.py:315
 msgid "collection"
 msgstr ""
@@ -438 +458 @@
 msgstr ""
 
+#: models/media.py:316
+msgid "recording date (from)"
+msgstr ""
+
 #: models/media.py:317
-msgid "recording date (from)"
-msgstr ""
-
-#: models/media.py:318
 msgid "recording date (until)"
 msgstr ""
 
+#: models/media.py:319
+msgid "scientist"
+msgstr ""
+
+#: models/media.py:320
+msgid "domain"
+msgstr ""
+
+#: models/media.py:321
+msgid "summary"
+msgstr ""
+
 #: models/media.py:322
+msgid "remarks"
+msgstr ""
+
+#: models/media.py:326
 msgid "location details"
 msgstr ""
 
-#: models/media.py:323
+#: models/media.py:327
 msgid "cultural area"
 msgstr ""
 
-#: models/media.py:326
+#: models/media.py:330
 msgid "language"
 msgstr ""
 
-#: models/media.py:328
+#: models/media.py:332
 msgid "ISO language"
 msgstr ""
 
-#: models/media.py:330
+#: models/media.py:334
 msgid "comments / ethnographic context"
 msgstr ""
 
-#: models/media.py:331
+#: models/media.py:335
 msgid "moda_execut"
 msgstr ""
 
-#: models/media.py:338
+#: models/media.py:342
 msgid "author / compositor"
 msgstr ""
 
-#: models/media.py:341
-msgid "remarks"
-msgstr ""
-
-#: models/media.py:342
-msgid "recordist selection"
-msgstr ""
-
 #: models/media.py:343
-msgid "recordist as in collection"
-msgstr ""
-
-#: models/media.py:348
+msgid "contributor"
+msgstr ""
+
+#: models/media.py:349
+msgid "depositor"
+msgstr ""
+
+#: models/media.py:355
 msgid "item number"
 msgstr ""
 
-#: models/media.py:350
+#: models/media.py:357
+msgid "digitalist"
+msgstr ""
+
+#: models/media.py:358
+msgid "collector"
+msgstr ""
+
+#: models/media.py:359
+msgid "collector selection"
+msgstr ""
+
+#: models/media.py:360
+msgid "collector as in collection"
+msgstr ""
+
+#: models/media.py:361
+msgid "digitization date"
+msgstr ""
+
+#: models/media.py:362
+msgid "publishing date"
+msgstr ""
+
+#: models/media.py:363
+msgid "creator reference"
+msgstr ""
+
+#: models/media.py:364
 msgid "published references"
 msgstr ""
 
-#: models/media.py:351
+#: models/media.py:365
 msgid "copy of"
 msgstr ""
 
-#: models/media.py:364 templates/telemeta/mediaitem_edit.html:41
+#: models/media.py:378 templates/telemeta/mediaitem_edit.html:41
 msgid "keywords"
 msgstr ""
 
-#: models/media.py:429
+#: models/media.py:443
 msgid "instruments"
 msgstr ""
 
-#: models/media.py:439 models/media.py:440
+#: models/media.py:453 models/media.py:454
 msgid "item related media"
 msgstr ""
 
-#: models/media.py:458
+#: models/media.py:472
 msgid "composition"
 msgstr ""
 
-#: models/media.py:460
+#: models/media.py:474
 msgid "vernacular name"
 msgstr ""
 
-#: models/media.py:461
+#: models/media.py:475
 msgid "number"
 msgstr ""
 
-#: models/media.py:462
+#: models/media.py:476
 msgid "interprets"
 msgstr ""
 
-#: models/media.py:473
+#: models/media.py:487
 msgid "id"
 msgstr ""
 
-#: models/media.py:476
+#: models/media.py:490
 msgid "unit"
 msgstr ""
 
-#: models/media.py:495
+#: models/media.py:509
 msgid "start"
 msgstr ""
 
-#: models/media.py:496
+#: models/media.py:510
 msgid "end"
 msgstr ""
 
-#: models/media.py:500
+#: models/media.py:514
 msgid "item part"
 msgstr ""
 
-#: models/media.py:508 models/media.py:525 models/media.py:540
+#: models/media.py:522 models/media.py:539 models/media.py:554
 msgid "public_id"
 msgstr ""
 
-#: models/media.py:526
+#: models/media.py:540
 msgid "playlist"
 msgstr ""
 
-#: models/media.py:527
+#: models/media.py:541
 msgid "resource_type"
 msgstr ""
 
-#: models/media.py:528
+#: models/media.py:542
 msgid "resource_id"
 msgstr ""
 
-#: models/media.py:541 models/system.py:55
+#: models/media.py:555 models/system.py:55
 msgid "time"
 msgstr ""
 
-#: models/media.py:545
+#: models/media.py:559
 msgid "author"
 msgstr ""
 
-#: models/media.py:563
+#: models/media.py:577
 msgid "transcoded"
 msgstr ""
 
-#: models/media.py:643
+#: models/media.py:657
 msgid "collections"
 msgstr ""
 
-#: models/media.py:655 models/media.py:656 models/media.py:666
-#: models/media.py:683
+#: models/media.py:669 models/media.py:670 models/media.py:680
+#: models/media.py:697
 msgid "corpus"
 msgstr ""
 
-#: models/media.py:676 models/media.py:677 models/media.py:694
+#: models/media.py:690 models/media.py:691 models/media.py:708
 msgid "fonds"
 msgstr ""
 
-#: models/media.py:687 models/media.py:688
+#: models/media.py:701 models/media.py:702
 msgid "corpus related media"
 msgstr ""
 
-#: models/media.py:698 models/media.py:699
+#: models/media.py:712 models/media.py:713
 msgid "fonds related media"
 msgstr ""

telemeta/locale/de/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-24 15:16+0200\n"
+"POT-Creation-Date: 2012-05-25 16:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

telemeta/locale/fr/LC_MESSAGES/django.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-24 15:16+0200\n"
+"POT-Creation-Date: 2012-05-25 16:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
@@ -26 +26 @@
 msgstr "Entrez une durée valide au format HH:MM[:ss]"
 
-#: models/enum.py:41 models/enum.py:139 models/media.py:475
+#: models/enum.py:41 models/enum.py:139 models/media.py:489
 #: models/system.py:103
 msgid "value"
@@ -61 +61 @@
 #: models/enum.py:106
 msgid "A/D conversion"
-msgstr ""
-
-#: models/enum.py:113 models/media.py:335
+msgstr "Conversion A/N"
+
+#: models/enum.py:113 models/media.py:339
 msgid "vernacular style"
 msgstr "style vernaculaire"
 
-#: models/enum.py:120 models/media.py:337
+#: models/enum.py:120 models/media.py:341
 msgid "generic style"
 msgstr "style générique"
 
-#: models/enum.py:127 models/media.py:446
+#: models/enum.py:127 models/media.py:460
 msgid "keyword"
 msgstr "Mot-clé"
@@ -83 +83 @@
 msgstr "éditeur"
 
-#: models/enum.py:153 models/enum.py:157 models/media.py:325
+#: models/enum.py:153 models/enum.py:157 models/media.py:329
 msgid "population / social group"
 msgstr "population / groupe social"
@@ -89 +89 @@
 #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53
 #: models/language.py:54 models/location.py:51 models/location.py:158
-#: models/media.py:474
+#: models/media.py:488
 msgid "name"
 msgstr "nom"
 
-#: models/enum.py:172 models/format.py:74
+#: models/enum.py:172 models/format.py:75
 msgid "tape wheel diameter (cm)"
 msgstr "diamètre de moyeu de bande (cm)"
@@ -105 +105 @@
 msgstr "largeur de bande (pouce)"
 
-#: models/enum.py:193 models/format.py:77
+#: models/enum.py:193 models/format.py:78
 msgid "tape speed (m/s)"
 msgstr "vitesse de bande (m/s)"
 
-#: models/enum.py:200 models/format.py:79
+#: models/enum.py:200 models/format.py:80
 msgid "tape vendor"
 msgstr "marque de bande"
 
-#: models/enum.py:207 models/format.py:68
+#: models/enum.py:207 models/format.py:69
 msgid "number of channels"
 msgstr "Nombre de pistes"
 
-#: models/enum.py:214 models/format.py:66
-msgid "original location"
-msgstr "lieu d'archivage"
-
-#: models/format.py:56 models/media.py:376 models/media.py:435
-#: models/media.py:445 models/media.py:456 models/media.py:472
-#: models/media.py:493 models/media.py:539 models/media.py:560
+#: models/enum.py:214 models/media.py:346
+msgid "organization"
+msgstr "organisation"
+
+#: models/enum.py:221 models/media.py:350
+msgid "rights"
+msgstr "droits"
+
+#: models/format.py:56 models/media.py:390 models/media.py:449
+#: models/media.py:459 models/media.py:470 models/media.py:486
+#: models/media.py:507 models/media.py:553 models/media.py:574
 msgid "item"
 msgstr "item"
@@ -131 +135 @@
 msgstr "nature du support original"
 
-#: models/format.py:60
+#: models/format.py:60 models/media.py:354
 msgid "original code"
 msgstr "cote originale"
@@ -151 +155 @@
 msgstr "commentaires / notes"
 
-#: models/format.py:69
+#: models/format.py:66
+msgid "original location"
+msgstr "lieu d'archivage"
+
+#: models/format.py:70
 msgid "audio quality"
 msgstr "qualité audio"
 
-#: models/format.py:70
+#: models/format.py:71
 msgid "recording system"
 msgstr "système d'enregistrement"
 
-#: models/format.py:75
+#: models/format.py:76
 msgid "tape thickness (um)"
 msgstr "épaisseur de bande (um)"
 
-#: models/format.py:80
+#: models/format.py:81
 msgid "tape reference"
 msgstr "référence de bande"
 
-#: models/format.py:81
+#: models/format.py:82
 msgid "sticker presence"
 msgstr "présence de collants"
 
-#: models/format.py:85
+#: models/format.py:86
 msgid "format"
 msgstr "format"
@@ -187 +195 @@
 msgstr "instrument parent"
 
-#: models/instrument.py:80 models/location.py:170
+#: models/instrument.py:80 models/location.py:171
 msgid "alias"
 msgstr "alias"
@@ -219 +227 @@
 msgstr "commentaire"
 
+#: models/language.py:63
+msgid "languages"
+msgstr "langues"
+
 #: models/location.py:49
 msgid "country"
@@ -239 +251 @@
 msgstr "lieu actuel"
 
-#: models/location.py:58 models/location.py:171 models/location.py:187
+#: models/location.py:58 models/location.py:172 models/location.py:188
 msgid "authoritative"
 msgstr "officiel"
 
-#: models/location.py:112 models/location.py:169 models/location.py:184
-#: models/media.py:321
+#: models/location.py:112 models/location.py:170 models/location.py:185
+#: models/media.py:325
 msgid "location"
 msgstr "lieu"
@@ -252 +264 @@
 msgstr "lieux"
 
-#: models/location.py:179
+#: models/location.py:166
+#, fuzzy
+msgid "lieux types"
+msgstr "lieux types"
+
+#: models/location.py:180
 msgid "location aliases"
-msgstr "location aliases"
-
-#: models/location.py:185
+msgstr "lieux alias"
+
+#: models/location.py:186
 msgid "ancestor location"
 msgstr "lieu ancêtre"
+
+#: models/location.py:194
+msgid "location relations"
+msgstr "lieux relations"
 
 #: models/media.py:72
@@ -273 +294 @@
 
 #: models/media.py:77 models/media.py:97 models/media.py:193
-#: models/media.py:352
+#: models/media.py:347
 msgid "public access"
 msgstr "accès public"
 
 #: models/media.py:93 models/media.py:123 models/media.py:171
-#: models/media.py:312 models/media.py:494 models/media.py:510
-#: models/media.py:542
+#: models/media.py:312 models/media.py:508 models/media.py:524
+#: models/media.py:556
 msgid "title"
 msgstr "titre"
 
-#: models/media.py:94 models/media.py:125 models/media.py:511
-#: models/media.py:544
+#: models/media.py:94 models/media.py:125 models/media.py:525
+#: models/media.py:558
 msgid "description"
 msgstr "description"
 
-#: models/media.py:95 models/media.py:218 models/media.py:346
+#: models/media.py:95 models/media.py:218 models/media.py:353
 msgid "code"
 msgstr "cote"
 
-#: models/media.py:96 models/media.py:170 models/media.py:349
+#: models/media.py:96 models/media.py:170
 msgid "reference"
 msgstr "référence"
 
-#: models/media.py:124 models/media.py:543 models/media.py:562
+#: models/media.py:124 models/media.py:557 models/media.py:576
 #: models/system.py:115
 msgid "date"
 msgstr ""
 
-#: models/media.py:126 models/media.py:561
+#: models/media.py:126 models/media.py:575
 msgid "mime_type"
 msgstr "type mime"
@@ -313 +334 @@
 msgstr "crédits"
 
-#: models/media.py:129 models/media.py:354
+#: models/media.py:129 models/media.py:368
 msgid "file"
 msgstr "fichier"
@@ -325 +346 @@
 msgstr "déposant / contributeur"
 
-#: models/media.py:176 models/media.py:644
+#: models/media.py:176 models/media.py:658
 msgid "recording year (from)"
 msgstr "année d'enregistrement (depuis)"
 
-#: models/media.py:177 models/media.py:645
+#: models/media.py:177 models/media.py:659
 msgid "recording year (until)"
 msgstr "année d'enregistrement (jusqu'à)"
@@ -337 +358 @@
 msgstr "année de parution"
 
-#: models/media.py:184 models/media.py:314
+#: models/media.py:184 models/media.py:356
 msgid "recordist"
 msgstr "collecteur"
@@ -393 +414 @@
 msgstr "lieu de conservation"
 
-#: models/media.py:219 models/media.py:347
+#: models/media.py:219
 msgid "old code"
 msgstr "ancienne cote"
 
-#: models/media.py:220 models/media.py:357
+#: models/media.py:220 models/media.py:371
 msgid "approximative duration"
 msgstr "durée approximative"
@@ -425 +446 @@
 msgstr "populations / groupes sociaux"
 
-#: models/media.py:284 models/media.py:402
+#: models/media.py:284 models/media.py:416
 msgid "computed duration"
 msgstr "durée calculée"
 
-#: models/media.py:292 models/media.py:298 models/media.py:316
+#: models/media.py:292 models/media.py:298 models/media.py:315
 msgid "collection"
 msgstr "collection"
@@ -437 +458 @@
 msgstr "média associés à la collection"
 
-#: models/media.py:317
+#: models/media.py:316
 msgid "recording date (from)"
 msgstr "date d'enregistrement (depuis)"
 
-#: models/media.py:318
+#: models/media.py:317
 msgid "recording date (until)"
 msgstr "date d'enregistrement (jusqu'à)"
 
+#: models/media.py:319
+msgid "scientist"
+msgstr "reponsable scientifique"
+
+#: models/media.py:320
+msgid "domain"
+msgstr "discipline"
+
+#: models/media.py:321
+msgid "summary"
+msgstr "résumé"
+
 #: models/media.py:322
+msgid "remarks"
+msgstr "remarques"
+
+#: models/media.py:326
 msgid "location details"
 msgstr "précisions lieu"
 
-#: models/media.py:323
+#: models/media.py:327
 msgid "cultural area"
 msgstr "aire culturelle"
 
-#: models/media.py:326
+#: models/media.py:330
 msgid "language"
 msgstr "langue"
 
-#: models/media.py:328
+#: models/media.py:332
 msgid "ISO language"
 msgstr "Langue ISO"
 
-#: models/media.py:330
+#: models/media.py:334
 msgid "comments / ethnographic context"
 msgstr "commentaires / contexte ethnographique"
 
-#: models/media.py:331
+#: models/media.py:335
 msgid "moda_execut"
 msgstr "moda_execut"
 
-#: models/media.py:338
+#: models/media.py:342
 msgid "author / compositor"
 msgstr "auteur / compositeur"
 
-#: models/media.py:341
-msgid "remarks"
-msgstr "remarques"
-
-#: models/media.py:342
-msgid "recordist selection"
-msgstr "sélection collecteur"
-
 #: models/media.py:343
-msgid "recordist as in collection"
-msgstr "collecteur identique à la collection"
-
-#: models/media.py:348
+msgid "contributor"
+msgstr "intervenant"
+
+#: models/media.py:349
+msgid "depositor"
+msgstr "déposant"
+
+#: models/media.py:355
 msgid "item number"
 msgstr "n° de l'item"
 
-#: models/media.py:350
+#: models/media.py:357
+msgid "digitalist"
+msgstr "opérateur de numérisation"
+
+#: models/media.py:358
+msgid "collector"
+msgstr "collecteur"
+
+#: models/media.py:359
+msgid "collector selection"
+msgstr "sélection collecteur"
+
+#: models/media.py:360
+msgid "collector as in collection"
+msgstr "collecteur identique à la collection"
+
+#: models/media.py:361
+msgid "digitization date"
+msgstr "date de numérisation"
+
+#: models/media.py:362
+msgid "publishing date"
+msgstr "date de création du support édité"
+
+#: models/media.py:363
+msgid "creator reference"
+msgstr "référence du créateur"
+
+#: models/media.py:364
 msgid "published references"
 msgstr "références éditées"
 
-#: models/media.py:351
+#: models/media.py:365
 msgid "copy of"
 msgstr "copie de"
 
-#: models/media.py:364 templates/telemeta/mediaitem_edit.html:41
+#: models/media.py:378 templates/telemeta/mediaitem_edit.html:41
 msgid "keywords"
 msgstr "mots-clés"
 
-#: models/media.py:429
+#: models/media.py:443
 msgid "instruments"
 msgstr "instruments"
 
-#: models/media.py:439 models/media.py:440
+#: models/media.py:453 models/media.py:454
 msgid "item related media"
 msgstr "média associés à l'item"
 
-#: models/media.py:458
+#: models/media.py:472
 msgid "composition"
 msgstr "Voix / Instruments"
 
-#: models/media.py:460
+#: models/media.py:474
 msgid "vernacular name"
 msgstr "nom vernaculaire"
 
-#: models/media.py:461
+#: models/media.py:475
 msgid "number"
 msgstr "nombre"
 
-#: models/media.py:462
+#: models/media.py:476
 msgid "interprets"
 msgstr "interprètes"
 
-#: models/media.py:473
+#: models/media.py:487
 msgid "id"
 msgstr ""
 
-#: models/media.py:476
+#: models/media.py:490
 msgid "unit"
 msgstr "unité"
 
-#: models/media.py:495
+#: models/media.py:509
 msgid "start"
 msgstr "début"
 
-#: models/media.py:496
+#: models/media.py:510
 msgid "end"
 msgstr "fin"
 
-#: models/media.py:500
+#: models/media.py:514
 msgid "item part"
 msgstr "partie"
 
-#: models/media.py:508 models/media.py:525 models/media.py:540
+#: models/media.py:522 models/media.py:539 models/media.py:554
 msgid "public_id"
 msgstr "public_id"
 
-#: models/media.py:526
+#: models/media.py:540
 msgid "playlist"
 msgstr "liste de lecture"
 
-#: models/media.py:527
+#: models/media.py:541
 msgid "resource_type"
 msgstr "type de ressource"
 
-#: models/media.py:528
+#: models/media.py:542
 msgid "resource_id"
 msgstr "ressource"
 
-#: models/media.py:541 models/system.py:55
+#: models/media.py:555 models/system.py:55
 msgid "time"
 msgstr "heure"
 
-#: models/media.py:545
+#: models/media.py:559
 msgid "author"
 msgstr "auteur"
 
-#: models/media.py:563
+#: models/media.py:577
 msgid "transcoded"
 msgstr ""
 
-#: models/media.py:643
+#: models/media.py:657
 msgid "collections"
 msgstr "collections"
 
-#: models/media.py:655 models/media.py:656 models/media.py:666
-#: models/media.py:683
+#: models/media.py:669 models/media.py:670 models/media.py:680
+#: models/media.py:697
 msgid "corpus"
 msgstr "corpus"
 
-#: models/media.py:676 models/media.py:677 models/media.py:694
+#: models/media.py:690 models/media.py:691 models/media.py:708
 msgid "fonds"
 msgstr "fonds"
 
-#: models/media.py:687 models/media.py:688
+#: models/media.py:701 models/media.py:702
 msgid "corpus related media"
 msgstr "média associés"
 
-#: models/media.py:698 models/media.py:699
+#: models/media.py:712 models/media.py:713
 msgid "fonds related media"
 msgstr "média associés"

telemeta/locale/fr/LC_MESSAGES/djangojs.po

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-24 15:16+0200\n"
+"POT-Creation-Date: 2012-05-25 16:34+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"

telemeta/models/enum.py

@@ -207 +207 @@
         verbose_name = _("number of channels")
 
-class OriginalLocation(Enumeration):
-    "Location of th original item or collection"
-
-    class Meta(MetaEnumeration):
-        db_table = 'original_location'
-        verbose_name = _("original location")
+class Organization(Enumeration):
+    "Organization"
+
+    class Meta(MetaEnumeration):
+        db_table = 'organization'
+        verbose_name = _("organization")
+
+class Rights(Enumeration):
+    "Archive rights"
+
+    class Meta(MetaEnumeration):
+        db_table = 'rights'
+        verbose_name = _("rights")

telemeta/models/format.py

@@ -63 +63 @@
     original_state        = TextField(_('technical properties / conservation state'))
     original_comments     = TextField(_('comments / notes'))
-    original_location     = WeakForeignKey(OriginalLocation, related_name="format",
-                                        verbose_name = _("original location"))
+    original_location     = ForeignKey('Location', related_name="format",
+                                       verbose_name = _("original location"),
+                                       blank=True, null=True, on_delete=models.SET_NULL)
     original_channels     = WeakForeignKey(NumberOfChannels, related_name="format",
                                         verbose_name = _("number of channels"))

telemeta/models/language.py

@@ -61 +61 @@
         db_table = 'languages'
         ordering = ['name']
+        verbose_name_plural = _('languages')

telemeta/models/location.py

@@ -52 +52 @@
     type             = IntegerField(_('type'), choices=TYPE_CHOICES, default=OTHER_TYPE, db_index=True)
     complete_type    = ForeignKey('LocationType', related_name="locations", verbose_name=_('complete type'))
-    current_location = WeakForeignKey('self', related_name="past_names", 
-                                      verbose_name=_('current location')) 
-    latitude         = FloatField(null=True)                                    
-    longitude        = FloatField(null=True)                                    
+    current_location = WeakForeignKey('self', related_name="past_names",
+                                      verbose_name=_('current location'))
+    latitude         = FloatField(null=True)
+    longitude        = FloatField(null=True)
     is_authoritative = BooleanField(_('authoritative'))
 
@@ -72 +72 @@
         if direct:
             q &= Q(descendant_relations__is_direct=True)
-        return Location.objects.filter(q)           
+        return Location.objects.filter(q)
 
     def descendants(self, direct=False):
@@ -78 +78 @@
         if direct:
             q &= Q(ancestor_relations__is_direct=True)
-        return Location.objects.filter(q)           
+        return Location.objects.filter(q)
 
     def apparented(self):
         return Location.objects.filter(
-                Q(pk=self.id) | 
-                Q(ancestor_relations__ancestor_location=self) | 
+                Q(pk=self.id) |
+                Q(ancestor_relations__ancestor_location=self) |
                 Q(current_location=self.id)).distinct()
 
@@ -91 +91 @@
             #FIXME: might raise Duplicate Entry
             LocationRelation.objects.create(location=other, ancestor_location=location)
-            
+
     def add_parent(self, other):
         LocationRelation.objects.create(location=self, ancestor_location=other, is_direct=True)
@@ -126 +126 @@
                 return flatname
 
-        return None                    
+        return None
 
     def paths(self):
@@ -145 +145 @@
             names.append(u', '.join([unicode(l) for l in path]))
         return names
-        
+
     def listnames(self):
         names = []
@@ -160 +160 @@
     def __unicode__(self):
         return self.name
-        
+
     class Meta(MetaCore):
         db_table = 'location_types'
         ordering = ['name']
+        verbose_name_plural = _('lieux types')
 
 class LocationAlias(ModelCore):
@@ -179 +180 @@
         verbose_name_plural = _('location aliases')
         ordering = ['alias']
-    
+
 class LocationRelation(ModelCore):
     "Location relations"
@@ -191 +192 @@
         unique_together = ('location', 'ancestor_location')
         ordering = ['ancestor_location__name']
+        verbose_name_plural = _('location relations')
 
     def __unicode__(self):
         sep = ' > '
         if not self.is_direct:
-            sep = ' >..> ' 
+            sep = ' >..> '
         return unicode(self.ancestor_location) + sep + unicode(self.location)
 
@@ -206 +208 @@
         super(LocationForm, self).__init__(*args, **kwds)
 #        self.fields['name'].queryset = Location.objects.order_by('name')
-        
+

telemeta/models/media.py

@@ -312 +312 @@
     title                 = CharField(_('title'))
     alt_title             = CharField(_('original title / translation'))
-    collector             = CharField(_('recordist'))
     collection            = ForeignKey('MediaCollection', related_name="items",
                                        verbose_name=_('collection'))
     recorded_from_date    = DateField(_('recording date (from)'))
     recorded_to_date      = DateField(_('recording date (until)'))
+
+    scientist             = CharField(_('scientist'))
+    domain                = CharField(_('domain'))
+    summary               = TextField(_('summary'))
+    comment               = TextField(_('remarks'))
 
     # Geographic and cultural informations
@@ -337 +341 @@
                                            verbose_name=_('generic style'))
     author                = CharField(_('author / compositor'))
-
-    # General informations
-    comment               = TextField(_('remarks'))
-    collector_selection   = CharField(_('recordist selection'))
-    collector_from_collection = BooleanField(_('recordist as in collection'))
+    contributor           = CharField(_('contributor'))
+
+    # Legal mentions
+    organization          = WeakForeignKey('Organization', verbose_name=_('organization'))
+    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
+                                      max_length=16, default="metadata")
+    depositor             = CharField(_('depositor'))
+    rights                = WeakForeignKey('Rights', verbose_name=_('rights'))
 
     # Archiving data
     code                  = CharField(_('code'), unique=True, blank=True)
-    old_code              = CharField(_('old code'), unique=False, blank=True)
+    old_code              = CharField(_('original code'), unique=False, blank=True)
     track                 = CharField(_('item number'))
-    creator_reference     = CharField(_('reference'))
+    recordist             = CharField(_('recordist'))
+    digitalist            = CharField(_('digitalist'))
+    collector             = CharField(_('collector'))
+    collector_selection   = CharField(_('collector selection'))
+    collector_from_collection = BooleanField(_('collector as in collection'))
+    digitization_date        = DateField(_('digitization date'))
+    publishing_date       = DateField(_('publishing date'))
+    creator_reference     = CharField(_('creator reference'))
     external_references   = TextField(_('published references'))
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
-    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES,
-                                      max_length=16, default="metadata")
+
+    # Media
     file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")