From: Guillaume Pellerin Date: Mon, 10 Nov 2014 15:02:29 +0000 (+0100) Subject: update CREM's models, locales and forms X-Git-Tag: 1.5.0rc1~27^2~62 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=96bfae464fb910b7bda02bad1f851ef4e1358339;p=telemeta.git update CREM's models, locales and forms --- diff --git a/telemeta/forms/media.py b/telemeta/forms/media.py index 5e1fb168..528608ab 100644 --- a/telemeta/forms/media.py +++ b/telemeta/forms/media.py @@ -48,7 +48,7 @@ class MediaFondsForm(ModelForm): class Meta: model = MediaFonds - exclude = ['description'] + exclude = ['description', 'public_access'] class Media: css = {'all': ['/static/admin/css/widgets.css',],} @@ -59,6 +59,7 @@ class MediaFondsRelatedForm(ModelForm): class Meta: model = MediaFondsRelated + exclude = ('mime_type',) class MediaCorpusForm(ModelForm): @@ -69,7 +70,7 @@ class MediaCorpusForm(ModelForm): class Meta: model = MediaCorpus - exclude = ['description'] + exclude = ['description', 'public_access'] class Media: css = {'all': ('/static/admin/css/widgets.css',),} @@ -80,6 +81,7 @@ class MediaCorpusRelatedForm(ModelForm): class Meta: model = MediaCorpusRelated + exclude = ('mime_type',) class MediaCollectionForm(ModelForm): @@ -97,13 +99,15 @@ class MediaCollectionRelatedForm(ModelForm): class Meta: model = MediaCollectionRelated + exclude = ('mime_type',) class MediaItemForm(ModelForm): class Meta: model = MediaItem - exclude = ('copied_from_item',) + exclude = ('copied_from_item', 'mimetype', 'url', 'contributor', + 'organization', 'depositor', 'rights', ) def clean_code(self): return self.cleaned_data['code'] or None @@ -117,6 +121,7 @@ class MediaItemRelatedForm(ModelForm): class Meta: model = MediaItemRelated + exclude = ('mime_type',) class MediaItemKeywordForm(ModelForm): diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index 48692d83..5cef6780 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index 3567ce79..b7e92200 100644 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-28 15:13+0100\n" +"POT-Creation-Date: 2014-11-10 16:01+0100\n" "PO-Revision-Date: 2012-12-22 21:24+0100\n" "Last-Translator: Patrik Tschudin \n" "Language-Team: LANGUAGE \n" @@ -26,128 +26,136 @@ msgstr "Dauer" msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "Gültige Dauer eingeben im Format HH:MM[:ss]" -#: models/enum.py:43 models/enum.py:143 models/media.py:585 +#: models/enum.py:44 models/enum.py:144 models/media.py:564 #: models/system.py:104 msgid "value" msgstr "Wert" -#: models/enum.py:59 models/media.py:270 +#: models/enum.py:60 models/media.py:254 msgid "archive format" msgstr "Archivformat" -#: models/enum.py:66 models/media.py:248 +#: models/enum.py:67 models/media.py:237 msgid "secondary edition" msgstr "Sekundäredition" -#: models/enum.py:73 models/media.py:240 +#: models/enum.py:74 models/media.py:232 msgid "mode of acquisition" msgstr "Art und Weise des Erhalts" -#: models/enum.py:80 models/media.py:245 +#: models/enum.py:81 models/media.py:235 msgid "record author" msgstr "AutorIn des Eintrags" -#: models/enum.py:87 models/media.py:254 +#: models/enum.py:88 models/media.py:241 msgid "record writer" msgstr "ErfasserIn des Eintrags" -#: models/enum.py:94 models/media.py:236 +#: models/enum.py:95 models/media.py:229 msgid "legal rights" msgstr "Urheberrechte" -#: models/enum.py:101 models/media.py:213 +#: models/enum.py:102 models/media.py:210 msgid "recording context" msgstr "Aufnahmekontext" -#: models/enum.py:108 +#: models/enum.py:109 msgid "A/D conversion" msgstr "A/D Umwandlung" -#: models/enum.py:115 models/media.py:388 +#: models/enum.py:116 models/media.py:367 msgid "vernacular style" msgstr "umgangssprachliche Bezeichnung" -#: models/enum.py:122 models/media.py:389 +#: models/enum.py:123 models/media.py:368 msgid "generic style" msgstr "allgemeine Bezeichnung" -#: models/enum.py:129 models/media.py:556 +#: models/enum.py:130 models/media.py:538 msgid "keyword" msgstr "Schlüsselwort" -#: models/enum.py:136 models/enum.py:142 models/media.py:226 +#: models/enum.py:137 models/enum.py:143 models/media.py:221 msgid "publisher" msgstr "HerausgeberIn" -#: models/enum.py:158 models/enum.py:164 models/media.py:381 +#: models/enum.py:159 models/enum.py:165 models/media.py:362 msgid "population / social group" msgstr "Bevölkerung / soziale Gruppe" -#: models/enum.py:165 models/instrument.py:43 models/instrument.py:53 +#: models/enum.py:166 models/instrument.py:43 models/instrument.py:53 #: models/language.py:54 models/location.py:51 models/location.py:158 -#: models/media.py:584 +#: models/media.py:563 msgid "name" msgstr "Name" -#: models/enum.py:179 models/format.py:77 +#: models/enum.py:182 models/format.py:77 msgid "tape wheel diameter (cm)" msgstr "Bandspulendurchmesser (cm)" -#: models/enum.py:186 +#: models/enum.py:191 msgid "tape length (cm)" msgstr "Bandlänge (cm)" -#: models/enum.py:193 +#: models/enum.py:200 msgid "tape width (inch)" msgstr "Bandbreite (inch)" -#: models/enum.py:200 models/format.py:80 +#: models/enum.py:209 models/format.py:80 msgid "tape speed (cm/s)" msgstr "Bandgeschwindigkeit (cm/s)" -#: models/enum.py:207 models/format.py:82 -msgid "tape vendor" +#: models/enum.py:218 +#, fuzzy +#| msgid "tape vendor" +msgid "tape brand" msgstr "Bandmarke" -#: models/enum.py:214 models/format.py:71 +#: models/enum.py:228 models/format.py:71 msgid "number of channels" msgstr "Anzahl Kanäle" -#: models/enum.py:221 models/media.py:394 +#: models/enum.py:238 models/media.py:372 msgid "organization" msgstr "Organisation" -#: models/enum.py:228 models/media.py:396 +#: models/enum.py:248 models/media.py:374 msgid "rights" msgstr "Rechte" -#: models/enum.py:235 models/media.py:373 +#: models/enum.py:258 models/media.py:400 msgid "topic" msgstr "Thema" -#: models/enum.py:243 +#: models/enum.py:266 models/media.py:234 #, fuzzy msgid "copy type" msgstr "vollständiger Typus" -#: models/enum.py:251 models/media.py:266 +#: models/enum.py:274 models/media.py:251 models/media.py:388 #, fuzzy msgid "media type" msgstr "Medientyp" -#: models/enum.py:259 models/media.py:677 +#: models/enum.py:282 models/media.py:255 +#, fuzzy +#| msgid "original location" +msgid "original format" +msgstr "Herkunftsort" + +#: models/enum.py:290 models/media.py:656 msgid "status" msgstr "Status" -#: models/enum.py:267 +#: models/enum.py:298 #, fuzzy msgid "identifier type" msgstr "Identifikator" -#: models/format.py:58 models/media.py:455 models/media.py:528 -#: models/media.py:555 models/media.py:566 models/media.py:582 -#: models/media.py:603 models/media.py:649 models/media.py:674 -#: models/media.py:708 models/media.py:881 +#: models/format.py:58 models/media.py:437 models/media.py:510 +#: models/media.py:537 models/media.py:547 models/media.py:561 +#: models/media.py:582 models/media.py:628 models/media.py:653 +#: models/media.py:687 models/media.py:874 msgid "item" msgstr "Element" @@ -155,7 +163,7 @@ msgstr "Element" msgid "physical format" msgstr "physisches Format" -#: models/format.py:62 models/media.py:401 +#: models/format.py:62 models/media.py:378 msgid "original code" msgstr "ursprünglicher Code" @@ -191,6 +199,10 @@ msgstr "Aufnahmesystem" msgid "tape thickness (um)" msgstr "Banddicke (um)" +#: models/format.py:82 +msgid "tape vendor" +msgstr "Bandmarke" + #: models/format.py:83 msgid "tape reference" msgstr "Bandreferenz" @@ -219,7 +231,7 @@ msgstr "Vorgängerinstrument" msgid "alias" msgstr "Parallelbezeichnung" -#: models/language.py:48 models/location.py:157 models/media.py:867 +#: models/language.py:48 models/location.py:157 models/media.py:860 msgid "identifier" msgstr "Identifikator" @@ -239,11 +251,11 @@ msgstr "equivalenter ISO 639-1 Identifikator" msgid "scope" msgstr "Geltungsbereich" -#: models/language.py:53 models/location.py:52 models/media.py:868 +#: models/language.py:53 models/location.py:52 models/media.py:861 msgid "type" msgstr "Typus" -#: models/language.py:55 models/media.py:252 +#: models/language.py:55 models/media.py:240 msgid "comment" msgstr "Kommentar" @@ -276,7 +288,7 @@ msgid "authoritative" msgstr "massgebend" #: models/location.py:112 models/location.py:170 models/location.py:185 -#: models/media.py:378 +#: models/media.py:357 msgid "location" msgstr "Ort" @@ -300,79 +312,84 @@ msgstr "früherer Ort" msgid "location relations" msgstr "Ortsbeziehungen" -#: models/media.py:79 models/media.py:82 models/media.py:449 +#: models/media.py:80 models/media.py:83 models/media.py:431 msgid "none" msgstr "nichts" -#: models/media.py:79 models/media.py:82 +#: models/media.py:80 models/media.py:83 msgid "metadata" msgstr "Metadaten" -#: models/media.py:80 +#: models/media.py:81 msgid "mixed" msgstr "" -#: models/media.py:80 models/media.py:83 +#: models/media.py:81 models/media.py:84 msgid "full" msgstr "vollständig" -#: models/media.py:85 +#: models/media.py:86 msgid "broken" msgstr "" -#: models/media.py:85 +#: models/media.py:86 msgid "pending" msgstr "" -#: models/media.py:85 +#: models/media.py:86 msgid "processing" msgstr "" -#: models/media.py:86 +#: models/media.py:87 msgid "done" msgstr "" -#: models/media.py:86 +#: models/media.py:87 msgid "ready" msgstr "" -#: models/media.py:103 +#: models/media.py:104 msgid "Metadata only" msgstr "nur Metadaten" -#: models/media.py:105 +#: models/media.py:106 msgid "Sound and metadata" msgstr "Ton und Metadaten" -#: models/media.py:107 +#: models/media.py:108 msgid "Private data" msgstr "private Daten" -#: models/media.py:108 models/media.py:127 -msgid "public access" -msgstr "öffentlich zugänglich" +#: models/media.py:109 models/media.py:214 models/media.py:354 +#, fuzzy +msgid "access type" +msgstr "Status" -#: models/media.py:124 models/media.py:153 models/media.py:207 -#: models/media.py:366 models/media.py:604 models/media.py:620 -#: models/media.py:652 +#: models/media.py:125 models/media.py:153 models/media.py:206 +#: models/media.py:348 models/media.py:583 models/media.py:599 +#: models/media.py:631 msgid "title" msgstr "Titel" -#: models/media.py:125 models/media.py:155 models/media.py:211 -#: models/media.py:621 models/media.py:654 +#: models/media.py:126 models/media.py:155 models/media.py:209 +#: models/media.py:600 models/media.py:633 msgid "description" msgstr "Beschreibung" -#: models/media.py:126 models/media.py:262 models/media.py:400 +#: models/media.py:127 models/media.py:249 models/media.py:377 msgid "code" msgstr "Code" -#: models/media.py:154 models/media.py:653 models/media.py:676 -#: models/media.py:710 models/system.py:116 +#: models/media.py:128 +msgid "public access" +msgstr "öffentlich zugänglich" + +#: models/media.py:154 models/media.py:632 models/media.py:655 +#: models/media.py:689 models/system.py:116 msgid "date" msgstr "Datum" -#: models/media.py:156 models/media.py:675 models/media.py:709 +#: models/media.py:156 models/media.py:654 models/media.py:688 msgid "mime_type" msgstr "mime_type" @@ -384,416 +401,408 @@ msgstr "url" msgid "credits" msgstr "Mithilfe" -#: models/media.py:159 models/media.py:416 models/media.py:678 +#: models/media.py:159 models/media.py:391 models/media.py:657 msgid "file" msgstr "Datei" -#: models/media.py:208 models/media.py:367 +#: models/media.py:207 models/media.py:349 msgid "original title / translation" msgstr "Oritinaltitel / Übersetzung" -#: models/media.py:209 +#: models/media.py:208 msgid "depositor / contributor" msgstr "HinterlegerIn / Zulieferde(r)" -#: models/media.py:209 models/media.py:224 models/media.py:372 -#: models/media.py:390 -msgid "First name, Last name; First name, Last name" +#: models/media.py:208 models/media.py:220 models/media.py:369 +#: models/media.py:399 +msgid "First name, Last name ; First name, Last name" msgstr "" -#: models/media.py:210 -msgid "document type" -msgstr "Dokumententypus" - -#: models/media.py:214 models/media.py:792 +#: models/media.py:211 models/media.py:771 msgid "recording year (from)" msgstr "Aufnahmejahr (ab)" -#: models/media.py:214 models/media.py:215 models/media.py:216 +#: models/media.py:211 models/media.py:212 models/media.py:213 msgid "YYYY" msgstr "" -#: models/media.py:215 models/media.py:793 +#: models/media.py:212 models/media.py:772 msgid "recording year (until)" msgstr "Aufnahmejahr (bis)" -#: models/media.py:216 +#: models/media.py:213 msgid "year published" msgstr "Publikationsjahr" -#: models/media.py:217 models/media.py:371 -#, fuzzy -msgid "access type" -msgstr "Status" - -#: models/media.py:224 models/media.py:403 +#: models/media.py:220 models/media.py:395 msgid "recordist" msgstr "TonmeisterIn" -#: models/media.py:228 +#: models/media.py:222 msgid "publisher collection" msgstr "Sammlung von HerausgeberIn" -#: models/media.py:229 +#: models/media.py:223 msgid "publisher serial number" msgstr "Seriennummer von HerausgeberIn" -#: models/media.py:230 +#: models/media.py:224 #, fuzzy -msgid "publisher references" -msgstr "publizierte Referenzen" +#| msgid "author" +msgid "booklet author" +msgstr "AutorIn" -#: models/media.py:231 -msgid "reference" -msgstr "Referenz" +#: models/media.py:225 +#, fuzzy +msgid "publisher reference" +msgstr "publizierte Referenzen" -#: models/media.py:232 +#: models/media.py:226 msgid "bibliographic references" msgstr "bibliographische Referenz" -#: models/media.py:234 models/media.py:397 +#: models/media.py:228 models/media.py:384 msgid "automatic access after a rolling period" msgstr "" -#: models/media.py:241 +#: models/media.py:233 msgid "CNRS depositor" msgstr "CNRS HinterlegerIn" -#: models/media.py:243 -msgid "type of copy" -msgstr "" - -#: models/media.py:246 +#: models/media.py:236 msgid "related documentation" msgstr "verwandte Dokumentation" -#: models/media.py:250 +#: models/media.py:238 #, fuzzy msgid "collection status" msgstr "Sammlungen" -#: models/media.py:251 +#: models/media.py:239 msgid "copies" msgstr "Kopien" -#: models/media.py:255 +#: models/media.py:242 msgid "archiver notes" msgstr "Kommentar von ArchivarIn" -#: models/media.py:256 +#: models/media.py:243 msgid "items finished" msgstr "abgeschlossene Elemente" -#: models/media.py:257 +#: models/media.py:244 msgid "recordist identical to depositor" msgstr "TonmeisterIn ist identisch mit HinterlegerIn" -#: models/media.py:258 templates/telemeta/collection_detail.html:82 +#: models/media.py:245 templates/telemeta/collection_detail.html:82 msgid "published" msgstr "publiziert" -#: models/media.py:259 +#: models/media.py:246 msgid "conservation site" msgstr "Konservierungsort" -#: models/media.py:264 +#: models/media.py:250 msgid "old code" msgstr "alter Code" -#: models/media.py:267 +#: models/media.py:252 #, fuzzy #| msgid "computed duration" msgid "estimated duration" msgstr "berechnete Dauer" -#: models/media.py:268 +#: models/media.py:253 msgid "number of components (medium / piece)" msgstr "Anzahl Komponenten (Medium / Teil)" -#: models/media.py:272 +#: models/media.py:256 msgid "digitization" msgstr "Digitalisierung" -#: models/media.py:307 +#: models/media.py:291 msgid "states / nations" msgstr "Staaten / Nationen" -#: models/media.py:321 +#: models/media.py:305 msgid "populations / social groups" msgstr "Bevölkerungen / soziale Gruppen" -#: models/media.py:329 models/media.py:481 +#: models/media.py:312 models/media.py:463 msgid "computed duration" msgstr "berechnete Dauer" -#: models/media.py:338 +#: models/media.py:320 #, fuzzy #| msgid "collections" msgid "collection size (Mo)" msgstr "Sammlungen" -#: models/media.py:346 models/media.py:352 models/media.py:368 -#: models/media.py:893 +#: models/media.py:328 models/media.py:334 models/media.py:351 +#: models/media.py:886 msgid "collection" msgstr "Sammlung" -#: models/media.py:356 models/media.py:357 +#: models/media.py:338 models/media.py:339 msgid "collection related media" msgstr "zur Sammlung gehörende Medien" -#: models/media.py:369 +#: models/media.py:350 +msgid "collector" +msgstr "SammlerIn" + +#: models/media.py:352 msgid "recording date (from)" msgstr "Aufnahmedatum (von)" -#: models/media.py:369 models/media.py:370 +#: models/media.py:352 models/media.py:353 msgid "YYYY-MM-DD" msgstr "" -#: models/media.py:370 +#: models/media.py:353 msgid "recording date (until)" msgstr "Aufnahmedatum (bis)" -#: models/media.py:372 -msgid "scientist" -msgstr "WissenschaftlerIn" - -#: models/media.py:374 -msgid "summary" -msgstr "Zusammenfassung" - -#: models/media.py:375 -msgid "remarks" -msgstr "Bemerkungen" - -#: models/media.py:379 +#: models/media.py:358 msgid "location details" msgstr "Einzelheiten zum Ort" -#: models/media.py:380 +#: models/media.py:359 msgid "cultural area" msgstr "Kulturraum" -#: models/media.py:382 +#: models/media.py:360 msgid "language" msgstr "Sprache" -#: models/media.py:383 +#: models/media.py:361 msgid "ISO language" msgstr "ISO Sprache" -#: models/media.py:384 -msgid "comments / ethnographic context" +#: models/media.py:363 templates/telemeta/mediaitem_detail.html:226 +#, fuzzy +msgid "Ethnographic context" msgstr "Kommentare / ethnographischer Kontext" -#: models/media.py:385 +#: models/media.py:366 msgid "implementing rules" msgstr "" -#: models/media.py:390 +#: models/media.py:369 msgid "author / compositor" msgstr "AutorIn / KomponistIn" -#: models/media.py:391 -msgid "contributor" -msgstr "Mitwirkende(r)" - -#: models/media.py:395 +#: models/media.py:373 msgid "depositor" msgstr "HinterlegerIn" -#: models/media.py:400 +#: models/media.py:377 #, fuzzy msgid "CollectionCode-ItemCode" msgstr "Sammlung" -#: models/media.py:402 +#: models/media.py:379 msgid "item number" msgstr "Nummer des Elements" -#: models/media.py:404 -msgid "digitalist" -msgstr "DigitalisiererIn" - -#: models/media.py:405 -msgid "collector" -msgstr "SammlerIn" - -#: models/media.py:406 +#: models/media.py:380 msgid "collector selection" msgstr "Auswahl von SammlerIn" -#: models/media.py:407 +#: models/media.py:381 msgid "collector as in collection" msgstr "SammlerIn gleich wie bei Sammlung" -#: models/media.py:408 -msgid "digitization date" -msgstr "Datum der Digitalisierung" - -#: models/media.py:409 -msgid "publishing date" -msgstr "Datum der Publikation" - -#: models/media.py:410 +#: models/media.py:382 msgid "creator reference" msgstr "Referenz von ErzeugerIn" -#: models/media.py:411 +#: models/media.py:383 msgid "published references" msgstr "publizierte Referenzen" -#: models/media.py:412 -msgid "copy of" -msgstr "Kopie von" +#: models/media.py:385 +msgid "remarks" +msgstr "Bemerkungen" -#: models/media.py:413 +#: models/media.py:389 +msgid "approximative duration" +msgstr "ungefähre Dauer" + +#: models/media.py:389 +msgid "hh:mm:ss" +msgstr "" + +#: models/media.py:390 msgid "mime type" msgstr "mime type" -#: models/media.py:417 +#: models/media.py:392 msgid "URL" msgstr "Internetadresse" -#: models/media.py:420 -msgid "approximative duration" -msgstr "ungefähre Dauer" +#: models/media.py:396 +msgid "digitalist" +msgstr "DigitalisiererIn" -#: models/media.py:420 -msgid "hh:mm:ss" -msgstr "" +#: models/media.py:397 +msgid "digitization date" +msgstr "Datum der Digitalisierung" + +#: models/media.py:398 +msgid "publishing date" +msgstr "Datum der Publikation" + +#: models/media.py:399 +msgid "scientist" +msgstr "WissenschaftlerIn" + +#: models/media.py:401 +msgid "summary" +msgstr "Zusammenfassung" + +#: models/media.py:402 +msgid "contributor" +msgstr "Mitwirkende(r)" -#: models/media.py:428 +#: models/media.py:410 msgid "keywords" msgstr "Schlüsselwörter" -#: models/media.py:516 +#: models/media.py:498 msgid "instruments" msgstr "Instrumente" -#: models/media.py:549 models/media.py:550 +#: models/media.py:531 models/media.py:532 msgid "item related media" msgstr "zum Element gehörende Medien" -#: models/media.py:568 +#: models/media.py:548 msgid "composition" msgstr "Komposition" -#: models/media.py:570 +#: models/media.py:549 msgid "vernacular name" msgstr "umgangssprachlicher Name" -#: models/media.py:571 +#: models/media.py:550 msgid "number" msgstr "Nummer" -#: models/media.py:572 +#: models/media.py:551 msgid "interprets" msgstr "InterpretInnen" -#: models/media.py:583 +#: models/media.py:562 msgid "id" msgstr "id" -#: models/media.py:586 +#: models/media.py:565 msgid "unit" msgstr "Einheit" -#: models/media.py:605 +#: models/media.py:584 msgid "start" msgstr "Start" -#: models/media.py:606 +#: models/media.py:585 msgid "end" msgstr "Ende" -#: models/media.py:610 +#: models/media.py:589 msgid "item part" msgstr "Elementteil" -#: models/media.py:618 models/media.py:635 models/media.py:650 +#: models/media.py:597 models/media.py:614 models/media.py:629 msgid "public_id" msgstr "public_id" -#: models/media.py:636 +#: models/media.py:615 msgid "playlist" msgstr "Wiedergabeliste" -#: models/media.py:637 +#: models/media.py:616 msgid "resource_type" msgstr "resource_type" -#: models/media.py:638 +#: models/media.py:617 msgid "resource_id" msgstr "resource_id" -#: models/media.py:651 +#: models/media.py:630 #, fuzzy msgid "time (s)" msgstr "Zeit" -#: models/media.py:655 +#: models/media.py:634 msgid "author" msgstr "AutorIn" -#: models/media.py:711 +#: models/media.py:690 msgid "transcoded" msgstr "umgewandelt" -#: models/media.py:791 +#: models/media.py:770 msgid "collections" msgstr "Sammlungen" -#: models/media.py:810 models/media.py:811 models/media.py:821 -#: models/media.py:845 +#: models/media.py:792 models/media.py:827 +#, fuzzy +#| msgid "computed duration" +msgid "total available duration" +msgstr "berechnete Dauer" + +#: models/media.py:796 models/media.py:797 models/media.py:807 +#: models/media.py:838 msgid "corpus" msgstr "Korpus" -#: models/media.py:838 models/media.py:839 models/media.py:856 +#: models/media.py:831 models/media.py:832 models/media.py:849 msgid "fonds" msgstr "Fonds" -#: models/media.py:849 models/media.py:850 +#: models/media.py:842 models/media.py:843 msgid "corpus related media" msgstr "zum Korpus gehörende Medien" -#: models/media.py:860 models/media.py:861 +#: models/media.py:853 models/media.py:854 msgid "fonds related media" msgstr "zum Fonds gehörende Medien" -#: models/media.py:869 +#: models/media.py:862 msgid "date of first attribution" msgstr "" -#: models/media.py:870 +#: models/media.py:863 #, fuzzy msgid "date of last attribution" msgstr "Art und Weise des Erhalts" -#: models/media.py:871 +#: models/media.py:864 #, fuzzy msgid "date of last modification" msgstr "Letzte Änderung" -#: models/media.py:872 +#: models/media.py:865 msgid "notes" msgstr "" -#: models/media.py:885 +#: models/media.py:878 #, fuzzy msgid "item identifier" msgstr "Identifikator" -#: models/media.py:886 +#: models/media.py:879 #, fuzzy msgid "item identifiers" msgstr "Identifikator" -#: models/media.py:897 +#: models/media.py:890 #, fuzzy msgid "collection identifier" msgstr "Elementidentifikator" -#: models/media.py:898 +#: models/media.py:891 #, fuzzy msgid "collection identifiers" msgstr "Elementidentifikator" @@ -950,12 +959,12 @@ msgid "g:i A,M j,n/j/y" msgstr "g:i A,M j,n/j/y" #: templates/postman/base_folder.html:49 templates/postman/view.html:25 -#: templates/telemeta/collection_detail.html:223 +#: templates/telemeta/collection_detail.html:231 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:353 +#: templates/telemeta/mediaitem_detail.html:352 #: templates/telemeta/mediaitem_detail_dc.html:20 -#: templates/telemeta/resource_detail.html:104 +#: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 msgid "Delete" msgstr "löschen" @@ -1138,7 +1147,7 @@ msgstr "Aufzählung" msgid "Title" msgstr "Titel" -#: templates/telemeta/admin_enumerations.html:24 +#: templates/telemeta/admin_enumerations.html:26 msgid "No enumerations" msgstr "keine Aufzählung" @@ -1240,7 +1249,7 @@ msgstr "" "Ursprungsgesellschaften." #: templates/telemeta/base.html:186 -#: templates/telemeta/collection_detail.html:114 +#: templates/telemeta/collection_detail.html:117 msgid "Legal notices" msgstr "juristische Hinweise" @@ -1324,9 +1333,8 @@ msgid "Download" msgstr "herunterladen:" #: templates/telemeta/collection_detail.html:68 -#: templates/telemeta/geo_continents.html:26 -msgid "List" -msgstr "Liste" +msgid "View list" +msgstr "" #: templates/telemeta/collection_detail.html:78 #, fuzzy @@ -1346,48 +1354,48 @@ msgstr "unveröffentlicht" msgid "Recording period" msgstr "Aufnahmeperiode" -#: templates/telemeta/collection_detail.html:101 -#: templates/telemeta/mediaitem_detail.html:217 +#: templates/telemeta/collection_detail.html:104 +#: templates/telemeta/mediaitem_detail.html:214 msgid "Geographic and cultural informations" msgstr "geographische und kulturelle Informationen" -#: templates/telemeta/collection_detail.html:119 +#: templates/telemeta/collection_detail.html:122 #: templates/telemeta/inc/collection_list.html:11 #: templates/telemeta/inc/mediaitem_list.html:10 #: templates/telemeta/lists.html:72 msgid "Recordist" msgstr "TonmeisterIn" -#: templates/telemeta/collection_detail.html:132 +#: templates/telemeta/collection_detail.html:137 msgid "Bibliographic references" msgstr "bibliographische Referenzen" -#: templates/telemeta/collection_detail.html:145 +#: templates/telemeta/collection_detail.html:149 #: templates/telemeta/mediaitem_detail.html:277 msgid "Archiving data" msgstr "Archivdaten" -#: templates/telemeta/collection_detail.html:153 +#: templates/telemeta/collection_detail.html:157 msgid "Related documentation" msgstr "damit zusammenhängende Dokumentation" -#: templates/telemeta/collection_detail.html:160 -#: templates/telemeta/mediaitem_detail.html:315 +#: templates/telemeta/collection_detail.html:165 +#: templates/telemeta/mediaitem_detail.html:314 msgid "Comments" msgstr "Kommentare" -#: templates/telemeta/collection_detail.html:164 -#: templates/telemeta/mediaitem_detail.html:290 -#: templates/telemeta/resource_detail.html:74 +#: templates/telemeta/collection_detail.html:169 +#: templates/telemeta/mediaitem_detail.html:291 +#: templates/telemeta/resource_detail.html:75 msgid "Last modification" msgstr "Letzte Änderung" -#: templates/telemeta/collection_detail.html:178 -#: templates/telemeta/mediaitem_detail.html:300 +#: templates/telemeta/collection_detail.html:183 +#: templates/telemeta/mediaitem_detail.html:301 msgid "Technical data" msgstr "technische Daten" -#: templates/telemeta/collection_detail.html:188 +#: templates/telemeta/collection_detail.html:196 #: templates/telemeta/geo_countries.html:16 msgid "Number of items" msgstr "Anzahl Elemente" @@ -1558,6 +1566,10 @@ msgstr "GeoNavigation" msgid "Map" msgstr "Karte" +#: templates/telemeta/geo_continents.html:26 +msgid "List" +msgstr "Liste" + #: templates/telemeta/geo_countries.html:8 #: templates/telemeta/geo_country_collections.html:8 #: templates/telemeta/geo_country_items.html:8 @@ -1651,7 +1663,7 @@ msgid "Dublin Core Metadata" msgstr "Dublin Core Metadata" #: templates/telemeta/inc/mediaitem_list.html:12 -#: templates/telemeta/mediaitem_detail.html:219 +#: templates/telemeta/mediaitem_detail.html:216 msgid "Location" msgstr "Aufnahmeort" @@ -1770,8 +1782,8 @@ msgid "Next" msgstr "nächste" #: templates/telemeta/mediaitem_detail.html:154 -msgid "Analysis" -msgstr "Analyse" +msgid "File" +msgstr "" #: templates/telemeta/mediaitem_detail.html:156 msgid "Markers" @@ -1804,33 +1816,24 @@ msgstr "" msgid "Recording date" msgstr "Aufnahmedatum" -#: templates/telemeta/mediaitem_detail.html:225 +#: templates/telemeta/mediaitem_detail.html:222 #, fuzzy msgid "Language ISO" msgstr "Sprache" -#: templates/telemeta/mediaitem_detail.html:229 -#, fuzzy -msgid "Ethnographic context" -msgstr "Kommentare / ethnographischer Kontext" - -#: templates/telemeta/mediaitem_detail.html:240 +#: templates/telemeta/mediaitem_detail.html:237 #, fuzzy msgid "Musical informations" msgstr "physisches Format" -#: templates/telemeta/mediaitem_detail.html:284 +#: templates/telemeta/mediaitem_detail.html:285 msgid "Published references" msgstr "publizierte Referenzen" -#: templates/telemeta/mediaitem_detail.html:287 +#: templates/telemeta/mediaitem_detail.html:288 msgid "Remarks" msgstr "Bemerkungen" -#: templates/telemeta/mediaitem_detail.html:303 -msgid "Media type" -msgstr "Medientyp" - #: templates/telemeta/mediaitem_detail_dc.html:13 msgid "No such item" msgstr "kein solches Element" @@ -2090,7 +2093,7 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/telemeta/resource_detail.html:109 +#: templates/telemeta/resource_detail.html:110 #: templates/telemeta/resource_detail_dc.html:22 msgid "No such resource" msgstr "keine solche Ressource" @@ -2180,10 +2183,28 @@ msgstr "" msgid "Last changes" msgstr "Letze Änderungen" -#: views/item.py:720 +#: views/item.py:721 msgid "You have successfully updated your item." msgstr "" +#~ msgid "Analysis" +#~ msgstr "Analyse" + +#~ msgid "comments / ethnographic context" +#~ msgstr "Kommentare / ethnographischer Kontext" + +#~ msgid "copy of" +#~ msgstr "Kopie von" + +#~ msgid "Media type" +#~ msgstr "Medientyp" + +#~ msgid "document type" +#~ msgstr "Dokumententypus" + +#~ msgid "reference" +#~ msgstr "Referenz" + #, fuzzy #~ msgid "access status" #~ msgstr "Status" diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo index 41866cce..15b154dd 100644 Binary files a/telemeta/locale/es/LC_MESSAGES/django.mo and b/telemeta/locale/es/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/es/LC_MESSAGES/django.po b/telemeta/locale/es/LC_MESSAGES/django.po index 031e93a7..93f2821e 100644 --- a/telemeta/locale/es/LC_MESSAGES/django.po +++ b/telemeta/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-28 15:13+0100\n" +"POT-Creation-Date: 2014-11-10 16:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,125 +26,129 @@ msgstr "" msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "" -#: models/enum.py:43 models/enum.py:143 models/media.py:585 +#: models/enum.py:44 models/enum.py:144 models/media.py:564 #: models/system.py:104 msgid "value" msgstr "" -#: models/enum.py:59 models/media.py:270 +#: models/enum.py:60 models/media.py:254 msgid "archive format" msgstr "" -#: models/enum.py:66 models/media.py:248 +#: models/enum.py:67 models/media.py:237 msgid "secondary edition" msgstr "" -#: models/enum.py:73 models/media.py:240 +#: models/enum.py:74 models/media.py:232 msgid "mode of acquisition" msgstr "" -#: models/enum.py:80 models/media.py:245 +#: models/enum.py:81 models/media.py:235 msgid "record author" msgstr "" -#: models/enum.py:87 models/media.py:254 +#: models/enum.py:88 models/media.py:241 msgid "record writer" msgstr "" -#: models/enum.py:94 models/media.py:236 +#: models/enum.py:95 models/media.py:229 msgid "legal rights" msgstr "" -#: models/enum.py:101 models/media.py:213 +#: models/enum.py:102 models/media.py:210 msgid "recording context" msgstr "" -#: models/enum.py:108 +#: models/enum.py:109 msgid "A/D conversion" msgstr "" -#: models/enum.py:115 models/media.py:388 +#: models/enum.py:116 models/media.py:367 msgid "vernacular style" msgstr "" -#: models/enum.py:122 models/media.py:389 +#: models/enum.py:123 models/media.py:368 msgid "generic style" msgstr "" -#: models/enum.py:129 models/media.py:556 +#: models/enum.py:130 models/media.py:538 msgid "keyword" msgstr "" -#: models/enum.py:136 models/enum.py:142 models/media.py:226 +#: models/enum.py:137 models/enum.py:143 models/media.py:221 msgid "publisher" msgstr "" -#: models/enum.py:158 models/enum.py:164 models/media.py:381 +#: models/enum.py:159 models/enum.py:165 models/media.py:362 msgid "population / social group" msgstr "" -#: models/enum.py:165 models/instrument.py:43 models/instrument.py:53 +#: models/enum.py:166 models/instrument.py:43 models/instrument.py:53 #: models/language.py:54 models/location.py:51 models/location.py:158 -#: models/media.py:584 +#: models/media.py:563 msgid "name" msgstr "" -#: models/enum.py:179 models/format.py:77 +#: models/enum.py:182 models/format.py:77 msgid "tape wheel diameter (cm)" msgstr "" -#: models/enum.py:186 +#: models/enum.py:191 msgid "tape length (cm)" msgstr "" -#: models/enum.py:193 +#: models/enum.py:200 msgid "tape width (inch)" msgstr "" -#: models/enum.py:200 models/format.py:80 +#: models/enum.py:209 models/format.py:80 msgid "tape speed (cm/s)" msgstr "" -#: models/enum.py:207 models/format.py:82 -msgid "tape vendor" +#: models/enum.py:218 +msgid "tape brand" msgstr "" -#: models/enum.py:214 models/format.py:71 +#: models/enum.py:228 models/format.py:71 msgid "number of channels" msgstr "" -#: models/enum.py:221 models/media.py:394 +#: models/enum.py:238 models/media.py:372 msgid "organization" msgstr "" -#: models/enum.py:228 models/media.py:396 +#: models/enum.py:248 models/media.py:374 msgid "rights" msgstr "" -#: models/enum.py:235 models/media.py:373 +#: models/enum.py:258 models/media.py:400 msgid "topic" msgstr "" -#: models/enum.py:243 +#: models/enum.py:266 models/media.py:234 msgid "copy type" msgstr "" -#: models/enum.py:251 models/media.py:266 +#: models/enum.py:274 models/media.py:251 models/media.py:388 msgid "media type" msgstr "" -#: models/enum.py:259 models/media.py:677 +#: models/enum.py:282 models/media.py:255 +msgid "original format" +msgstr "" + +#: models/enum.py:290 models/media.py:656 msgid "status" msgstr "" -#: models/enum.py:267 +#: models/enum.py:298 msgid "identifier type" msgstr "" -#: models/format.py:58 models/media.py:455 models/media.py:528 -#: models/media.py:555 models/media.py:566 models/media.py:582 -#: models/media.py:603 models/media.py:649 models/media.py:674 -#: models/media.py:708 models/media.py:881 +#: models/format.py:58 models/media.py:437 models/media.py:510 +#: models/media.py:537 models/media.py:547 models/media.py:561 +#: models/media.py:582 models/media.py:628 models/media.py:653 +#: models/media.py:687 models/media.py:874 msgid "item" msgstr "" @@ -152,7 +156,7 @@ msgstr "" msgid "physical format" msgstr "" -#: models/format.py:62 models/media.py:401 +#: models/format.py:62 models/media.py:378 msgid "original code" msgstr "" @@ -188,6 +192,10 @@ msgstr "" msgid "tape thickness (um)" msgstr "" +#: models/format.py:82 +msgid "tape vendor" +msgstr "" + #: models/format.py:83 msgid "tape reference" msgstr "" @@ -216,7 +224,7 @@ msgstr "" msgid "alias" msgstr "" -#: models/language.py:48 models/location.py:157 models/media.py:867 +#: models/language.py:48 models/location.py:157 models/media.py:860 msgid "identifier" msgstr "" @@ -236,11 +244,11 @@ msgstr "" msgid "scope" msgstr "" -#: models/language.py:53 models/location.py:52 models/media.py:868 +#: models/language.py:53 models/location.py:52 models/media.py:861 msgid "type" msgstr "" -#: models/language.py:55 models/media.py:252 +#: models/language.py:55 models/media.py:240 msgid "comment" msgstr "" @@ -273,7 +281,7 @@ msgid "authoritative" msgstr "" #: models/location.py:112 models/location.py:170 models/location.py:185 -#: models/media.py:378 +#: models/media.py:357 msgid "location" msgstr "" @@ -297,79 +305,83 @@ msgstr "" msgid "location relations" msgstr "" -#: models/media.py:79 models/media.py:82 models/media.py:449 +#: models/media.py:80 models/media.py:83 models/media.py:431 msgid "none" msgstr "" -#: models/media.py:79 models/media.py:82 +#: models/media.py:80 models/media.py:83 msgid "metadata" msgstr "" -#: models/media.py:80 +#: models/media.py:81 msgid "mixed" msgstr "" -#: models/media.py:80 models/media.py:83 +#: models/media.py:81 models/media.py:84 msgid "full" msgstr "" -#: models/media.py:85 +#: models/media.py:86 msgid "broken" msgstr "" -#: models/media.py:85 +#: models/media.py:86 msgid "pending" msgstr "" -#: models/media.py:85 +#: models/media.py:86 msgid "processing" msgstr "" -#: models/media.py:86 +#: models/media.py:87 msgid "done" msgstr "" -#: models/media.py:86 +#: models/media.py:87 msgid "ready" msgstr "" -#: models/media.py:103 +#: models/media.py:104 msgid "Metadata only" msgstr "" -#: models/media.py:105 +#: models/media.py:106 msgid "Sound and metadata" msgstr "" -#: models/media.py:107 +#: models/media.py:108 msgid "Private data" msgstr "" -#: models/media.py:108 models/media.py:127 -msgid "public access" +#: models/media.py:109 models/media.py:214 models/media.py:354 +msgid "access type" msgstr "" -#: models/media.py:124 models/media.py:153 models/media.py:207 -#: models/media.py:366 models/media.py:604 models/media.py:620 -#: models/media.py:652 +#: models/media.py:125 models/media.py:153 models/media.py:206 +#: models/media.py:348 models/media.py:583 models/media.py:599 +#: models/media.py:631 msgid "title" msgstr "" -#: models/media.py:125 models/media.py:155 models/media.py:211 -#: models/media.py:621 models/media.py:654 +#: models/media.py:126 models/media.py:155 models/media.py:209 +#: models/media.py:600 models/media.py:633 msgid "description" msgstr "" -#: models/media.py:126 models/media.py:262 models/media.py:400 +#: models/media.py:127 models/media.py:249 models/media.py:377 msgid "code" msgstr "" -#: models/media.py:154 models/media.py:653 models/media.py:676 -#: models/media.py:710 models/system.py:116 +#: models/media.py:128 +msgid "public access" +msgstr "" + +#: models/media.py:154 models/media.py:632 models/media.py:655 +#: models/media.py:689 models/system.py:116 msgid "date" msgstr "" -#: models/media.py:156 models/media.py:675 models/media.py:709 +#: models/media.py:156 models/media.py:654 models/media.py:688 msgid "mime_type" msgstr "" @@ -381,402 +393,390 @@ msgstr "" msgid "credits" msgstr "" -#: models/media.py:159 models/media.py:416 models/media.py:678 +#: models/media.py:159 models/media.py:391 models/media.py:657 msgid "file" msgstr "" -#: models/media.py:208 models/media.py:367 +#: models/media.py:207 models/media.py:349 msgid "original title / translation" msgstr "" -#: models/media.py:209 +#: models/media.py:208 msgid "depositor / contributor" msgstr "" -#: models/media.py:209 models/media.py:224 models/media.py:372 -#: models/media.py:390 -msgid "First name, Last name; First name, Last name" -msgstr "" - -#: models/media.py:210 -msgid "document type" +#: models/media.py:208 models/media.py:220 models/media.py:369 +#: models/media.py:399 +msgid "First name, Last name ; First name, Last name" msgstr "" -#: models/media.py:214 models/media.py:792 +#: models/media.py:211 models/media.py:771 msgid "recording year (from)" msgstr "" -#: models/media.py:214 models/media.py:215 models/media.py:216 +#: models/media.py:211 models/media.py:212 models/media.py:213 msgid "YYYY" msgstr "" -#: models/media.py:215 models/media.py:793 +#: models/media.py:212 models/media.py:772 msgid "recording year (until)" msgstr "" -#: models/media.py:216 +#: models/media.py:213 msgid "year published" msgstr "" -#: models/media.py:217 models/media.py:371 -msgid "access type" -msgstr "" - -#: models/media.py:224 models/media.py:403 +#: models/media.py:220 models/media.py:395 msgid "recordist" msgstr "" -#: models/media.py:228 +#: models/media.py:222 msgid "publisher collection" msgstr "" -#: models/media.py:229 +#: models/media.py:223 msgid "publisher serial number" msgstr "" -#: models/media.py:230 -msgid "publisher references" +#: models/media.py:224 +msgid "booklet author" msgstr "" -#: models/media.py:231 -msgid "reference" +#: models/media.py:225 +msgid "publisher reference" msgstr "" -#: models/media.py:232 +#: models/media.py:226 msgid "bibliographic references" msgstr "" -#: models/media.py:234 models/media.py:397 +#: models/media.py:228 models/media.py:384 msgid "automatic access after a rolling period" msgstr "" -#: models/media.py:241 +#: models/media.py:233 msgid "CNRS depositor" msgstr "" -#: models/media.py:243 -msgid "type of copy" -msgstr "" - -#: models/media.py:246 +#: models/media.py:236 msgid "related documentation" msgstr "" -#: models/media.py:250 +#: models/media.py:238 msgid "collection status" msgstr "" -#: models/media.py:251 +#: models/media.py:239 msgid "copies" msgstr "" -#: models/media.py:255 +#: models/media.py:242 msgid "archiver notes" msgstr "" -#: models/media.py:256 +#: models/media.py:243 msgid "items finished" msgstr "" -#: models/media.py:257 +#: models/media.py:244 msgid "recordist identical to depositor" msgstr "" -#: models/media.py:258 templates/telemeta/collection_detail.html:82 +#: models/media.py:245 templates/telemeta/collection_detail.html:82 msgid "published" msgstr "" -#: models/media.py:259 +#: models/media.py:246 msgid "conservation site" msgstr "" -#: models/media.py:264 +#: models/media.py:250 msgid "old code" msgstr "" -#: models/media.py:267 +#: models/media.py:252 msgid "estimated duration" msgstr "" -#: models/media.py:268 +#: models/media.py:253 msgid "number of components (medium / piece)" msgstr "" -#: models/media.py:272 +#: models/media.py:256 msgid "digitization" msgstr "" -#: models/media.py:307 +#: models/media.py:291 msgid "states / nations" msgstr "" -#: models/media.py:321 +#: models/media.py:305 msgid "populations / social groups" msgstr "" -#: models/media.py:329 models/media.py:481 +#: models/media.py:312 models/media.py:463 msgid "computed duration" msgstr "" -#: models/media.py:338 +#: models/media.py:320 msgid "collection size (Mo)" msgstr "" -#: models/media.py:346 models/media.py:352 models/media.py:368 -#: models/media.py:893 +#: models/media.py:328 models/media.py:334 models/media.py:351 +#: models/media.py:886 msgid "collection" msgstr "" -#: models/media.py:356 models/media.py:357 +#: models/media.py:338 models/media.py:339 msgid "collection related media" msgstr "" -#: models/media.py:369 +#: models/media.py:350 +msgid "collector" +msgstr "" + +#: models/media.py:352 msgid "recording date (from)" msgstr "" -#: models/media.py:369 models/media.py:370 +#: models/media.py:352 models/media.py:353 msgid "YYYY-MM-DD" msgstr "" -#: models/media.py:370 +#: models/media.py:353 msgid "recording date (until)" msgstr "" -#: models/media.py:372 -msgid "scientist" -msgstr "" - -#: models/media.py:374 -msgid "summary" -msgstr "" - -#: models/media.py:375 -msgid "remarks" -msgstr "" - -#: models/media.py:379 +#: models/media.py:358 msgid "location details" msgstr "" -#: models/media.py:380 +#: models/media.py:359 msgid "cultural area" msgstr "" -#: models/media.py:382 +#: models/media.py:360 msgid "language" msgstr "" -#: models/media.py:383 +#: models/media.py:361 msgid "ISO language" msgstr "" -#: models/media.py:384 -msgid "comments / ethnographic context" +#: models/media.py:363 templates/telemeta/mediaitem_detail.html:226 +msgid "Ethnographic context" msgstr "" -#: models/media.py:385 +#: models/media.py:366 msgid "implementing rules" msgstr "" -#: models/media.py:390 +#: models/media.py:369 msgid "author / compositor" msgstr "" -#: models/media.py:391 -msgid "contributor" -msgstr "" - -#: models/media.py:395 +#: models/media.py:373 msgid "depositor" msgstr "" -#: models/media.py:400 +#: models/media.py:377 msgid "CollectionCode-ItemCode" msgstr "" -#: models/media.py:402 +#: models/media.py:379 msgid "item number" msgstr "" -#: models/media.py:404 -msgid "digitalist" -msgstr "" - -#: models/media.py:405 -msgid "collector" -msgstr "" - -#: models/media.py:406 +#: models/media.py:380 msgid "collector selection" msgstr "" -#: models/media.py:407 +#: models/media.py:381 msgid "collector as in collection" msgstr "" -#: models/media.py:408 -msgid "digitization date" +#: models/media.py:382 +msgid "creator reference" msgstr "" -#: models/media.py:409 -msgid "publishing date" +#: models/media.py:383 +msgid "published references" msgstr "" -#: models/media.py:410 -msgid "creator reference" +#: models/media.py:385 +msgid "remarks" msgstr "" -#: models/media.py:411 -msgid "published references" +#: models/media.py:389 +msgid "approximative duration" msgstr "" -#: models/media.py:412 -msgid "copy of" +#: models/media.py:389 +msgid "hh:mm:ss" msgstr "" -#: models/media.py:413 +#: models/media.py:390 msgid "mime type" msgstr "" -#: models/media.py:417 +#: models/media.py:392 msgid "URL" msgstr "" -#: models/media.py:420 -msgid "approximative duration" +#: models/media.py:396 +msgid "digitalist" msgstr "" -#: models/media.py:420 -msgid "hh:mm:ss" +#: models/media.py:397 +msgid "digitization date" msgstr "" -#: models/media.py:428 +#: models/media.py:398 +msgid "publishing date" +msgstr "" + +#: models/media.py:399 +msgid "scientist" +msgstr "" + +#: models/media.py:401 +msgid "summary" +msgstr "" + +#: models/media.py:402 +msgid "contributor" +msgstr "" + +#: models/media.py:410 msgid "keywords" msgstr "" -#: models/media.py:516 +#: models/media.py:498 msgid "instruments" msgstr "" -#: models/media.py:549 models/media.py:550 +#: models/media.py:531 models/media.py:532 msgid "item related media" msgstr "" -#: models/media.py:568 +#: models/media.py:548 msgid "composition" msgstr "" -#: models/media.py:570 +#: models/media.py:549 msgid "vernacular name" msgstr "" -#: models/media.py:571 +#: models/media.py:550 msgid "number" msgstr "" -#: models/media.py:572 +#: models/media.py:551 msgid "interprets" msgstr "" -#: models/media.py:583 +#: models/media.py:562 msgid "id" msgstr "" -#: models/media.py:586 +#: models/media.py:565 msgid "unit" msgstr "" -#: models/media.py:605 +#: models/media.py:584 msgid "start" msgstr "" -#: models/media.py:606 +#: models/media.py:585 msgid "end" msgstr "" -#: models/media.py:610 +#: models/media.py:589 msgid "item part" msgstr "" -#: models/media.py:618 models/media.py:635 models/media.py:650 +#: models/media.py:597 models/media.py:614 models/media.py:629 msgid "public_id" msgstr "" -#: models/media.py:636 +#: models/media.py:615 msgid "playlist" msgstr "" -#: models/media.py:637 +#: models/media.py:616 msgid "resource_type" msgstr "" -#: models/media.py:638 +#: models/media.py:617 msgid "resource_id" msgstr "" -#: models/media.py:651 +#: models/media.py:630 msgid "time (s)" msgstr "" -#: models/media.py:655 +#: models/media.py:634 msgid "author" msgstr "" -#: models/media.py:711 +#: models/media.py:690 msgid "transcoded" msgstr "" -#: models/media.py:791 +#: models/media.py:770 msgid "collections" msgstr "" -#: models/media.py:810 models/media.py:811 models/media.py:821 -#: models/media.py:845 +#: models/media.py:792 models/media.py:827 +msgid "total available duration" +msgstr "" + +#: models/media.py:796 models/media.py:797 models/media.py:807 +#: models/media.py:838 msgid "corpus" msgstr "" -#: models/media.py:838 models/media.py:839 models/media.py:856 +#: models/media.py:831 models/media.py:832 models/media.py:849 msgid "fonds" msgstr "" -#: models/media.py:849 models/media.py:850 +#: models/media.py:842 models/media.py:843 msgid "corpus related media" msgstr "" -#: models/media.py:860 models/media.py:861 +#: models/media.py:853 models/media.py:854 msgid "fonds related media" msgstr "" -#: models/media.py:869 +#: models/media.py:862 msgid "date of first attribution" msgstr "" -#: models/media.py:870 +#: models/media.py:863 msgid "date of last attribution" msgstr "" -#: models/media.py:871 +#: models/media.py:864 msgid "date of last modification" msgstr "" -#: models/media.py:872 +#: models/media.py:865 msgid "notes" msgstr "" -#: models/media.py:885 +#: models/media.py:878 msgid "item identifier" msgstr "" -#: models/media.py:886 +#: models/media.py:879 msgid "item identifiers" msgstr "" -#: models/media.py:897 +#: models/media.py:890 msgid "collection identifier" msgstr "" -#: models/media.py:898 +#: models/media.py:891 msgid "collection identifiers" msgstr "" @@ -930,12 +930,12 @@ msgid "g:i A,M j,n/j/y" msgstr "" #: templates/postman/base_folder.html:49 templates/postman/view.html:25 -#: templates/telemeta/collection_detail.html:223 +#: templates/telemeta/collection_detail.html:231 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:353 +#: templates/telemeta/mediaitem_detail.html:352 #: templates/telemeta/mediaitem_detail_dc.html:20 -#: templates/telemeta/resource_detail.html:104 +#: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 msgid "Delete" msgstr "" @@ -1112,7 +1112,7 @@ msgstr "" msgid "Title" msgstr "" -#: templates/telemeta/admin_enumerations.html:24 +#: templates/telemeta/admin_enumerations.html:26 msgid "No enumerations" msgstr "" @@ -1211,7 +1211,7 @@ msgid "" msgstr "" #: templates/telemeta/base.html:186 -#: templates/telemeta/collection_detail.html:114 +#: templates/telemeta/collection_detail.html:117 msgid "Legal notices" msgstr "" @@ -1294,8 +1294,7 @@ msgid "Download" msgstr "" #: templates/telemeta/collection_detail.html:68 -#: templates/telemeta/geo_continents.html:26 -msgid "List" +msgid "View list" msgstr "" #: templates/telemeta/collection_detail.html:78 @@ -1312,48 +1311,48 @@ msgstr "" msgid "Recording period" msgstr "" -#: templates/telemeta/collection_detail.html:101 -#: templates/telemeta/mediaitem_detail.html:217 +#: templates/telemeta/collection_detail.html:104 +#: templates/telemeta/mediaitem_detail.html:214 msgid "Geographic and cultural informations" msgstr "" -#: templates/telemeta/collection_detail.html:119 +#: templates/telemeta/collection_detail.html:122 #: templates/telemeta/inc/collection_list.html:11 #: templates/telemeta/inc/mediaitem_list.html:10 #: templates/telemeta/lists.html:72 msgid "Recordist" msgstr "" -#: templates/telemeta/collection_detail.html:132 +#: templates/telemeta/collection_detail.html:137 msgid "Bibliographic references" msgstr "" -#: templates/telemeta/collection_detail.html:145 +#: templates/telemeta/collection_detail.html:149 #: templates/telemeta/mediaitem_detail.html:277 msgid "Archiving data" msgstr "" -#: templates/telemeta/collection_detail.html:153 +#: templates/telemeta/collection_detail.html:157 msgid "Related documentation" msgstr "" -#: templates/telemeta/collection_detail.html:160 -#: templates/telemeta/mediaitem_detail.html:315 +#: templates/telemeta/collection_detail.html:165 +#: templates/telemeta/mediaitem_detail.html:314 msgid "Comments" msgstr "" -#: templates/telemeta/collection_detail.html:164 -#: templates/telemeta/mediaitem_detail.html:290 -#: templates/telemeta/resource_detail.html:74 +#: templates/telemeta/collection_detail.html:169 +#: templates/telemeta/mediaitem_detail.html:291 +#: templates/telemeta/resource_detail.html:75 msgid "Last modification" msgstr "" -#: templates/telemeta/collection_detail.html:178 -#: templates/telemeta/mediaitem_detail.html:300 +#: templates/telemeta/collection_detail.html:183 +#: templates/telemeta/mediaitem_detail.html:301 msgid "Technical data" msgstr "" -#: templates/telemeta/collection_detail.html:188 +#: templates/telemeta/collection_detail.html:196 #: templates/telemeta/geo_countries.html:16 msgid "Number of items" msgstr "" @@ -1521,6 +1520,10 @@ msgstr "" msgid "Map" msgstr "" +#: templates/telemeta/geo_continents.html:26 +msgid "List" +msgstr "" + #: templates/telemeta/geo_countries.html:8 #: templates/telemeta/geo_country_collections.html:8 #: templates/telemeta/geo_country_items.html:8 @@ -1612,7 +1615,7 @@ msgid "Dublin Core Metadata" msgstr "" #: templates/telemeta/inc/mediaitem_list.html:12 -#: templates/telemeta/mediaitem_detail.html:219 +#: templates/telemeta/mediaitem_detail.html:216 msgid "Location" msgstr "" @@ -1728,7 +1731,7 @@ msgid "Next" msgstr "" #: templates/telemeta/mediaitem_detail.html:154 -msgid "Analysis" +msgid "File" msgstr "" #: templates/telemeta/mediaitem_detail.html:156 @@ -1759,30 +1762,22 @@ msgstr "" msgid "Recording date" msgstr "" -#: templates/telemeta/mediaitem_detail.html:225 +#: templates/telemeta/mediaitem_detail.html:222 msgid "Language ISO" msgstr "" -#: templates/telemeta/mediaitem_detail.html:229 -msgid "Ethnographic context" -msgstr "" - -#: templates/telemeta/mediaitem_detail.html:240 +#: templates/telemeta/mediaitem_detail.html:237 msgid "Musical informations" msgstr "" -#: templates/telemeta/mediaitem_detail.html:284 +#: templates/telemeta/mediaitem_detail.html:285 msgid "Published references" msgstr "" -#: templates/telemeta/mediaitem_detail.html:287 +#: templates/telemeta/mediaitem_detail.html:288 msgid "Remarks" msgstr "" -#: templates/telemeta/mediaitem_detail.html:303 -msgid "Media type" -msgstr "" - #: templates/telemeta/mediaitem_detail_dc.html:13 msgid "No such item" msgstr "" @@ -2025,7 +2020,7 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/telemeta/resource_detail.html:109 +#: templates/telemeta/resource_detail.html:110 #: templates/telemeta/resource_detail_dc.html:22 msgid "No such resource" msgstr "" @@ -2113,6 +2108,6 @@ msgstr "" msgid "Last changes" msgstr "" -#: views/item.py:720 +#: views/item.py:721 msgid "You have successfully updated your item." msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index e5b42e23..50de5889 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index ddbb8064..2ef84be4 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-28 15:13+0100\n" +"POT-Creation-Date: 2014-11-10 16:01+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -25,125 +25,129 @@ msgstr "Durée" msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "Entrez une durée valide au format HH:MM[:ss]" -#: models/enum.py:43 models/enum.py:143 models/media.py:585 +#: models/enum.py:44 models/enum.py:144 models/media.py:564 #: models/system.py:104 msgid "value" msgstr "valeur" -#: models/enum.py:59 models/media.py:270 +#: models/enum.py:60 models/media.py:254 msgid "archive format" msgstr "support archivé" -#: models/enum.py:66 models/media.py:248 +#: models/enum.py:67 models/media.py:237 msgid "secondary edition" msgstr "réédition" -#: models/enum.py:73 models/media.py:240 +#: models/enum.py:74 models/media.py:232 msgid "mode of acquisition" msgstr "mode d'acquisition" -#: models/enum.py:80 models/media.py:245 +#: models/enum.py:81 models/media.py:235 msgid "record author" msgstr "rédacteur fiche" -#: models/enum.py:87 models/media.py:254 +#: models/enum.py:88 models/media.py:241 msgid "record writer" msgstr "saisie fiche" -#: models/enum.py:94 models/media.py:236 +#: models/enum.py:95 models/media.py:229 msgid "legal rights" msgstr "droit d'utilisation" -#: models/enum.py:101 models/media.py:213 +#: models/enum.py:102 models/media.py:210 msgid "recording context" msgstr "contexte d'enregistrement" -#: models/enum.py:108 +#: models/enum.py:109 msgid "A/D conversion" msgstr "Conversion A/N" -#: models/enum.py:115 models/media.py:388 +#: models/enum.py:116 models/media.py:367 msgid "vernacular style" msgstr "style vernaculaire" -#: models/enum.py:122 models/media.py:389 +#: models/enum.py:123 models/media.py:368 msgid "generic style" msgstr "style générique" -#: models/enum.py:129 models/media.py:556 +#: models/enum.py:130 models/media.py:538 msgid "keyword" msgstr "Mot-clé" -#: models/enum.py:136 models/enum.py:142 models/media.py:226 +#: models/enum.py:137 models/enum.py:143 models/media.py:221 msgid "publisher" msgstr "éditeur" -#: models/enum.py:158 models/enum.py:164 models/media.py:381 +#: models/enum.py:159 models/enum.py:165 models/media.py:362 msgid "population / social group" msgstr "population / groupe social" -#: models/enum.py:165 models/instrument.py:43 models/instrument.py:53 +#: models/enum.py:166 models/instrument.py:43 models/instrument.py:53 #: models/language.py:54 models/location.py:51 models/location.py:158 -#: models/media.py:584 +#: models/media.py:563 msgid "name" msgstr "nom" -#: models/enum.py:179 models/format.py:77 +#: models/enum.py:182 models/format.py:77 msgid "tape wheel diameter (cm)" msgstr "diamètre de bobine (cm)" -#: models/enum.py:186 +#: models/enum.py:191 msgid "tape length (cm)" msgstr "longueur de bande (cm)" -#: models/enum.py:193 +#: models/enum.py:200 msgid "tape width (inch)" msgstr "largeur de bande (pouce)" -#: models/enum.py:200 models/format.py:80 +#: models/enum.py:209 models/format.py:80 msgid "tape speed (cm/s)" msgstr "vitesse de bande (cm/s)" -#: models/enum.py:207 models/format.py:82 -msgid "tape vendor" +#: models/enum.py:218 +msgid "tape brand" msgstr "marque de bande" -#: models/enum.py:214 models/format.py:71 +#: models/enum.py:228 models/format.py:71 msgid "number of channels" msgstr "Nombre de pistes" -#: models/enum.py:221 models/media.py:394 +#: models/enum.py:238 models/media.py:372 msgid "organization" msgstr "organisation" -#: models/enum.py:228 models/media.py:396 +#: models/enum.py:248 models/media.py:374 msgid "rights" msgstr "droits" -#: models/enum.py:235 models/media.py:373 +#: models/enum.py:258 models/media.py:400 msgid "topic" msgstr "discipline" -#: models/enum.py:243 +#: models/enum.py:266 models/media.py:234 msgid "copy type" msgstr "type d'exemplaire'" -#: models/enum.py:251 models/media.py:266 +#: models/enum.py:274 models/media.py:251 models/media.py:388 msgid "media type" +msgstr "type de média" + +#: models/enum.py:282 models/media.py:255 +msgid "original format" msgstr "support original" -#: models/enum.py:259 models/media.py:677 +#: models/enum.py:290 models/media.py:656 msgid "status" msgstr "état" -#: models/enum.py:267 +#: models/enum.py:298 msgid "identifier type" msgstr "type d'identifiant" -#: models/format.py:58 models/media.py:455 models/media.py:528 -#: models/media.py:555 models/media.py:566 models/media.py:582 -#: models/media.py:603 models/media.py:649 models/media.py:674 -#: models/media.py:708 models/media.py:881 +#: models/format.py:58 models/media.py:437 models/media.py:510 +#: models/media.py:537 models/media.py:547 models/media.py:561 +#: models/media.py:582 models/media.py:628 models/media.py:653 +#: models/media.py:687 models/media.py:874 msgid "item" msgstr "item" @@ -151,7 +155,7 @@ msgstr "item" msgid "physical format" msgstr "nature du support original" -#: models/format.py:62 models/media.py:401 +#: models/format.py:62 models/media.py:378 msgid "original code" msgstr "cote originale" @@ -187,6 +191,10 @@ msgstr "système d'enregistrement" msgid "tape thickness (um)" msgstr "épaisseur de bande (um)" +#: models/format.py:82 +msgid "tape vendor" +msgstr "marque de bande" + #: models/format.py:83 msgid "tape reference" msgstr "référence de bande" @@ -215,7 +223,7 @@ msgstr "instrument parent" msgid "alias" msgstr "alias" -#: models/language.py:48 models/location.py:157 models/media.py:867 +#: models/language.py:48 models/location.py:157 models/media.py:860 msgid "identifier" msgstr "identifiant" @@ -235,11 +243,11 @@ msgstr "identifiant ISO 639-1 équivalent" msgid "scope" msgstr "cadre" -#: models/language.py:53 models/location.py:52 models/media.py:868 +#: models/language.py:53 models/location.py:52 models/media.py:861 msgid "type" msgstr "type" -#: models/language.py:55 models/media.py:252 +#: models/language.py:55 models/media.py:240 msgid "comment" msgstr "commentaire" @@ -272,7 +280,7 @@ msgid "authoritative" msgstr "officiel" #: models/location.py:112 models/location.py:170 models/location.py:185 -#: models/media.py:378 +#: models/media.py:357 msgid "location" msgstr "lieu" @@ -296,79 +304,83 @@ msgstr "lieu ancêtre" msgid "location relations" msgstr "lieux relations" -#: models/media.py:79 models/media.py:82 models/media.py:449 +#: models/media.py:80 models/media.py:83 models/media.py:431 msgid "none" -msgstr "accès réservé" +msgstr "consultation sur demande" -#: models/media.py:79 models/media.py:82 +#: models/media.py:80 models/media.py:83 msgid "metadata" -msgstr "métadonnées" +msgstr "consultation restreinte" -#: models/media.py:80 +#: models/media.py:81 msgid "mixed" -msgstr "mixte" +msgstr "accès partiel aux items" -#: models/media.py:80 models/media.py:83 +#: models/media.py:81 models/media.py:84 msgid "full" -msgstr "complet" +msgstr "consultation libre" -#: models/media.py:85 +#: models/media.py:86 msgid "broken" msgstr "cassé" -#: models/media.py:85 +#: models/media.py:86 msgid "pending" msgstr "en attente" -#: models/media.py:85 +#: models/media.py:86 msgid "processing" msgstr "en cours" -#: models/media.py:86 +#: models/media.py:87 msgid "done" msgstr "fait" -#: models/media.py:86 +#: models/media.py:87 msgid "ready" msgstr "prêt" -#: models/media.py:103 +#: models/media.py:104 msgid "Metadata only" msgstr "Métadonnées uniquement" -#: models/media.py:105 +#: models/media.py:106 msgid "Sound and metadata" msgstr "Son et métadonnées" -#: models/media.py:107 +#: models/media.py:108 msgid "Private data" msgstr "Données privées" -#: models/media.py:108 models/media.py:127 -msgid "public access" -msgstr "accès public" +#: models/media.py:109 models/media.py:214 models/media.py:354 +msgid "access type" +msgstr "type d'accès" -#: models/media.py:124 models/media.py:153 models/media.py:207 -#: models/media.py:366 models/media.py:604 models/media.py:620 -#: models/media.py:652 +#: models/media.py:125 models/media.py:153 models/media.py:206 +#: models/media.py:348 models/media.py:583 models/media.py:599 +#: models/media.py:631 msgid "title" msgstr "titre" -#: models/media.py:125 models/media.py:155 models/media.py:211 -#: models/media.py:621 models/media.py:654 +#: models/media.py:126 models/media.py:155 models/media.py:209 +#: models/media.py:600 models/media.py:633 msgid "description" msgstr "description" -#: models/media.py:126 models/media.py:262 models/media.py:400 +#: models/media.py:127 models/media.py:249 models/media.py:377 msgid "code" msgstr "cote" -#: models/media.py:154 models/media.py:653 models/media.py:676 -#: models/media.py:710 models/system.py:116 +#: models/media.py:128 +msgid "public access" +msgstr "accès public" + +#: models/media.py:154 models/media.py:632 models/media.py:655 +#: models/media.py:689 models/system.py:116 msgid "date" msgstr "" -#: models/media.py:156 models/media.py:675 models/media.py:709 +#: models/media.py:156 models/media.py:654 models/media.py:688 msgid "mime_type" msgstr "type mime" @@ -380,403 +392,390 @@ msgstr "" msgid "credits" msgstr "crédits" -#: models/media.py:159 models/media.py:416 models/media.py:678 +#: models/media.py:159 models/media.py:391 models/media.py:657 msgid "file" msgstr "fichier" -#: models/media.py:208 models/media.py:367 +#: models/media.py:207 models/media.py:349 msgid "original title / translation" msgstr "titre original / traduction" -#: models/media.py:209 +#: models/media.py:208 msgid "depositor / contributor" msgstr "déposant / contributeur" -#: models/media.py:209 models/media.py:224 models/media.py:372 -#: models/media.py:390 -msgid "First name, Last name; First name, Last name" -msgstr "Nom, Prénom; Nom, Prénom" - -#: models/media.py:210 -msgid "document type" -msgstr "type de document" +#: models/media.py:208 models/media.py:220 models/media.py:369 +#: models/media.py:399 +msgid "First name, Last name ; First name, Last name" +msgstr "Nom, Prénom ; Nom, Prénom" -#: models/media.py:214 models/media.py:792 +#: models/media.py:211 models/media.py:771 msgid "recording year (from)" msgstr "année d'enregistrement (depuis)" -#: models/media.py:214 models/media.py:215 models/media.py:216 +#: models/media.py:211 models/media.py:212 models/media.py:213 msgid "YYYY" msgstr "AAAA" -#: models/media.py:215 models/media.py:793 +#: models/media.py:212 models/media.py:772 msgid "recording year (until)" msgstr "année d'enregistrement (jusqu'à)" -#: models/media.py:216 +#: models/media.py:213 msgid "year published" msgstr "année de parution" -#: models/media.py:217 models/media.py:371 -msgid "access type" -msgstr "type d'accès" - -#: models/media.py:224 models/media.py:403 +#: models/media.py:220 models/media.py:395 msgid "recordist" msgstr "collecteur" -#: models/media.py:228 +#: models/media.py:222 msgid "publisher collection" msgstr "collection éditeur" -#: models/media.py:229 +#: models/media.py:223 msgid "publisher serial number" msgstr "numéro dans la série" -#: models/media.py:230 -msgid "publisher references" -msgstr "références éditées" +#: models/media.py:224 +msgid "booklet author" +msgstr "auteur de la notice éditée" -#: models/media.py:231 -msgid "reference" +#: models/media.py:225 +msgid "publisher reference" msgstr "référence de l'éditeur" -#: models/media.py:232 +#: models/media.py:226 msgid "bibliographic references" msgstr "références bibliographiques" -#: models/media.py:234 models/media.py:397 +#: models/media.py:228 models/media.py:384 msgid "automatic access after a rolling period" -msgstr "Accès automatique après la data glissante" +msgstr "accès automatique après la date glissante" -#: models/media.py:241 +#: models/media.py:233 msgid "CNRS depositor" msgstr "déposant CNRS" -#: models/media.py:243 -msgid "type of copy" -msgstr "type de copie" - -#: models/media.py:246 +#: models/media.py:236 msgid "related documentation" msgstr "documentation associée" -#: models/media.py:250 +#: models/media.py:238 msgid "collection status" -msgstr "status de la collection" +msgstr "statut de la collection" -#: models/media.py:251 +#: models/media.py:239 msgid "copies" msgstr "autres exemplaires" -#: models/media.py:255 +#: models/media.py:242 msgid "archiver notes" msgstr "notes de l'archiviste" -#: models/media.py:256 +#: models/media.py:243 msgid "items finished" msgstr "fiches items faites" -#: models/media.py:257 +#: models/media.py:244 msgid "recordist identical to depositor" msgstr "collecteur identique au déposant" -#: models/media.py:258 templates/telemeta/collection_detail.html:82 +#: models/media.py:245 templates/telemeta/collection_detail.html:82 msgid "published" msgstr "édité" -#: models/media.py:259 +#: models/media.py:246 msgid "conservation site" msgstr "lieu de conservation" -#: models/media.py:264 +#: models/media.py:250 msgid "old code" msgstr "ancienne cote" -#: models/media.py:267 +#: models/media.py:252 msgid "estimated duration" msgstr "durée estimée" -#: models/media.py:268 +#: models/media.py:253 msgid "number of components (medium / piece)" msgstr "nb de composants (support / pièce)" -#: models/media.py:272 +#: models/media.py:256 msgid "digitization" msgstr "numérisation" -#: models/media.py:307 +#: models/media.py:291 msgid "states / nations" msgstr "états / nations" -#: models/media.py:321 +#: models/media.py:305 msgid "populations / social groups" msgstr "populations / groupes sociaux" -#: models/media.py:329 models/media.py:481 +#: models/media.py:312 models/media.py:463 msgid "computed duration" msgstr "durée calculée" -#: models/media.py:338 -#| msgid "collections" +#: models/media.py:320 msgid "collection size (Mo)" msgstr "volume de la collection (Mo)" -#: models/media.py:346 models/media.py:352 models/media.py:368 -#: models/media.py:893 +#: models/media.py:328 models/media.py:334 models/media.py:351 +#: models/media.py:886 msgid "collection" msgstr "collection" -#: models/media.py:356 models/media.py:357 +#: models/media.py:338 models/media.py:339 msgid "collection related media" msgstr "média associés à la collection" -#: models/media.py:369 +#: models/media.py:350 +msgid "collector" +msgstr "collecteur" + +#: models/media.py:352 msgid "recording date (from)" msgstr "date d'enregistrement (depuis)" -#: models/media.py:369 models/media.py:370 +#: models/media.py:352 models/media.py:353 msgid "YYYY-MM-DD" msgstr "AAAA-MM-JJ" -#: models/media.py:370 +#: models/media.py:353 msgid "recording date (until)" msgstr "date d'enregistrement (jusqu'à)" -#: models/media.py:372 -msgid "scientist" -msgstr "reponsable scientifique" - -#: models/media.py:374 -msgid "summary" -msgstr "résumé" - -#: models/media.py:375 -msgid "remarks" -msgstr "remarques" - -#: models/media.py:379 +#: models/media.py:358 msgid "location details" msgstr "précisions lieu" -#: models/media.py:380 +#: models/media.py:359 msgid "cultural area" msgstr "aire culturelle" -#: models/media.py:382 +#: models/media.py:360 msgid "language" msgstr "langue" -#: models/media.py:383 +#: models/media.py:361 msgid "ISO language" msgstr "Langue ISO" -#: models/media.py:384 -msgid "comments / ethnographic context" -msgstr "contexte ethnographique" +#: models/media.py:363 templates/telemeta/mediaitem_detail.html:226 +msgid "Ethnographic context" +msgstr "Contexte ethnographique" -#: models/media.py:385 +#: models/media.py:366 msgid "implementing rules" msgstr "modalités d'exécution" -#: models/media.py:390 +#: models/media.py:369 msgid "author / compositor" msgstr "auteur / compositeur" -#: models/media.py:391 -msgid "contributor" -msgstr "intervenant" - -#: models/media.py:395 +#: models/media.py:373 msgid "depositor" msgstr "déposant" -#: models/media.py:400 +#: models/media.py:377 msgid "CollectionCode-ItemCode" msgstr "CodeCollection-CodeItem" -#: models/media.py:402 +#: models/media.py:379 msgid "item number" msgstr "n° de l'item" -#: models/media.py:404 -msgid "digitalist" -msgstr "opérateur de numérisation" - -#: models/media.py:405 -msgid "collector" -msgstr "collecteur" - -#: models/media.py:406 +#: models/media.py:380 msgid "collector selection" msgstr "sélection collecteur" -#: models/media.py:407 +#: models/media.py:381 msgid "collector as in collection" msgstr "collecteur identique à la collection" -#: models/media.py:408 -msgid "digitization date" -msgstr "date de numérisation" - -#: models/media.py:409 -msgid "publishing date" -msgstr "date de création du support édité" - -#: models/media.py:410 +#: models/media.py:382 msgid "creator reference" -msgstr "référence" +msgstr "référence du collecteur" -#: models/media.py:411 +#: models/media.py:383 msgid "published references" msgstr "références éditées" -#: models/media.py:412 -msgid "copy of" -msgstr "copie de" +#: models/media.py:385 +msgid "remarks" +msgstr "remarques" + +#: models/media.py:389 +msgid "approximative duration" +msgstr "durée estimée" + +#: models/media.py:389 +msgid "hh:mm:ss" +msgstr "" -#: models/media.py:413 +#: models/media.py:390 msgid "mime type" msgstr "type mime" -#: models/media.py:417 +#: models/media.py:392 msgid "URL" msgstr "" -#: models/media.py:420 -msgid "approximative duration" -msgstr "durée" +#: models/media.py:396 +msgid "digitalist" +msgstr "opérateur de numérisation" -#: models/media.py:420 -msgid "hh:mm:ss" -msgstr "" +#: models/media.py:397 +msgid "digitization date" +msgstr "date de numérisation" + +#: models/media.py:398 +msgid "publishing date" +msgstr "date de création du support édité" -#: models/media.py:428 +#: models/media.py:399 +msgid "scientist" +msgstr "reponsable scientifique" + +#: models/media.py:401 +msgid "summary" +msgstr "résumé" + +#: models/media.py:402 +msgid "contributor" +msgstr "intervenant" + +#: models/media.py:410 msgid "keywords" msgstr "mots-clés" -#: models/media.py:516 +#: models/media.py:498 msgid "instruments" msgstr "instruments" -#: models/media.py:549 models/media.py:550 +#: models/media.py:531 models/media.py:532 msgid "item related media" msgstr "média associés à l'item" -#: models/media.py:568 +#: models/media.py:548 msgid "composition" msgstr "Voix / Instruments" -#: models/media.py:570 +#: models/media.py:549 msgid "vernacular name" msgstr "nom vernaculaire" -#: models/media.py:571 +#: models/media.py:550 msgid "number" msgstr "nombre" -#: models/media.py:572 +#: models/media.py:551 msgid "interprets" msgstr "interprètes" -#: models/media.py:583 +#: models/media.py:562 msgid "id" msgstr "" -#: models/media.py:586 +#: models/media.py:565 msgid "unit" msgstr "unité" -#: models/media.py:605 +#: models/media.py:584 msgid "start" msgstr "début" -#: models/media.py:606 +#: models/media.py:585 msgid "end" msgstr "fin" -#: models/media.py:610 +#: models/media.py:589 msgid "item part" msgstr "partie" -#: models/media.py:618 models/media.py:635 models/media.py:650 +#: models/media.py:597 models/media.py:614 models/media.py:629 msgid "public_id" msgstr "public_id" -#: models/media.py:636 +#: models/media.py:615 msgid "playlist" msgstr "liste de lecture" -#: models/media.py:637 +#: models/media.py:616 msgid "resource_type" msgstr "type de ressource" -#: models/media.py:638 +#: models/media.py:617 msgid "resource_id" msgstr "ressource" -#: models/media.py:651 +#: models/media.py:630 msgid "time (s)" msgstr "temps (s)" -#: models/media.py:655 +#: models/media.py:634 msgid "author" msgstr "auteur" -#: models/media.py:711 +#: models/media.py:690 msgid "transcoded" msgstr "transcodé" -#: models/media.py:791 +#: models/media.py:770 msgid "collections" msgstr "collections" -#: models/media.py:810 models/media.py:811 models/media.py:821 -#: models/media.py:845 +#: models/media.py:792 models/media.py:827 +msgid "total available duration" +msgstr "durée totale disponible" + +#: models/media.py:796 models/media.py:797 models/media.py:807 +#: models/media.py:838 msgid "corpus" msgstr "corpus" -#: models/media.py:838 models/media.py:839 models/media.py:856 +#: models/media.py:831 models/media.py:832 models/media.py:849 msgid "fonds" msgstr "fonds" -#: models/media.py:849 models/media.py:850 +#: models/media.py:842 models/media.py:843 msgid "corpus related media" msgstr "média associés" -#: models/media.py:860 models/media.py:861 +#: models/media.py:853 models/media.py:854 msgid "fonds related media" msgstr "média associés" -#: models/media.py:869 +#: models/media.py:862 msgid "date of first attribution" msgstr "date de dpremière attribution" -#: models/media.py:870 +#: models/media.py:863 msgid "date of last attribution" msgstr "date de dernière attribution" -#: models/media.py:871 +#: models/media.py:864 msgid "date of last modification" msgstr "date de dernière modification" -#: models/media.py:872 +#: models/media.py:865 msgid "notes" msgstr "notes" -#: models/media.py:885 +#: models/media.py:878 msgid "item identifier" msgstr "identifiant de l'item" -#: models/media.py:886 +#: models/media.py:879 msgid "item identifiers" msgstr "identifiants de l'item" -#: models/media.py:897 +#: models/media.py:890 msgid "collection identifier" msgstr "identifiant de la collection" -#: models/media.py:898 +#: models/media.py:891 msgid "collection identifiers" msgstr "identifiants de la collection" @@ -931,12 +930,12 @@ msgid "g:i A,M j,n/j/y" msgstr "" #: templates/postman/base_folder.html:49 templates/postman/view.html:25 -#: templates/telemeta/collection_detail.html:223 +#: templates/telemeta/collection_detail.html:231 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:353 +#: templates/telemeta/mediaitem_detail.html:352 #: templates/telemeta/mediaitem_detail_dc.html:20 -#: templates/telemeta/resource_detail.html:104 +#: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 msgid "Delete" msgstr "Supprimer" @@ -1113,7 +1112,7 @@ msgstr "Énumérations" msgid "Title" msgstr "Titre" -#: templates/telemeta/admin_enumerations.html:24 +#: templates/telemeta/admin_enumerations.html:26 msgid "No enumerations" msgstr "Aucune énumération" @@ -1214,7 +1213,7 @@ msgstr "" "communautés d'origine." #: templates/telemeta/base.html:186 -#: templates/telemeta/collection_detail.html:114 +#: templates/telemeta/collection_detail.html:117 msgid "Legal notices" msgstr "Mentions légales" @@ -1297,9 +1296,8 @@ msgid "Download" msgstr "Téléchargement" #: templates/telemeta/collection_detail.html:68 -#: templates/telemeta/geo_continents.html:26 -msgid "List" -msgstr "Liste" +msgid "View list" +msgstr "Voir liste" #: templates/telemeta/collection_detail.html:78 msgid "Document status" @@ -1315,48 +1313,48 @@ msgstr "inédites" msgid "Recording period" msgstr "Période d'enregistrement" -#: templates/telemeta/collection_detail.html:101 -#: templates/telemeta/mediaitem_detail.html:217 +#: templates/telemeta/collection_detail.html:104 +#: templates/telemeta/mediaitem_detail.html:214 msgid "Geographic and cultural informations" msgstr "Indications géographiques et culturelles" -#: templates/telemeta/collection_detail.html:119 +#: templates/telemeta/collection_detail.html:122 #: templates/telemeta/inc/collection_list.html:11 #: templates/telemeta/inc/mediaitem_list.html:10 #: templates/telemeta/lists.html:72 msgid "Recordist" msgstr "Collecteur" -#: templates/telemeta/collection_detail.html:132 +#: templates/telemeta/collection_detail.html:137 msgid "Bibliographic references" msgstr "Références bibliographiques" -#: templates/telemeta/collection_detail.html:145 +#: templates/telemeta/collection_detail.html:149 #: templates/telemeta/mediaitem_detail.html:277 msgid "Archiving data" msgstr "Données d'archivage" -#: templates/telemeta/collection_detail.html:153 +#: templates/telemeta/collection_detail.html:157 msgid "Related documentation" msgstr "Documentation associée" -#: templates/telemeta/collection_detail.html:160 -#: templates/telemeta/mediaitem_detail.html:315 +#: templates/telemeta/collection_detail.html:165 +#: templates/telemeta/mediaitem_detail.html:314 msgid "Comments" msgstr "Commentaires" -#: templates/telemeta/collection_detail.html:164 -#: templates/telemeta/mediaitem_detail.html:290 -#: templates/telemeta/resource_detail.html:74 +#: templates/telemeta/collection_detail.html:169 +#: templates/telemeta/mediaitem_detail.html:291 +#: templates/telemeta/resource_detail.html:75 msgid "Last modification" msgstr "Dernière modification de la fiche" -#: templates/telemeta/collection_detail.html:178 -#: templates/telemeta/mediaitem_detail.html:300 +#: templates/telemeta/collection_detail.html:183 +#: templates/telemeta/mediaitem_detail.html:301 msgid "Technical data" msgstr "Données techniques" -#: templates/telemeta/collection_detail.html:188 +#: templates/telemeta/collection_detail.html:196 #: templates/telemeta/geo_countries.html:16 msgid "Number of items" msgstr "Nombre d'items" @@ -1524,6 +1522,10 @@ msgstr "Navigateur géographique" msgid "Map" msgstr "Carte" +#: templates/telemeta/geo_continents.html:26 +msgid "List" +msgstr "Liste" + #: templates/telemeta/geo_countries.html:8 #: templates/telemeta/geo_country_collections.html:8 #: templates/telemeta/geo_country_items.html:8 @@ -1617,7 +1619,7 @@ msgid "Dublin Core Metadata" msgstr "Métadonnées Dublin Core" #: templates/telemeta/inc/mediaitem_list.html:12 -#: templates/telemeta/mediaitem_detail.html:219 +#: templates/telemeta/mediaitem_detail.html:216 msgid "Location" msgstr "Lieu" @@ -1734,8 +1736,8 @@ msgid "Next" msgstr "Suivant" #: templates/telemeta/mediaitem_detail.html:154 -msgid "Analysis" -msgstr "Analyse" +msgid "File" +msgstr "Fichier" #: templates/telemeta/mediaitem_detail.html:156 msgid "Markers" @@ -1765,30 +1767,22 @@ msgstr "Cliquez ici" msgid "Recording date" msgstr "Date d'enregistrement" -#: templates/telemeta/mediaitem_detail.html:225 +#: templates/telemeta/mediaitem_detail.html:222 msgid "Language ISO" msgstr "Langue ISO" -#: templates/telemeta/mediaitem_detail.html:229 -msgid "Ethnographic context" -msgstr "Contexte ethnographique" - -#: templates/telemeta/mediaitem_detail.html:240 +#: templates/telemeta/mediaitem_detail.html:237 msgid "Musical informations" msgstr "Informations sur la musique" -#: templates/telemeta/mediaitem_detail.html:284 +#: templates/telemeta/mediaitem_detail.html:285 msgid "Published references" msgstr "Références éditées" -#: templates/telemeta/mediaitem_detail.html:287 +#: templates/telemeta/mediaitem_detail.html:288 msgid "Remarks" msgstr "Remarques" -#: templates/telemeta/mediaitem_detail.html:303 -msgid "Media type" -msgstr "Type de media" - #: templates/telemeta/mediaitem_detail_dc.html:13 msgid "No such item" msgstr "Item introuvable" @@ -1800,7 +1794,7 @@ msgstr "Mots-clés" #: templates/telemeta/mediaitem_edit.html:24 #: templates/telemeta/mediaitem_performances_edit.html:25 msgid "Performance" -msgstr "Composition" +msgstr "Voix / Instruments" #: templates/telemeta/mediaitem_edit.html:25 msgid "Format" @@ -2033,7 +2027,7 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/telemeta/resource_detail.html:109 +#: templates/telemeta/resource_detail.html:110 #: templates/telemeta/resource_detail_dc.html:22 msgid "No such resource" msgstr "Aucune ressource de ce type" @@ -2123,10 +2117,31 @@ msgstr "" msgid "Last changes" msgstr "Dernières modifications" -#: views/item.py:720 +#: views/item.py:721 msgid "You have successfully updated your item." msgstr "" +#~ msgid "Analysis" +#~ msgstr "Analyse" + +#~ msgid "comments / ethnographic context" +#~ msgstr "contexte ethnographique" + +#~ msgid "copy of" +#~ msgstr "copie de" + +#~ msgid "Media type" +#~ msgstr "Type de media" + +#~ msgid "document type" +#~ msgstr "type de document" + +#~ msgid "type of copy" +#~ msgstr "type de copie" + +#~ msgid "reference" +#~ msgstr "référence de l'éditeur" + #~| msgid "Item access status" #~ msgid "access status" #~ msgstr "Statut d'accès de l'item" @@ -2197,9 +2212,6 @@ msgstr "" #~ msgid "channel number" #~ msgstr "n° de l'item" -#~ msgid "original format" -#~ msgstr "support original" - #, fuzzy #~ msgid "Password initialization" #~ msgstr "Mot de passe (encore)" @@ -2216,9 +2228,6 @@ msgstr "" #~ msgid "related" #~ msgstr "associés" -#~ msgid "File" -#~ msgstr "Fichier" - #~ msgid "Comments / ethnographic context" #~ msgstr "Commentaires / contexte ethnographique" diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo index c91e5817..6e4bdaf2 100644 Binary files a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo and b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.po b/telemeta/locale/zh_CN/LC_MESSAGES/django.po index e2446efc..7a7a64a0 100644 --- a/telemeta/locale/zh_CN/LC_MESSAGES/django.po +++ b/telemeta/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Telemeta 1.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-28 15:13+0100\n" +"POT-Creation-Date: 2014-11-10 16:01+0100\n" "PO-Revision-Date: 2014-09-02 16:18+2\n" "Last-Translator: Zaichao XIA \n" "Language-Team: zh_CN \n" @@ -26,128 +26,136 @@ msgstr "持续时长" msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "请输入有效时长(HH:MM[:ss]格式)" -#: models/enum.py:43 models/enum.py:143 models/media.py:585 +#: models/enum.py:44 models/enum.py:144 models/media.py:564 #: models/system.py:104 msgid "value" msgstr "价值" -#: models/enum.py:59 models/media.py:270 +#: models/enum.py:60 models/media.py:254 msgid "archive format" msgstr "档案格式" -#: models/enum.py:66 models/media.py:248 +#: models/enum.py:67 models/media.py:237 msgid "secondary edition" msgstr "第二版本" -#: models/enum.py:73 models/media.py:240 +#: models/enum.py:74 models/media.py:232 msgid "mode of acquisition" msgstr "采集方式" -#: models/enum.py:80 models/media.py:245 +#: models/enum.py:81 models/media.py:235 msgid "record author" msgstr "记录作者" -#: models/enum.py:87 models/media.py:254 +#: models/enum.py:88 models/media.py:241 msgid "record writer" msgstr "笔录作者" -#: models/enum.py:94 models/media.py:236 +#: models/enum.py:95 models/media.py:229 msgid "legal rights" msgstr "合法权益" -#: models/enum.py:101 models/media.py:213 +#: models/enum.py:102 models/media.py:210 msgid "recording context" msgstr "录音文本" -#: models/enum.py:108 +#: models/enum.py:109 msgid "A/D conversion" msgstr "模拟/数字转换" -#: models/enum.py:115 models/media.py:388 +#: models/enum.py:116 models/media.py:367 msgid "vernacular style" msgstr "当地风格" -#: models/enum.py:122 models/media.py:389 +#: models/enum.py:123 models/media.py:368 msgid "generic style" msgstr "通用风格" -#: models/enum.py:129 models/media.py:556 +#: models/enum.py:130 models/media.py:538 msgid "keyword" msgstr "关键字" -#: models/enum.py:136 models/enum.py:142 models/media.py:226 +#: models/enum.py:137 models/enum.py:143 models/media.py:221 msgid "publisher" msgstr "出版者" -#: models/enum.py:158 models/enum.py:164 models/media.py:381 +#: models/enum.py:159 models/enum.py:165 models/media.py:362 msgid "population / social group" msgstr "居民/社会团体" -#: models/enum.py:165 models/instrument.py:43 models/instrument.py:53 +#: models/enum.py:166 models/instrument.py:43 models/instrument.py:53 #: models/language.py:54 models/location.py:51 models/location.py:158 -#: models/media.py:584 +#: models/media.py:563 msgid "name" msgstr "姓名" -#: models/enum.py:179 models/format.py:77 +#: models/enum.py:182 models/format.py:77 msgid "tape wheel diameter (cm)" msgstr "录音带卷直径(厘米)" -#: models/enum.py:186 +#: models/enum.py:191 msgid "tape length (cm)" msgstr "录音带长度(厘米)" -#: models/enum.py:193 +#: models/enum.py:200 msgid "tape width (inch)" msgstr "录音带宽度(英寸)" -#: models/enum.py:200 models/format.py:80 +#: models/enum.py:209 models/format.py:80 msgid "tape speed (cm/s)" msgstr "录音带转速(厘米/秒)" -#: models/enum.py:207 models/format.py:82 -msgid "tape vendor" +#: models/enum.py:218 +#, fuzzy +#| msgid "tape vendor" +msgid "tape brand" msgstr "录音带卖主" -#: models/enum.py:214 models/format.py:71 +#: models/enum.py:228 models/format.py:71 msgid "number of channels" msgstr "频道数量" -#: models/enum.py:221 models/media.py:394 +#: models/enum.py:238 models/media.py:372 msgid "organization" msgstr "机构" -#: models/enum.py:228 models/media.py:396 +#: models/enum.py:248 models/media.py:374 msgid "rights" msgstr "权益(版权)" -#: models/enum.py:235 models/media.py:373 +#: models/enum.py:258 models/media.py:400 msgid "topic" msgstr "主题" -#: models/enum.py:243 +#: models/enum.py:266 models/media.py:234 #, fuzzy msgid "copy type" msgstr "完整类型" -#: models/enum.py:251 models/media.py:266 +#: models/enum.py:274 models/media.py:251 models/media.py:388 #, fuzzy msgid "media type" msgstr "媒体类型" -#: models/enum.py:259 models/media.py:677 +#: models/enum.py:282 models/media.py:255 +#, fuzzy +#| msgid "original location" +msgid "original format" +msgstr "原始位置" + +#: models/enum.py:290 models/media.py:656 msgid "status" msgstr "状态" -#: models/enum.py:267 +#: models/enum.py:298 #, fuzzy msgid "identifier type" msgstr "标识码" -#: models/format.py:58 models/media.py:455 models/media.py:528 -#: models/media.py:555 models/media.py:566 models/media.py:582 -#: models/media.py:603 models/media.py:649 models/media.py:674 -#: models/media.py:708 models/media.py:881 +#: models/format.py:58 models/media.py:437 models/media.py:510 +#: models/media.py:537 models/media.py:547 models/media.py:561 +#: models/media.py:582 models/media.py:628 models/media.py:653 +#: models/media.py:687 models/media.py:874 msgid "item" msgstr "项" @@ -155,7 +163,7 @@ msgstr "项" msgid "physical format" msgstr "物理格式" -#: models/format.py:62 models/media.py:401 +#: models/format.py:62 models/media.py:378 msgid "original code" msgstr "原始密码" @@ -191,6 +199,10 @@ msgstr "录音系统" msgid "tape thickness (um)" msgstr "录音带浓度(微米)" +#: models/format.py:82 +msgid "tape vendor" +msgstr "录音带卖主" + #: models/format.py:83 msgid "tape reference" msgstr "录音带参考资料" @@ -219,7 +231,7 @@ msgstr "母(原始)仪器" msgid "alias" msgstr "别名" -#: models/language.py:48 models/location.py:157 models/media.py:867 +#: models/language.py:48 models/location.py:157 models/media.py:860 msgid "identifier" msgstr "标识码" @@ -239,11 +251,11 @@ msgstr "相等ISO 639-1标识码" msgid "scope" msgstr "范围" -#: models/language.py:53 models/location.py:52 models/media.py:868 +#: models/language.py:53 models/location.py:52 models/media.py:861 msgid "type" msgstr "类型" -#: models/language.py:55 models/media.py:252 +#: models/language.py:55 models/media.py:240 msgid "comment" msgstr "评论" @@ -276,7 +288,7 @@ msgid "authoritative" msgstr "官方的" #: models/location.py:112 models/location.py:170 models/location.py:185 -#: models/media.py:378 +#: models/media.py:357 msgid "location" msgstr "位置" @@ -300,79 +312,85 @@ msgstr "祖先位置" msgid "location relations" msgstr "位置关系" -#: models/media.py:79 models/media.py:82 models/media.py:449 +#: models/media.py:80 models/media.py:83 models/media.py:431 msgid "none" msgstr "无" -#: models/media.py:79 models/media.py:82 +#: models/media.py:80 models/media.py:83 msgid "metadata" msgstr "元数据" -#: models/media.py:80 +#: models/media.py:81 msgid "mixed" msgstr "混合的" -#: models/media.py:80 models/media.py:83 +#: models/media.py:81 models/media.py:84 msgid "full" msgstr "满的" -#: models/media.py:85 +#: models/media.py:86 msgid "broken" msgstr "损坏的" -#: models/media.py:85 +#: models/media.py:86 msgid "pending" msgstr "待定的" -#: models/media.py:85 +#: models/media.py:86 msgid "processing" msgstr "进程中的" -#: models/media.py:86 +#: models/media.py:87 msgid "done" msgstr "已完成的" -#: models/media.py:86 +#: models/media.py:87 msgid "ready" msgstr "准备好的" -#: models/media.py:103 +#: models/media.py:104 msgid "Metadata only" msgstr "仅元数据" -#: models/media.py:105 +#: models/media.py:106 msgid "Sound and metadata" msgstr "声音和元数据" -#: models/media.py:107 +#: models/media.py:108 msgid "Private data" msgstr "私有数据" -#: models/media.py:108 models/media.py:127 -msgid "public access" -msgstr "公共访问" +#: models/media.py:109 models/media.py:214 models/media.py:354 +#, fuzzy +#| msgid "access status" +msgid "access type" +msgstr "访问状态" -#: models/media.py:124 models/media.py:153 models/media.py:207 -#: models/media.py:366 models/media.py:604 models/media.py:620 -#: models/media.py:652 +#: models/media.py:125 models/media.py:153 models/media.py:206 +#: models/media.py:348 models/media.py:583 models/media.py:599 +#: models/media.py:631 msgid "title" msgstr "标题" -#: models/media.py:125 models/media.py:155 models/media.py:211 -#: models/media.py:621 models/media.py:654 +#: models/media.py:126 models/media.py:155 models/media.py:209 +#: models/media.py:600 models/media.py:633 msgid "description" msgstr "描述" -#: models/media.py:126 models/media.py:262 models/media.py:400 +#: models/media.py:127 models/media.py:249 models/media.py:377 msgid "code" msgstr "密码" -#: models/media.py:154 models/media.py:653 models/media.py:676 -#: models/media.py:710 models/system.py:116 +#: models/media.py:128 +msgid "public access" +msgstr "公共访问" + +#: models/media.py:154 models/media.py:632 models/media.py:655 +#: models/media.py:689 models/system.py:116 msgid "date" msgstr "日期" -#: models/media.py:156 models/media.py:675 models/media.py:709 +#: models/media.py:156 models/media.py:654 models/media.py:688 msgid "mime_type" msgstr "互联网媒体类型" @@ -384,416 +402,406 @@ msgstr "网址" msgid "credits" msgstr "工作人员" -#: models/media.py:159 models/media.py:416 models/media.py:678 +#: models/media.py:159 models/media.py:391 models/media.py:657 msgid "file" msgstr "文件" -#: models/media.py:208 models/media.py:367 +#: models/media.py:207 models/media.py:349 msgid "original title / translation" msgstr "原始标题/翻译" -#: models/media.py:209 +#: models/media.py:208 msgid "depositor / contributor" msgstr "寄存者/贡献者" -#: models/media.py:209 models/media.py:224 models/media.py:372 -#: models/media.py:390 -msgid "First name, Last name; First name, Last name" +#: models/media.py:208 models/media.py:220 models/media.py:369 +#: models/media.py:399 +msgid "First name, Last name ; First name, Last name" msgstr "" -#: models/media.py:210 -msgid "document type" -msgstr "文档类型" - -#: models/media.py:214 models/media.py:792 +#: models/media.py:211 models/media.py:771 msgid "recording year (from)" msgstr "录音年份(起)" -#: models/media.py:214 models/media.py:215 models/media.py:216 +#: models/media.py:211 models/media.py:212 models/media.py:213 msgid "YYYY" msgstr "" -#: models/media.py:215 models/media.py:793 +#: models/media.py:212 models/media.py:772 msgid "recording year (until)" msgstr "录音年份(终)" -#: models/media.py:216 +#: models/media.py:213 msgid "year published" msgstr "出版年份" -#: models/media.py:217 models/media.py:371 -#, fuzzy -#| msgid "access status" -msgid "access type" -msgstr "访问状态" - -#: models/media.py:224 models/media.py:403 +#: models/media.py:220 models/media.py:395 msgid "recordist" msgstr "录音员" -#: models/media.py:228 +#: models/media.py:222 msgid "publisher collection" msgstr "出版者选集" -#: models/media.py:229 +#: models/media.py:223 msgid "publisher serial number" msgstr "出版序列号" -#: models/media.py:230 +#: models/media.py:224 #, fuzzy -msgid "publisher references" -msgstr "已出版参考资料" +#| msgid "author" +msgid "booklet author" +msgstr "作者" -#: models/media.py:231 -msgid "reference" -msgstr "参考文件" +#: models/media.py:225 +#, fuzzy +msgid "publisher reference" +msgstr "已出版参考资料" -#: models/media.py:232 +#: models/media.py:226 msgid "bibliographic references" msgstr "文献目录参考" -#: models/media.py:234 models/media.py:397 +#: models/media.py:228 models/media.py:384 msgid "automatic access after a rolling period" msgstr "定时自动访问" -#: models/media.py:241 +#: models/media.py:233 msgid "CNRS depositor" msgstr "CNRS寄存者" -#: models/media.py:243 -msgid "type of copy" -msgstr "" - -#: models/media.py:246 +#: models/media.py:236 msgid "related documentation" msgstr "相关文献" -#: models/media.py:250 +#: models/media.py:238 #, fuzzy msgid "collection status" msgstr "选集" -#: models/media.py:251 +#: models/media.py:239 msgid "copies" msgstr "副本" -#: models/media.py:255 +#: models/media.py:242 msgid "archiver notes" msgstr "档案注释" -#: models/media.py:256 +#: models/media.py:243 msgid "items finished" msgstr "已完成项" -#: models/media.py:257 +#: models/media.py:244 msgid "recordist identical to depositor" msgstr "录音者与寄存者相同" -#: models/media.py:258 templates/telemeta/collection_detail.html:82 +#: models/media.py:245 templates/telemeta/collection_detail.html:82 msgid "published" msgstr "已出版的" -#: models/media.py:259 +#: models/media.py:246 msgid "conservation site" msgstr "保存网站" -#: models/media.py:264 +#: models/media.py:250 msgid "old code" msgstr "旧密码" -#: models/media.py:267 +#: models/media.py:252 #, fuzzy #| msgid "computed duration" msgid "estimated duration" msgstr "计算估计时长" -#: models/media.py:268 +#: models/media.py:253 msgid "number of components (medium / piece)" msgstr "组成部分个数(适中/短)" -#: models/media.py:272 +#: models/media.py:256 msgid "digitization" msgstr "数字化" -#: models/media.py:307 +#: models/media.py:291 msgid "states / nations" msgstr "州/国家" -#: models/media.py:321 +#: models/media.py:305 msgid "populations / social groups" msgstr "居民/社会团体" -#: models/media.py:329 models/media.py:481 +#: models/media.py:312 models/media.py:463 msgid "computed duration" msgstr "计算估计时长" -#: models/media.py:338 +#: models/media.py:320 #, fuzzy #| msgid "collections" msgid "collection size (Mo)" msgstr "选集" -#: models/media.py:346 models/media.py:352 models/media.py:368 -#: models/media.py:893 +#: models/media.py:328 models/media.py:334 models/media.py:351 +#: models/media.py:886 msgid "collection" msgstr "选集" -#: models/media.py:356 models/media.py:357 +#: models/media.py:338 models/media.py:339 msgid "collection related media" msgstr "选集相关媒体" -#: models/media.py:369 +#: models/media.py:350 +msgid "collector" +msgstr "收集者" + +#: models/media.py:352 msgid "recording date (from)" msgstr "录音日期(起)" -#: models/media.py:369 models/media.py:370 +#: models/media.py:352 models/media.py:353 msgid "YYYY-MM-DD" msgstr "" -#: models/media.py:370 +#: models/media.py:353 msgid "recording date (until)" msgstr "录音日期(终)" -#: models/media.py:372 -msgid "scientist" -msgstr "科学家" - -#: models/media.py:374 -msgid "summary" -msgstr "总结" - -#: models/media.py:375 -msgid "remarks" -msgstr "评论" - -#: models/media.py:379 +#: models/media.py:358 msgid "location details" msgstr "位置细节" -#: models/media.py:380 +#: models/media.py:359 msgid "cultural area" msgstr "文化区域" -#: models/media.py:382 +#: models/media.py:360 msgid "language" msgstr "语言" -#: models/media.py:383 +#: models/media.py:361 msgid "ISO language" msgstr "ISO语言" -#: models/media.py:384 -msgid "comments / ethnographic context" -msgstr "评论/人种文本" +#: models/media.py:363 templates/telemeta/mediaitem_detail.html:226 +msgid "Ethnographic context" +msgstr "人种文本" -#: models/media.py:385 +#: models/media.py:366 msgid "implementing rules" msgstr "" -#: models/media.py:390 +#: models/media.py:369 msgid "author / compositor" msgstr "作者/排序者" -#: models/media.py:391 -msgid "contributor" -msgstr "贡献者" - -#: models/media.py:395 +#: models/media.py:373 msgid "depositor" msgstr "寄存者" -#: models/media.py:400 +#: models/media.py:377 #, fuzzy msgid "CollectionCode-ItemCode" msgstr "选集" -#: models/media.py:402 +#: models/media.py:379 msgid "item number" msgstr "项目号" -#: models/media.py:404 -msgid "digitalist" -msgstr "数字化者" - -#: models/media.py:405 -msgid "collector" -msgstr "收集者" - -#: models/media.py:406 +#: models/media.py:380 msgid "collector selection" msgstr "收集者选集" -#: models/media.py:407 +#: models/media.py:381 msgid "collector as in collection" msgstr "收集者在选集中作为" -#: models/media.py:408 -msgid "digitization date" -msgstr "数字化日期" - -#: models/media.py:409 -msgid "publishing date" -msgstr "出版日期" - -#: models/media.py:410 +#: models/media.py:382 msgid "creator reference" msgstr "创作者参考资料" -#: models/media.py:411 +#: models/media.py:383 msgid "published references" msgstr "已出版参考资料" -#: models/media.py:412 -msgid "copy of" -msgstr "...的副本" +#: models/media.py:385 +msgid "remarks" +msgstr "评论" -#: models/media.py:413 +#: models/media.py:389 +msgid "approximative duration" +msgstr "大约时长" + +#: models/media.py:389 +msgid "hh:mm:ss" +msgstr "" + +#: models/media.py:390 msgid "mime type" msgstr "互联网媒体类型" -#: models/media.py:417 +#: models/media.py:392 msgid "URL" msgstr "网址" -#: models/media.py:420 -msgid "approximative duration" -msgstr "大约时长" +#: models/media.py:396 +msgid "digitalist" +msgstr "数字化者" -#: models/media.py:420 -msgid "hh:mm:ss" -msgstr "" +#: models/media.py:397 +msgid "digitization date" +msgstr "数字化日期" + +#: models/media.py:398 +msgid "publishing date" +msgstr "出版日期" -#: models/media.py:428 +#: models/media.py:399 +msgid "scientist" +msgstr "科学家" + +#: models/media.py:401 +msgid "summary" +msgstr "总结" + +#: models/media.py:402 +msgid "contributor" +msgstr "贡献者" + +#: models/media.py:410 msgid "keywords" msgstr "关键词" -#: models/media.py:516 +#: models/media.py:498 msgid "instruments" msgstr "仪器" -#: models/media.py:549 models/media.py:550 +#: models/media.py:531 models/media.py:532 msgid "item related media" msgstr "项相关媒体" -#: models/media.py:568 +#: models/media.py:548 msgid "composition" msgstr "作品" -#: models/media.py:570 +#: models/media.py:549 msgid "vernacular name" msgstr "当地名字" -#: models/media.py:571 +#: models/media.py:550 msgid "number" msgstr "号码" -#: models/media.py:572 +#: models/media.py:551 msgid "interprets" msgstr "解释(翻译)" -#: models/media.py:583 +#: models/media.py:562 msgid "id" msgstr "用户身份" -#: models/media.py:586 +#: models/media.py:565 msgid "unit" msgstr "单元" -#: models/media.py:605 +#: models/media.py:584 msgid "start" msgstr "开始" -#: models/media.py:606 +#: models/media.py:585 msgid "end" msgstr "结束" -#: models/media.py:610 +#: models/media.py:589 msgid "item part" msgstr "项部分" -#: models/media.py:618 models/media.py:635 models/media.py:650 +#: models/media.py:597 models/media.py:614 models/media.py:629 msgid "public_id" msgstr "公共用户身份" -#: models/media.py:636 +#: models/media.py:615 msgid "playlist" msgstr "播放列表" -#: models/media.py:637 +#: models/media.py:616 msgid "resource_type" msgstr "资源类型" -#: models/media.py:638 +#: models/media.py:617 msgid "resource_id" msgstr "资源身份" -#: models/media.py:651 +#: models/media.py:630 msgid "time (s)" msgstr "时间" -#: models/media.py:655 +#: models/media.py:634 msgid "author" msgstr "作者" -#: models/media.py:711 +#: models/media.py:690 msgid "transcoded" msgstr "已转换代码" -#: models/media.py:791 +#: models/media.py:770 msgid "collections" msgstr "选集" -#: models/media.py:810 models/media.py:811 models/media.py:821 -#: models/media.py:845 +#: models/media.py:792 models/media.py:827 +#, fuzzy +#| msgid "computed duration" +msgid "total available duration" +msgstr "计算估计时长" + +#: models/media.py:796 models/media.py:797 models/media.py:807 +#: models/media.py:838 msgid "corpus" msgstr "全集" -#: models/media.py:838 models/media.py:839 models/media.py:856 +#: models/media.py:831 models/media.py:832 models/media.py:849 msgid "fonds" msgstr "全宗" -#: models/media.py:849 models/media.py:850 +#: models/media.py:842 models/media.py:843 msgid "corpus related media" msgstr "全集相关媒体" -#: models/media.py:860 models/media.py:861 +#: models/media.py:853 models/media.py:854 msgid "fonds related media" msgstr "全宗相关媒体" -#: models/media.py:869 +#: models/media.py:862 msgid "date of first attribution" msgstr "" -#: models/media.py:870 +#: models/media.py:863 #, fuzzy msgid "date of last attribution" msgstr "采集方式" -#: models/media.py:871 +#: models/media.py:864 #, fuzzy msgid "date of last modification" msgstr "上次修改" -#: models/media.py:872 +#: models/media.py:865 msgid "notes" msgstr "" -#: models/media.py:885 +#: models/media.py:878 #, fuzzy msgid "item identifier" msgstr "标识码" -#: models/media.py:886 +#: models/media.py:879 #, fuzzy msgid "item identifiers" msgstr "标识码" -#: models/media.py:897 +#: models/media.py:890 #, fuzzy msgid "collection identifier" msgstr "单元标识码" -#: models/media.py:898 +#: models/media.py:891 #, fuzzy msgid "collection identifiers" msgstr "单元标识码" @@ -949,12 +957,12 @@ msgid "g:i A,M j,n/j/y" msgstr "" #: templates/postman/base_folder.html:49 templates/postman/view.html:25 -#: templates/telemeta/collection_detail.html:223 +#: templates/telemeta/collection_detail.html:231 #: templates/telemeta/collection_detail_dc.html:25 #: templates/telemeta/lists.html:58 -#: templates/telemeta/mediaitem_detail.html:353 +#: templates/telemeta/mediaitem_detail.html:352 #: templates/telemeta/mediaitem_detail_dc.html:20 -#: templates/telemeta/resource_detail.html:104 +#: templates/telemeta/resource_detail.html:105 #: templates/telemeta/resource_detail_dc.html:17 msgid "Delete" msgstr "删除" @@ -1133,7 +1141,7 @@ msgstr "计数/列举" msgid "Title" msgstr "标题" -#: templates/telemeta/admin_enumerations.html:24 +#: templates/telemeta/admin_enumerations.html:26 msgid "No enumerations" msgstr "无内容" @@ -1232,7 +1240,7 @@ msgid "" msgstr "档案的使用尊重文化遗产的原始所有者。" #: templates/telemeta/base.html:186 -#: templates/telemeta/collection_detail.html:114 +#: templates/telemeta/collection_detail.html:117 msgid "Legal notices" msgstr "合法通知" @@ -1315,9 +1323,8 @@ msgid "Download" msgstr "下载" #: templates/telemeta/collection_detail.html:68 -#: templates/telemeta/geo_continents.html:26 -msgid "List" -msgstr "列表" +msgid "View list" +msgstr "" #: templates/telemeta/collection_detail.html:78 #, fuzzy @@ -1337,48 +1344,48 @@ msgstr "未出版的" msgid "Recording period" msgstr "录音时段" -#: templates/telemeta/collection_detail.html:101 -#: templates/telemeta/mediaitem_detail.html:217 +#: templates/telemeta/collection_detail.html:104 +#: templates/telemeta/mediaitem_detail.html:214 msgid "Geographic and cultural informations" msgstr "地理和文化信息" -#: templates/telemeta/collection_detail.html:119 +#: templates/telemeta/collection_detail.html:122 #: templates/telemeta/inc/collection_list.html:11 #: templates/telemeta/inc/mediaitem_list.html:10 #: templates/telemeta/lists.html:72 msgid "Recordist" msgstr "录音员" -#: templates/telemeta/collection_detail.html:132 +#: templates/telemeta/collection_detail.html:137 msgid "Bibliographic references" msgstr "参考文献" -#: templates/telemeta/collection_detail.html:145 +#: templates/telemeta/collection_detail.html:149 #: templates/telemeta/mediaitem_detail.html:277 msgid "Archiving data" msgstr "存档数据" -#: templates/telemeta/collection_detail.html:153 +#: templates/telemeta/collection_detail.html:157 msgid "Related documentation" msgstr "相关文献" -#: templates/telemeta/collection_detail.html:160 -#: templates/telemeta/mediaitem_detail.html:315 +#: templates/telemeta/collection_detail.html:165 +#: templates/telemeta/mediaitem_detail.html:314 msgid "Comments" msgstr "注解" -#: templates/telemeta/collection_detail.html:164 -#: templates/telemeta/mediaitem_detail.html:290 -#: templates/telemeta/resource_detail.html:74 +#: templates/telemeta/collection_detail.html:169 +#: templates/telemeta/mediaitem_detail.html:291 +#: templates/telemeta/resource_detail.html:75 msgid "Last modification" msgstr "上次修改" -#: templates/telemeta/collection_detail.html:178 -#: templates/telemeta/mediaitem_detail.html:300 +#: templates/telemeta/collection_detail.html:183 +#: templates/telemeta/mediaitem_detail.html:301 msgid "Technical data" msgstr "专业数据" -#: templates/telemeta/collection_detail.html:188 +#: templates/telemeta/collection_detail.html:196 #: templates/telemeta/geo_countries.html:16 msgid "Number of items" msgstr "项数目" @@ -1547,6 +1554,10 @@ msgstr "地理导航" msgid "Map" msgstr "地图" +#: templates/telemeta/geo_continents.html:26 +msgid "List" +msgstr "列表" + #: templates/telemeta/geo_countries.html:8 #: templates/telemeta/geo_country_collections.html:8 #: templates/telemeta/geo_country_items.html:8 @@ -1638,7 +1649,7 @@ msgid "Dublin Core Metadata" msgstr "都柏林核心元数据" #: templates/telemeta/inc/mediaitem_list.html:12 -#: templates/telemeta/mediaitem_detail.html:219 +#: templates/telemeta/mediaitem_detail.html:216 msgid "Location" msgstr "位置" @@ -1754,8 +1765,8 @@ msgid "Next" msgstr "下一个" #: templates/telemeta/mediaitem_detail.html:154 -msgid "Analysis" -msgstr "分析" +msgid "File" +msgstr "" #: templates/telemeta/mediaitem_detail.html:156 msgid "Markers" @@ -1785,30 +1796,22 @@ msgstr "点击这里" msgid "Recording date" msgstr "录音日期" -#: templates/telemeta/mediaitem_detail.html:225 +#: templates/telemeta/mediaitem_detail.html:222 msgid "Language ISO" msgstr "ISO语言" -#: templates/telemeta/mediaitem_detail.html:229 -msgid "Ethnographic context" -msgstr "人种文本" - -#: templates/telemeta/mediaitem_detail.html:240 +#: templates/telemeta/mediaitem_detail.html:237 msgid "Musical informations" msgstr "音乐信息" -#: templates/telemeta/mediaitem_detail.html:284 +#: templates/telemeta/mediaitem_detail.html:285 msgid "Published references" msgstr "已出版参考资料" -#: templates/telemeta/mediaitem_detail.html:287 +#: templates/telemeta/mediaitem_detail.html:288 msgid "Remarks" msgstr "评论" -#: templates/telemeta/mediaitem_detail.html:303 -msgid "Media type" -msgstr "媒体类型" - #: templates/telemeta/mediaitem_detail_dc.html:13 msgid "No such item" msgstr "无该项" @@ -2058,7 +2061,7 @@ msgstr "" msgid "Yes" msgstr "" -#: templates/telemeta/resource_detail.html:109 +#: templates/telemeta/resource_detail.html:110 #: templates/telemeta/resource_detail_dc.html:22 msgid "No such resource" msgstr "该资源不存在" @@ -2146,10 +2149,28 @@ msgstr "" msgid "Last changes" msgstr "上次更改" -#: views/item.py:720 +#: views/item.py:721 msgid "You have successfully updated your item." msgstr "" +#~ msgid "Analysis" +#~ msgstr "分析" + +#~ msgid "comments / ethnographic context" +#~ msgstr "评论/人种文本" + +#~ msgid "copy of" +#~ msgstr "...的副本" + +#~ msgid "Media type" +#~ msgstr "媒体类型" + +#~ msgid "document type" +#~ msgstr "文档类型" + +#~ msgid "reference" +#~ msgstr "参考文件" + #~ msgid "access status" #~ msgstr "访问状态" diff --git a/telemeta/migrations/0038_auto__add_originalformat__del_field_mediacollection_doctype_code__add_.py b/telemeta/migrations/0038_auto__add_originalformat__del_field_mediacollection_doctype_code__add_.py new file mode 100644 index 00000000..164c6b0f --- /dev/null +++ b/telemeta/migrations/0038_auto__add_originalformat__del_field_mediacollection_doctype_code__add_.py @@ -0,0 +1,622 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding model 'OriginalFormat' + db.create_table('original_format', ( + (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)), + ('value', self.gf('telemeta.models.core.CharField')(unique=True, max_length=250)), + )) + db.send_create_signal('telemeta', ['OriginalFormat']) + + # Deleting field 'MediaCollection.doctype_code' + db.delete_column('media_collections', 'doctype_code') + + # Adding field 'MediaCollection.original_format' + db.add_column('media_collections', 'original_format', + self.gf('telemeta.models.core.WeakForeignKey')(default=None, related_name='collections', null=True, blank=True, to=orm['telemeta.OriginalFormat']), + keep_default=False) + + # Deleting field 'MediaItem.copied_from_item' + db.delete_column('media_items', 'copied_from_item_id') + + # Adding field 'MediaItem.media_type' + db.add_column('media_items', 'media_type', + self.gf('telemeta.models.core.WeakForeignKey')(default=None, related_name='items', null=True, blank=True, to=orm['telemeta.MediaType']), + keep_default=False) + + + def backwards(self, orm): + # Deleting model 'OriginalFormat' + db.delete_table('original_format') + + # Adding field 'MediaCollection.doctype_code' + db.add_column('media_collections', 'doctype_code', + self.gf('telemeta.models.core.IntegerField')(default=0, blank=True), + keep_default=False) + + # Deleting field 'MediaCollection.original_format' + db.delete_column('media_collections', 'original_format_id') + + # Adding field 'MediaItem.copied_from_item' + db.add_column('media_items', 'copied_from_item', + self.gf('telemeta.models.core.WeakForeignKey')(default=None, related_name='copies', null=True, to=orm['telemeta.MediaItem'], blank=True), + keep_default=False) + + # Deleting field 'MediaItem.media_type' + db.delete_column('media_items', 'media_type_id') + + + models = { + u'auth.group': { + 'Meta': {'object_name': 'Group'}, + u'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': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + u'auth.permission': { + 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Group']"}), + u'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', [], {'symmetrical': 'False', 'related_name': "u'user_set'", 'blank': 'True', 'to': u"orm['auth.Permission']"}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + u'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'}), + u'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'}) + }, + 'telemeta.acquisitionmode': { + 'Meta': {'ordering': "['value']", 'object_name': 'AcquisitionMode', 'db_table': "'acquisition_modes'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.adconversion': { + 'Meta': {'ordering': "['value']", 'object_name': 'AdConversion', 'db_table': "'ad_conversions'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.contextkeyword': { + 'Meta': {'ordering': "['value']", 'object_name': 'ContextKeyword', 'db_table': "'context_keywords'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.copytype': { + 'Meta': {'ordering': "['value']", 'object_name': 'CopyType', 'db_table': "'copy_type'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.criteria': { + 'Meta': {'object_name': 'Criteria', 'db_table': "'search_criteria'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'key': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + 'value': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.ethnicgroup': { + 'Meta': {'ordering': "['value']", 'object_name': 'EthnicGroup', 'db_table': "'ethnic_groups'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.ethnicgroupalias': { + 'Meta': {'ordering': "['ethnic_group__value']", 'unique_together': "(('ethnic_group', 'value'),)", 'object_name': 'EthnicGroupAlias', 'db_table': "'ethnic_group_aliases'"}, + 'ethnic_group': ('telemeta.models.core.ForeignKey', [], {'related_name': "'aliases'", 'to': "orm['telemeta.EthnicGroup']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.format': { + 'Meta': {'object_name': 'Format', 'db_table': "'media_formats'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'format'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['telemeta.MediaItem']", 'blank': 'True', 'null': 'True'}), + 'original_audio_quality': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'original_channels': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.NumberOfChannels']"}), + 'original_code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'original_comments': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'original_location': ('telemeta.models.core.ForeignKey', [], {'related_name': "'format'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['telemeta.Location']", 'blank': 'True', 'null': 'True'}), + 'original_number': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'original_state': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'original_status': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'physical_format': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PhysicalFormat']"}), + 'recording_system': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'sticker_presence': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'tape_reference': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'tape_speed': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.TapeSpeed']"}), + 'tape_thickness': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'tape_vendor': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.TapeVendor']"}), + 'tape_wheel_diameter': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'format'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.TapeWheelDiameter']"}) + }, + 'telemeta.genericstyle': { + 'Meta': {'ordering': "['value']", 'object_name': 'GenericStyle', 'db_table': "'generic_styles'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.identifiertype': { + 'Meta': {'ordering': "['value']", 'object_name': 'IdentifierType', 'db_table': "'identifier_type'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.instrument': { + 'Meta': {'object_name': 'Instrument', 'db_table': "'instruments'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.instrumentalias': { + 'Meta': {'object_name': 'InstrumentAlias', 'db_table': "'instrument_aliases'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.instrumentaliasrelation': { + 'Meta': {'unique_together': "(('alias', 'instrument'),)", 'object_name': 'InstrumentAliasRelation', 'db_table': "'instrument_alias_relations'"}, + 'alias': ('telemeta.models.core.ForeignKey', [], {'related_name': "'other_name'", 'to': "orm['telemeta.InstrumentAlias']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'instrument': ('telemeta.models.core.ForeignKey', [], {'related_name': "'relation'", 'to': "orm['telemeta.Instrument']"}) + }, + 'telemeta.instrumentrelation': { + 'Meta': {'unique_together': "(('instrument', 'parent_instrument'),)", 'object_name': 'InstrumentRelation', 'db_table': "'instrument_relations'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'instrument': ('telemeta.models.core.ForeignKey', [], {'related_name': "'parent_relation'", 'to': "orm['telemeta.Instrument']"}), + 'parent_instrument': ('telemeta.models.core.ForeignKey', [], {'related_name': "'child_relation'", 'to': "orm['telemeta.Instrument']"}) + }, + 'telemeta.language': { + 'Meta': {'ordering': "['name']", 'object_name': 'Language', 'db_table': "'languages'"}, + 'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identifier': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'part1': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}), + 'part2B': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}), + 'part2T': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '3', 'blank': 'True'}), + 'scope': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}), + 'type': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '1', 'blank': 'True'}) + }, + 'telemeta.legalright': { + 'Meta': {'ordering': "['value']", 'object_name': 'LegalRight', 'db_table': "'legal_rights'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.location': { + 'Meta': {'ordering': "['name']", 'object_name': 'Location', 'db_table': "'locations'"}, + 'complete_type': ('telemeta.models.core.ForeignKey', [], {'related_name': "'locations'", 'to': "orm['telemeta.LocationType']"}), + 'current_location': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'past_names'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Location']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_authoritative': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'latitude': ('telemeta.models.core.FloatField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'longitude': ('telemeta.models.core.FloatField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '150'}), + 'type': ('telemeta.models.core.IntegerField', [], {'default': '0', 'db_index': 'True', 'blank': 'True'}) + }, + 'telemeta.locationalias': { + 'Meta': {'ordering': "['alias']", 'unique_together': "(('location', 'alias'),)", 'object_name': 'LocationAlias', 'db_table': "'location_aliases'"}, + 'alias': ('telemeta.models.core.CharField', [], {'max_length': '150'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_authoritative': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'location': ('telemeta.models.core.ForeignKey', [], {'related_name': "'aliases'", 'to': "orm['telemeta.Location']"}) + }, + 'telemeta.locationrelation': { + 'Meta': {'ordering': "['ancestor_location__name']", 'unique_together': "(('location', 'ancestor_location'),)", 'object_name': 'LocationRelation', 'db_table': "'location_relations'"}, + 'ancestor_location': ('telemeta.models.core.ForeignKey', [], {'related_name': "'descendant_relations'", 'to': "orm['telemeta.Location']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_authoritative': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'is_direct': ('telemeta.models.core.BooleanField', [], {'default': 'False', 'db_index': 'True'}), + 'location': ('telemeta.models.core.ForeignKey', [], {'related_name': "'ancestor_relations'", 'to': "orm['telemeta.Location']"}) + }, + 'telemeta.locationtype': { + 'Meta': {'ordering': "['name']", 'object_name': 'LocationType', 'db_table': "'location_types'"}, + 'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '64'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('telemeta.models.core.CharField', [], {'max_length': '150'}) + }, + 'telemeta.mediacollection': { + 'Meta': {'ordering': "['code']", 'object_name': 'MediaCollection', 'db_table': "'media_collections'"}, + 'acquisition_mode': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.AcquisitionMode']"}), + 'ad_conversion': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.AdConversion']"}), + 'alt_copies': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), + 'archiver_notes': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'auto_period_access': ('telemeta.models.core.BooleanField', [], {'default': 'True'}), + 'booklet_author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'booklet_description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'cnrs_contributor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}), + 'collector': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'collector_is_creator': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'conservation_site': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'copy_type': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.CopyType']"}), + 'creator': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'external_references': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_published': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'items_done': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'legal_rights': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.LegalRight']"}), + 'media_type': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MediaType']"}), + 'metadata_author': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MetadataAuthor']"}), + 'metadata_writer': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MetadataWriter']"}), + 'old_code': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}), + 'original_format': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.OriginalFormat']"}), + 'physical_format': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PhysicalFormat']"}), + 'physical_items_num': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}), + 'publisher': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Publisher']"}), + 'publisher_collection': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PublisherCollection']"}), + 'publisher_serial': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'publishing_status': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.PublishingStatus']"}), + 'recorded_from_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'recorded_to_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'recording_context': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.RecordingContext']"}), + 'reference': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'status': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'collections'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Status']"}), + 'title': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + 'year_published': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}) + }, + 'telemeta.mediacollectionidentifier': { + 'Meta': {'unique_together': "(('identifier', 'collection'),)", 'object_name': 'MediaCollectionIdentifier', 'db_table': "'media_collection_identifier'"}, + 'collection': ('telemeta.models.core.ForeignKey', [], {'related_name': "'identifiers'", 'to': "orm['telemeta.MediaCollection']"}), + 'date_first': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'date_last': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'date_modified': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identifier': ('telemeta.models.core.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}), + 'notes': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'type': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.IdentifierType']", 'null': 'True', 'blank': 'True'}) + }, + 'telemeta.mediacollectionrelated': { + 'Meta': {'object_name': 'MediaCollectionRelated', 'db_table': "'media_collection_related'"}, + 'collection': ('telemeta.models.core.ForeignKey', [], {'related_name': "'related'", 'to': "orm['telemeta.MediaCollection']"}), + 'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '255', 'db_column': "'filename'", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mime_type': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'url': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'}) + }, + 'telemeta.mediacorpus': { + 'Meta': {'object_name': 'MediaCorpus', 'db_table': "'media_corpus'"}, + 'children': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'corpus'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['telemeta.MediaCollection']"}), + 'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}), + 'descriptions': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}), + 'recorded_from_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'recorded_to_year': ('telemeta.models.core.IntegerField', [], {'default': '0', 'blank': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.mediacorpusrelated': { + 'Meta': {'object_name': 'MediaCorpusRelated', 'db_table': "'media_corpus_related'"}, + 'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '255', 'db_column': "'filename'", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mime_type': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}), + 'resource': ('telemeta.models.core.ForeignKey', [], {'related_name': "'related'", 'to': "orm['telemeta.MediaCorpus']"}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'url': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'}) + }, + 'telemeta.mediafonds': { + 'Meta': {'object_name': 'MediaFonds', 'db_table': "'media_fonds'"}, + 'children': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'fonds'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['telemeta.MediaCorpus']"}), + 'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}), + 'descriptions': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.mediafondsrelated': { + 'Meta': {'object_name': 'MediaFondsRelated', 'db_table': "'media_fonds_related'"}, + 'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '255', 'db_column': "'filename'", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'mime_type': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}), + 'resource': ('telemeta.models.core.ForeignKey', [], {'related_name': "'related'", 'to': "orm['telemeta.MediaFonds']"}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'url': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'}) + }, + 'telemeta.mediaitem': { + 'Meta': {'object_name': 'MediaItem', 'db_table': "'media_items'"}, + 'alt_title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'approx_duration': ('telemeta.models.core.DurationField', [], {'default': "'0'", 'blank': 'True'}), + 'author': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'auto_period_access': ('telemeta.models.core.BooleanField', [], {'default': 'True'}), + 'code': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}), + 'collection': ('telemeta.models.core.ForeignKey', [], {'related_name': "'items'", 'to': "orm['telemeta.MediaCollection']"}), + 'collector': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'collector_from_collection': ('telemeta.models.core.BooleanField', [], {'default': 'False'}), + 'collector_selection': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'context_comment': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'contributor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'creator_reference': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'cultural_area': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'depositor': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'digitalist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'digitization_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'ethnic_group': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.EthnicGroup']"}), + 'external_references': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '1024', 'db_column': "'filename'", 'blank': 'True'}), + 'generic_style': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.GenericStyle']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'language': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'language_iso': ('telemeta.models.core.ForeignKey', [], {'related_name': "'items'", 'on_delete': 'models.SET_NULL', 'default': 'None', 'to': "orm['telemeta.Language']", 'blank': 'True', 'null': 'True'}), + 'location': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Location']", 'null': 'True', 'blank': 'True'}), + 'location_comment': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'media_type': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.MediaType']"}), + 'mimetype': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '255', 'blank': 'True'}), + 'moda_execut': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'old_code': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'organization': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Organization']", 'null': 'True', 'blank': 'True'}), + 'public_access': ('telemeta.models.core.CharField', [], {'default': "'metadata'", 'max_length': '16', 'blank': 'True'}), + 'publishing_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'recorded_from_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'recorded_to_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'recordist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'rights': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Rights']", 'null': 'True', 'blank': 'True'}), + 'scientist': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'summary': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'topic': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.Topic']", 'null': 'True', 'blank': 'True'}), + 'track': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'url': ('django.db.models.fields.URLField', [], {'max_length': '512', 'blank': 'True'}), + 'vernacular_style': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'items'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.VernacularStyle']"}) + }, + 'telemeta.mediaitemanalysis': { + 'Meta': {'ordering': "['name']", 'object_name': 'MediaItemAnalysis', 'db_table': "'media_analysis'"}, + 'analyzer_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'analysis'", 'to': "orm['telemeta.MediaItem']"}), + 'name': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'unit': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}) + }, + 'telemeta.mediaitemidentifier': { + 'Meta': {'unique_together': "(('identifier', 'item'),)", 'object_name': 'MediaItemIdentifier', 'db_table': "'media_item_identifier'"}, + 'date_first': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'date_last': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'date_modified': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'identifier': ('telemeta.models.core.CharField', [], {'default': "''", 'unique': 'True', 'max_length': '255', 'blank': 'True'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'identifiers'", 'to': "orm['telemeta.MediaItem']"}), + 'notes': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'type': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'to': "orm['telemeta.IdentifierType']", 'null': 'True', 'blank': 'True'}) + }, + 'telemeta.mediaitemkeyword': { + 'Meta': {'unique_together': "(('item', 'keyword'),)", 'object_name': 'MediaItemKeyword', 'db_table': "'media_item_keywords'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'keyword_relations'", 'to': "orm['telemeta.MediaItem']"}), + 'keyword': ('telemeta.models.core.ForeignKey', [], {'related_name': "'item_relations'", 'to': "orm['telemeta.ContextKeyword']"}) + }, + 'telemeta.mediaitemmarker': { + 'Meta': {'ordering': "['time']", 'object_name': 'MediaItemMarker', 'db_table': "'media_markers'"}, + 'author': ('telemeta.models.core.ForeignKey', [], {'default': 'None', 'related_name': "'markers'", 'null': 'True', 'blank': 'True', 'to': u"orm['auth.User']"}), + 'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'markers'", 'to': "orm['telemeta.MediaItem']"}), + 'public_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + 'time': ('telemeta.models.core.FloatField', [], {'default': '0', 'blank': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}) + }, + 'telemeta.mediaitemperformance': { + 'Meta': {'object_name': 'MediaItemPerformance', 'db_table': "'media_item_performances'"}, + 'alias': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'performances'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.InstrumentAlias']"}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'instrument': ('telemeta.models.core.WeakForeignKey', [], {'default': 'None', 'related_name': "'performances'", 'null': 'True', 'blank': 'True', 'to': "orm['telemeta.Instrument']"}), + 'instruments_num': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'media_item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'performances'", 'to': "orm['telemeta.MediaItem']"}), + 'musicians': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}) + }, + 'telemeta.mediaitemrelated': { + 'Meta': {'object_name': 'MediaItemRelated', 'db_table': "'media_item_related'"}, + 'credits': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'file': ('telemeta.models.core.FileField', [], {'default': "''", 'max_length': '255', 'db_column': "'filename'", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'related'", 'to': "orm['telemeta.MediaItem']"}), + 'mime_type': ('telemeta.models.core.CharField', [], {'default': 'None', 'max_length': '250', 'null': 'True', 'blank': 'True'}), + 'title': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'url': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '500', 'blank': 'True'}) + }, + 'telemeta.mediaitemtranscoded': { + 'Meta': {'object_name': 'MediaItemTranscoded', 'db_table': "'telemeta_media_transcoded'"}, + 'date_added': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'file': ('django.db.models.fields.files.FileField', [], {'max_length': '1024', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'transcoded'", 'to': "orm['telemeta.MediaItem']"}), + 'mimetype': ('django.db.models.fields.CharField', [], {'max_length': '255', 'blank': 'True'}), + 'status': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + }, + 'telemeta.mediaitemtranscodingflag': { + 'Meta': {'object_name': 'MediaItemTranscodingFlag', 'db_table': "'media_transcoding'"}, + 'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now': 'True', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'transcoding'", 'to': "orm['telemeta.MediaItem']"}), + 'mime_type': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + 'value': ('telemeta.models.core.BooleanField', [], {'default': 'False'}) + }, + 'telemeta.mediapart': { + 'Meta': {'object_name': 'MediaPart', 'db_table': "'media_parts'"}, + 'end': ('telemeta.models.core.FloatField', [], {}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'item': ('telemeta.models.core.ForeignKey', [], {'related_name': "'parts'", 'to': "orm['telemeta.MediaItem']"}), + 'start': ('telemeta.models.core.FloatField', [], {}), + 'title': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.mediatype': { + 'Meta': {'ordering': "['value']", 'object_name': 'MediaType', 'db_table': "'media_type'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.metadataauthor': { + 'Meta': {'ordering': "['value']", 'object_name': 'MetadataAuthor', 'db_table': "'metadata_authors'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.metadatawriter': { + 'Meta': {'ordering': "['value']", 'object_name': 'MetadataWriter', 'db_table': "'metadata_writers'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.numberofchannels': { + 'Meta': {'ordering': "['value']", 'object_name': 'NumberOfChannels', 'db_table': "'original_channel_number'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.organization': { + 'Meta': {'ordering': "['value']", 'object_name': 'Organization', 'db_table': "'organization'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.originalformat': { + 'Meta': {'ordering': "['value']", 'object_name': 'OriginalFormat', 'db_table': "'original_format'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.physicalformat': { + 'Meta': {'ordering': "['value']", 'object_name': 'PhysicalFormat', 'db_table': "'physical_formats'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.playlist': { + 'Meta': {'object_name': 'Playlist', 'db_table': "'playlists'"}, + 'author': ('telemeta.models.core.ForeignKey', [], {'related_name': "'playlists'", 'db_column': "'author'", 'to': u"orm['auth.User']"}), + 'description': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'public_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + 'title': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.playlistresource': { + 'Meta': {'object_name': 'PlaylistResource', 'db_table': "'playlist_resources'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'playlist': ('telemeta.models.core.ForeignKey', [], {'related_name': "'resources'", 'to': "orm['telemeta.Playlist']"}), + 'public_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + 'resource_id': ('telemeta.models.core.CharField', [], {'max_length': '250'}), + 'resource_type': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.publisher': { + 'Meta': {'ordering': "['value']", 'object_name': 'Publisher', 'db_table': "'publishers'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.publishercollection': { + 'Meta': {'ordering': "['value']", 'object_name': 'PublisherCollection', 'db_table': "'publisher_collections'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'publisher': ('telemeta.models.core.ForeignKey', [], {'related_name': "'publisher_collections'", 'to': "orm['telemeta.Publisher']"}), + 'value': ('telemeta.models.core.CharField', [], {'max_length': '250'}) + }, + 'telemeta.publishingstatus': { + 'Meta': {'ordering': "['value']", 'object_name': 'PublishingStatus', 'db_table': "'publishing_status'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.recordingcontext': { + 'Meta': {'ordering': "['value']", 'object_name': 'RecordingContext', 'db_table': "'recording_contexts'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.revision': { + 'Meta': {'object_name': 'Revision', 'db_table': "'revisions'"}, + 'change_type': ('telemeta.models.core.CharField', [], {'max_length': '16'}), + 'element_id': ('telemeta.models.core.IntegerField', [], {}), + 'element_type': ('telemeta.models.core.CharField', [], {'max_length': '16'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'time': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'user': ('telemeta.models.core.ForeignKey', [], {'related_name': "'revisions'", 'db_column': "'username'", 'to': u"orm['auth.User']"}) + }, + 'telemeta.rights': { + 'Meta': {'ordering': "['value']", 'object_name': 'Rights', 'db_table': "'rights'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.search': { + 'Meta': {'ordering': "['-date']", 'object_name': 'Search', 'db_table': "'searches'"}, + 'criteria': ('django.db.models.fields.related.ManyToManyField', [], {'blank': 'True', 'related_name': "'search'", 'null': 'True', 'symmetrical': 'False', 'to': "orm['telemeta.Criteria']"}), + 'date': ('telemeta.models.core.DateTimeField', [], {'default': 'None', 'auto_now_add': 'True', 'null': 'True', 'blank': 'True'}), + 'description': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'username': ('telemeta.models.core.ForeignKey', [], {'related_name': "'searches'", 'db_column': "'username'", 'to': u"orm['auth.User']"}) + }, + 'telemeta.status': { + 'Meta': {'ordering': "['value']", 'object_name': 'Status', 'db_table': "'media_status'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.tapelength': { + 'Meta': {'ordering': "['value']", 'object_name': 'TapeLength', 'db_table': "'tape_length'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.tapespeed': { + 'Meta': {'ordering': "['value']", 'object_name': 'TapeSpeed', 'db_table': "'tape_speed'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.tapevendor': { + 'Meta': {'ordering': "['value']", 'object_name': 'TapeVendor', 'db_table': "'tape_vendor'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.tapewheeldiameter': { + 'Meta': {'ordering': "['value']", 'object_name': 'TapeWheelDiameter', 'db_table': "'tape_wheel_diameter'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.tapewidth': { + 'Meta': {'ordering': "['value']", 'object_name': 'TapeWidth', 'db_table': "'tape_width'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.topic': { + 'Meta': {'ordering': "['value']", 'object_name': 'Topic', 'db_table': "'topic'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + }, + 'telemeta.userprofile': { + 'Meta': {'object_name': 'UserProfile', 'db_table': "'profiles'"}, + 'address': ('telemeta.models.core.TextField', [], {'default': "''", 'blank': 'True'}), + 'attachment': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'department': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'expiration_date': ('telemeta.models.core.DateField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), + 'function': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'institution': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'telephone': ('telemeta.models.core.CharField', [], {'default': "''", 'max_length': '250', 'blank': 'True'}), + 'user': ('telemeta.models.core.ForeignKey', [], {'to': u"orm['auth.User']", 'unique': 'True'}) + }, + 'telemeta.vernacularstyle': { + 'Meta': {'ordering': "['value']", 'object_name': 'VernacularStyle', 'db_table': "'vernacular_styles'"}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'value': ('telemeta.models.core.CharField', [], {'unique': 'True', 'max_length': '250'}) + } + } + + complete_apps = ['telemeta'] \ No newline at end of file diff --git a/telemeta/models/enum.py b/telemeta/models/enum.py index 2d6ced69..3e27ed51 100644 --- a/telemeta/models/enum.py +++ b/telemeta/models/enum.py @@ -38,8 +38,9 @@ from django.utils.translation import ugettext_lazy as _ class Enumeration(ModelCore): - "Abstract enumerations base class" + + hidden = False value = CharField(_('value'), required=True, unique=True) def __unicode__(self): @@ -174,6 +175,8 @@ class EthnicGroupAlias(ModelCore): class TapeWheelDiameter(Enumeration): "Tape wheel diameter (cm)" + hidden = True + class Meta(MetaEnumeration): db_table = 'tape_wheel_diameter' verbose_name = _("tape wheel diameter (cm)") @@ -181,6 +184,8 @@ class TapeWheelDiameter(Enumeration): class TapeLength(Enumeration): "Tape length (cm)" + hidden = True + class Meta(MetaEnumeration): db_table = 'tape_length' verbose_name = _("tape length (cm)") @@ -188,6 +193,8 @@ class TapeLength(Enumeration): class TapeWidth(Enumeration): "Tape width (inch)" + hidden = True + class Meta(MetaEnumeration): db_table = 'tape_width' verbose_name = _("tape width (inch)") @@ -195,6 +202,8 @@ class TapeWidth(Enumeration): class TapeSpeed(Enumeration): "Tape speed (cm/s)" + hidden = True + class Meta(MetaEnumeration): db_table = 'tape_speed' verbose_name = _("tape speed (cm/s)") @@ -202,34 +211,48 @@ class TapeSpeed(Enumeration): class TapeVendor(Enumeration): "Tape vendor" + hidden = True + class Meta(MetaEnumeration): db_table = 'tape_vendor' - verbose_name = _("tape vendor") + verbose_name = _("tape brand") + class NumberOfChannels(Enumeration): "Number of channels" + hidden = True + class Meta(MetaEnumeration): db_table = 'original_channel_number' verbose_name = _("number of channels") + class Organization(Enumeration): "Organization" + hidden = True + class Meta(MetaEnumeration): db_table = 'organization' verbose_name = _("organization") + class Rights(Enumeration): "Archive rights" + hidden = True + class Meta(MetaEnumeration): db_table = 'rights' verbose_name = _("rights") + class Topic(Enumeration): "Topic, subject of the study, research, etc.." + hidden = True + class Meta(MetaEnumeration): db_table = 'topic' verbose_name = _("topic") @@ -251,6 +274,14 @@ class MediaType(Enumeration): verbose_name = _("media type") +class OriginalFormat(Enumeration): + "Original format" + + class Meta(MetaEnumeration): + db_table = 'original_format' + verbose_name = _("original format") + + class Status(Enumeration): "Resource status" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index a636f6a6..4db89aa8 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -106,7 +106,7 @@ class MediaResource(ModelCore): return _('Sound and metadata') return _('Private data') - public_access_label.verbose_name = _('public access') + public_access_label.verbose_name = _('access type') def set_revision(self, user): "Save a media object and add a revision" @@ -125,8 +125,7 @@ class MediaBaseResource(MediaResource): title = CharField(_('title'), required=True) descriptions = TextField(_('description')) code = CharField(_('code'), unique=True, required=True) - public_access = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, - max_length=16, default="metadata") + public_access = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata") def __unicode__(self): return self.code @@ -157,8 +156,7 @@ class MediaRelated(MediaResource): mime_type = CharField(_('mime_type'), null=True) url = CharField(_('url'), max_length=500) credits = CharField(_('credits')) - file = FileField(_('file'), upload_to='items/%Y/%m/%d', - db_column="filename", max_length=255) + file = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename", max_length=255) def is_image(self): is_url_image = False @@ -207,52 +205,40 @@ class MediaCollection(MediaResource): # General informations title = CharField(_('title'), required=True) alt_title = CharField(_('original title / translation')) - creator = CharField(_('depositor / contributor'), help_text=_('First name, Last name; First name, Last name')) - doctype_code = IntegerField(_('document type')) + creator = CharField(_('depositor / contributor'), help_text=_('First name, Last name ; First name, Last name')) description = TextField(_('description')) - recording_context = WeakForeignKey('RecordingContext', related_name="collections", - verbose_name=_('recording context')) + recording_context = WeakForeignKey('RecordingContext', related_name="collections", verbose_name=_('recording context')) recorded_from_year = IntegerField(_('recording year (from)'), help_text=_('YYYY')) recorded_to_year = IntegerField(_('recording year (until)'), help_text=_('YYYY')) year_published = IntegerField(_('year published'), help_text=_('YYYY')) - public_access = CharField(_('access type'), choices=PUBLIC_ACCESS_CHOICES, - max_length=16, default="metadata") + public_access = CharField(_('access type'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata") # Geographic and cultural informations # See "countries" and "ethnic_groups" methods below # Legal notices - collector = CharField(_('recordist'), help_text=_('First name, Last name; First name, Last name')) - publisher = WeakForeignKey('Publisher', related_name="collections", - verbose_name=_('publisher')) - publisher_collection = WeakForeignKey('PublisherCollection', related_name="collections", - verbose_name=_('publisher collection')) + collector = CharField(_('recordist'), help_text=_('First name, Last name ; First name, Last name')) + publisher = WeakForeignKey('Publisher', related_name="collections", verbose_name=_('publisher')) + publisher_collection = WeakForeignKey('PublisherCollection', related_name="collections", verbose_name=_('publisher collection')) publisher_serial = CharField(_('publisher serial number')) - booklet_author = CharField(_('publisher references'), blank=True) - reference = CharField(_('reference')) + booklet_author = CharField(_('booklet author'), blank=True) + reference = CharField(_('publisher reference')) external_references = TextField(_('bibliographic references')) auto_period_access = BooleanField(_('automatic access after a rolling period'), default=True) - legal_rights = WeakForeignKey('LegalRight', related_name="collections", - verbose_name=_('legal rights')) + legal_rights = WeakForeignKey('LegalRight', related_name="collections", verbose_name=_('legal rights')) # Archiving data - acquisition_mode = WeakForeignKey('AcquisitionMode', related_name="collections", - verbose_name=_('mode of acquisition')) + acquisition_mode = WeakForeignKey('AcquisitionMode', related_name="collections", verbose_name=_('mode of acquisition')) cnrs_contributor = CharField(_('CNRS depositor')) - copy_type = WeakForeignKey('CopyType', related_name="collections", - verbose_name=_('type of copy')) - metadata_author = WeakForeignKey('MetadataAuthor', related_name="collections", - verbose_name=_('record author')) + copy_type = WeakForeignKey('CopyType', related_name="collections", verbose_name=_('copy type')) + metadata_author = WeakForeignKey('MetadataAuthor', related_name="collections", verbose_name=_('record author')) booklet_description = TextField(_('related documentation')) - publishing_status = WeakForeignKey('PublishingStatus', related_name="collections", - verbose_name=_('secondary edition')) - status = WeakForeignKey('Status', related_name="collections", - verbose_name=_('collection status')) + publishing_status = WeakForeignKey('PublishingStatus', related_name="collections", verbose_name=_('secondary edition')) + status = WeakForeignKey('Status', related_name="collections", verbose_name=_('collection status')) alt_copies = TextField(_('copies')) comment = TextField(_('comment')) - metadata_writer = WeakForeignKey('MetadataWriter', related_name="collections", - verbose_name=_('record writer')) + metadata_writer = WeakForeignKey('MetadataWriter', related_name="collections", verbose_name=_('record writer')) archiver_notes = TextField(_('archiver notes')) items_done = CharField(_('items finished')) collector_is_creator = BooleanField(_('recordist identical to depositor')) @@ -260,17 +246,14 @@ class MediaCollection(MediaResource): conservation_site = CharField(_('conservation site')) # Technical data - code = CharField(_('code'), unique=True, required=True, - validators=[is_valid_collection_code]) + code = CharField(_('code'), unique=True, required=True, validators=[is_valid_collection_code]) old_code = CharField(_('old code'), unique=False, null=True, blank=True) - media_type = WeakForeignKey('MediaType', related_name="collections", - verbose_name=_('media type')) + media_type = WeakForeignKey('MediaType', related_name="collections", verbose_name=_('media type')) approx_duration = DurationField(_('estimated duration'), help_text='hh:mm:ss') physical_items_num = IntegerField(_('number of components (medium / piece)')) - physical_format = WeakForeignKey('PhysicalFormat', related_name="collections", - verbose_name=_('archive format')) - ad_conversion = WeakForeignKey('AdConversion', related_name='collections', - verbose_name=_('digitization')) + physical_format = WeakForeignKey('PhysicalFormat', related_name="collections", verbose_name=_('archive format')) + original_format = WeakForeignKey('OriginalFormat', related_name="collections", verbose_name=_('original format')) + ad_conversion = WeakForeignKey('AdConversion', related_name='collections', verbose_name=_('digitization')) # All objects = MediaCollectionManager() @@ -364,59 +347,59 @@ class MediaItem(MediaResource): # Main Informations title = CharField(_('title')) alt_title = CharField(_('original title / translation')) + collector = CharField(_('collector')) collection = ForeignKey('MediaCollection', related_name="items", verbose_name=_('collection')) recorded_from_date = DateField(_('recording date (from)'), help_text=_('YYYY-MM-DD')) recorded_to_date = DateField(_('recording date (until)'), help_text=_('YYYY-MM-DD')) public_access = CharField(_('access type'), choices=ITEM_PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata") - scientist = CharField(_('scientist'), help_text=_('First name, Last name; First name, Last name')) - topic = WeakForeignKey('Topic', verbose_name=_('topic')) - summary = TextField(_('summary')) - comment = TextField(_('remarks')) # Geographic and cultural informations location = WeakForeignKey('Location', verbose_name=_('location')) location_comment = CharField(_('location details')) cultural_area = CharField(_('cultural area')) - ethnic_group = WeakForeignKey('EthnicGroup', related_name="items", verbose_name=_('population / social group')) language = CharField(_('language')) language_iso = ForeignKey('Language', related_name="items", verbose_name=_('ISO language'), blank=True, null=True, on_delete=models.SET_NULL) - context_comment = TextField(_('comments / ethnographic context')) - moda_execut = CharField(_('implementing rules')) + ethnic_group = WeakForeignKey('EthnicGroup', related_name="items", verbose_name=_('population / social group')) + context_comment = TextField(_('Ethnographic context')) # Musical informations + moda_execut = CharField(_('implementing rules')) vernacular_style = WeakForeignKey('VernacularStyle', related_name="items", verbose_name=_('vernacular style')) generic_style = WeakForeignKey('GenericStyle', related_name="items", verbose_name=_('generic style')) - author = CharField(_('author / compositor'), help_text=_('First name, Last name; First name, Last name')) - contributor = CharField(_('contributor')) + author = CharField(_('author / compositor'), help_text=_('First name, Last name ; First name, Last name')) # Legal mentions organization = WeakForeignKey('Organization', verbose_name=_('organization')) depositor = CharField(_('depositor')) rights = WeakForeignKey('Rights', verbose_name=_('rights')) - auto_period_access = BooleanField(_('automatic access after a rolling period'), default=True) # Archiving data code = CharField(_('code'), unique=True, blank=True, required=True, help_text=_('CollectionCode-ItemCode')) old_code = CharField(_('original code'), unique=False, blank=True) track = CharField(_('item number')) - 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')) - mimetype = CharField(_('mime type'), max_length=255, blank=True) + auto_period_access = BooleanField(_('automatic access after a rolling period'), default=True) + comment = TextField(_('remarks')) - # Media + # Technical data + media_type = WeakForeignKey('MediaType', related_name="items", verbose_name=_('media type')) + approx_duration = DurationField(_('approximative duration'), help_text=_('hh:mm:ss')) + mimetype = CharField(_('mime type'), max_length=255, blank=True) file = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename", max_length=1024) url = URLField(_('URL'), max_length=512, blank=True) - # Technical data - approx_duration = DurationField(_('approximative duration'), help_text=_('hh:mm:ss')) + # LAM + recordist = CharField(_('recordist')) + digitalist = CharField(_('digitalist')) + digitization_date = DateField(_('digitization date')) + publishing_date = DateField(_('publishing date')) + scientist = CharField(_('scientist'), help_text=_('First name, Last name ; First name, Last name')) + topic = WeakForeignKey('Topic', verbose_name=_('topic')) + summary = TextField(_('summary')) + contributor = CharField(_('contributor')) # Manager objects = MediaItemManager() @@ -483,7 +466,7 @@ class MediaItem(MediaResource): if self.title and not re.match('^ *N *$', self.title): title = self.title else: - title = unicode(self.collection) + title = unicode(self.collection.title) if self.track: title += ' ' + self.track return title @@ -561,12 +544,9 @@ class MediaItemKeyword(ModelCore): class MediaItemPerformance(ModelCore): "Item performance" - media_item = ForeignKey('MediaItem', related_name="performances", - verbose_name=_('item')) - instrument = WeakForeignKey('Instrument', related_name="performances", - verbose_name=_('composition')) - alias = WeakForeignKey('InstrumentAlias', related_name="performances", - verbose_name=_('vernacular name')) + media_item = ForeignKey('MediaItem', related_name="performances", verbose_name=_('item')) + instrument = WeakForeignKey('Instrument', related_name="performances", verbose_name=_('composition')) + alias = WeakForeignKey('InstrumentAlias', related_name="performances", verbose_name=_('vernacular name')) instruments_num = CharField(_('number')) musicians = CharField(_('interprets')) @@ -804,6 +784,13 @@ class MediaCorpus(MediaBaseResource): return True return False + def computed_duration(self): + duration = Duration() + for child in self.children.all(): + duration += child.computed_duration() + return duration + computed_duration.verbose_name = _('total available duration') + class Meta(MetaCore): db_table = 'media_corpus' verbose_name = _('corpus') @@ -832,6 +819,13 @@ class MediaFonds(MediaBaseResource): return True return False + def computed_duration(self): + duration = Duration() + for child in self.children.all(): + duration += child.computed_duration() + return duration + computed_duration.verbose_name = _('total available duration') + class Meta(MetaCore): db_table = 'media_fonds' verbose_name = _('fonds') diff --git a/telemeta/templates/telemeta/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html index 6cb3e58e..587cecd7 100644 --- a/telemeta/templates/telemeta/admin_enumerations.html +++ b/telemeta/templates/telemeta/admin_enumerations.html @@ -14,8 +14,10 @@ {% trans "Title"%} {% for enum in enumerations %} + {% if not enum.hidden %} {% trans enum.name|capfirst %} + {% endif %} {% endfor %} diff --git a/telemeta/templates/telemeta/collection_detail.html b/telemeta/templates/telemeta/collection_detail.html index 6c421b56..876d7475 100644 --- a/telemeta/templates/telemeta/collection_detail.html +++ b/telemeta/templates/telemeta/collection_detail.html @@ -65,7 +65,7 @@ {% endif %} {% block infos %}
- {% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %} : {% trans "List" %}{% else %}No item{% endif %} + {% if collection.items.count %}{{ collection.items.count }} {% ifequal collection.items.count 1 %}item{% else %}items{% endifequal %} : {% trans "View list" %}{% else %}No item{% endif %}
{% block general_info %} @@ -87,7 +87,10 @@ {% dl_field collection "recording_context" %}
{% trans "Recording period" %}
{% if collection.recorded_from_year %}{{ collection.recorded_from_year }}{% endif %}{% if collection.recorded_from_year and collection.recorded_to_year %} - {% endif %}{% if collection.recorded_to_year %}{{ collection.recorded_to_year}}{% endif %}
+ {% if '_E_' in collection.public_id %} {% dl_field collection "year_published" placeholder %} + {% endif %} + {% dl_field collection "public_access_label" %} {% for parent in parents %}
{% trans parent.element_type|capitalize %}
{{ parent.title }}
@@ -127,12 +130,13 @@ {% dl_field collection "publisher_collection" %} {% dl_field collection "publisher_serial" %} {% dl_field collection "booklet_author" %} + {% if '_E_' in collection.public_id %} {% dl_field collection "reference" %} + {% endif %} {% if collection.external_references %}
{% trans "Bibliographic references" %}
{{ collection.external_references|html_line_break|safe }}
{% endif %} - {% dl_field collection "public_access_label" %} {% dl_field collection "legal_rights" %}
@@ -154,6 +158,7 @@
{{ collection.booklet_description|html_line_break|safe }}
{% endif %} {% dl_field collection "publishing_status" %} + {% dl_field collection "status" %} {% if collection.alt_ids %} {% dl_field collection "alt_ids" %} {% endif %} @@ -164,7 +169,7 @@
{% trans "Last modification" %}
{{ last_revision.time }} {% if user.is_authenticated %}({{last_revision.user.username}}){% endif %}
{% endif %} - {% dl_field collection "travail" %} + {% dl_field collection "archiver_notes" %} {% dl_field collection "items_done" %} {% dl_field collection "conservation_site" %} @@ -180,16 +185,19 @@
{% dl_field collection "code" %} {% dl_field collection "old_code" %} + {% dl_field collection "media_type" %} + {% if collection.computed_duration %} {% dl_field collection "approx_duration" %} + {% endif %} {% dl_field collection "computed_duration" %} {% dl_field collection "computed_size" %} {% dl_field collection "physical_items_num" %}
{% trans "Number of items" %}
{{ collection.items.count }}
- {% dl_field collection "media_type" %} {% if collection.physical_format %} {% dl_field collection "physical_format" %} {% endif %} + {% dl_field collection "original_format" %} {% dl_field collection "ad_conversion" %}
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html index ced9598a..2a8e1185 100644 --- a/telemeta/templates/telemeta/mediaitem_detail.html +++ b/telemeta/templates/telemeta/mediaitem_detail.html @@ -151,7 +151,7 @@ Item : {{ item }} wait  Loading... - @@ -205,9 +205,6 @@ Item : {{ item }}
{% trans "Recording date" %}
{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}
{% dl_field item "public_access" %} - {% if item.moda_exec %} - {% dl_field item "moda_exec" %} - {% endif %} {% endblock general_info %} @@ -238,6 +235,9 @@ Item : {{ item }} {% block musical_data %}

{% trans "Musical informations" %}

+ {% if item.moda_exec %} + {% dl_field item "moda_exec" %} + {% endif %}
{% dl_field item "vernacular_style" %} {% dl_field item "generic_style" %} @@ -279,6 +279,7 @@ Item : {{ item }} {% dl_field item "code" %} {% dl_field item "old_code" %} {% dl_field item "track" %} + {% dl_field item "collector_selection" %} {% dl_field item "creator_reference" %} {% if item.external_references %}
{% trans "Published references" %}
@@ -300,11 +301,9 @@ Item : {{ item }}

{% trans "Technical data" %}

-
{% trans "Media type" %}
-
{% trans mime_type|mime_to_media_type %}
+ {% dl_field format "media_type" %} {% dl_field item "approx_duration" %} - - {% if format %} + {# {% if format %} {% dl_field format "physical_format" %} {% dl_field format "original_code" %} {% dl_field format "original_number" %} @@ -320,7 +319,7 @@ Item : {{ item }} {% dl_field format "tape_vendor" %} {% dl_field format "tape_reference" %} {% dl_field format "sticker_presence" %} - {% endif %} + {% endif %} #}
diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html index 9202e189..f0e52fb4 100644 --- a/telemeta/templates/telemeta/mediaitem_edit.html +++ b/telemeta/templates/telemeta/mediaitem_edit.html @@ -4,7 +4,7 @@ {% load bootstrap3 %} {% block title %} - Item : {% if item.title %}{{ item.title }}{% else %}{{ item.public_id }}{% endif %} + Item : {{ item }} {% endblock %} {% block title_buttons %} diff --git a/telemeta/templates/telemeta/resource_detail.html b/telemeta/templates/telemeta/resource_detail.html index 0040e3cb..fb15dbe1 100644 --- a/telemeta/templates/telemeta/resource_detail.html +++ b/telemeta/templates/telemeta/resource_detail.html @@ -60,12 +60,13 @@ jQuery(document).ready(function(){ {% block general_info %}
{% for field in resource.get_fields %} - {% if "id" in field.name or "description" == field.name %} + {% if "id" in field.name or "description" == field.name or "public_access" == field.name %} {{ field.label_tag.as_hidden }}{{ field.as_hidden }} {% else %} {% dl_field resource field.name %} {% endif %} {% endfor %} + {% dl_field resource "computed_duration" %} {% for parent in parents %}
{% trans parent.element_type|capitalize %}
{{ parent.title }}
diff --git a/telemeta/views/item.py b/telemeta/views/item.py index 6a67ef23..a8e23d6d 100644 --- a/telemeta/views/item.py +++ b/telemeta/views/item.py @@ -642,6 +642,9 @@ class ItemSoundListView(ItemListView): class ItemViewMixin(ItemBaseMixin): model = MediaItem + inlines = [ItemPerformanceInline, ItemKeywordInline, ItemRelatedInline, ItemIdentifierInline] + # inlines = [ItemPerformanceInline, ItemKeywordInline, ItemRelatedInline, + # ItemFormatInline, ItemIdentifierInline] def get_export_formats(self): formats = [] @@ -713,8 +716,6 @@ class ItemEditView(ItemViewMixin, UpdateWithInlinesView): form_class = MediaItemForm template_name = 'telemeta/mediaitem_edit.html' - inlines = [ItemRelatedInline, ItemPerformanceInline, ItemKeywordInline, - ItemFormatInline, ItemIdentifierInline] def form_valid(self, form): messages.info(self.request, _("You have successfully updated your item.")) @@ -741,8 +742,6 @@ class ItemAddView(ItemViewMixin, CreateWithInlinesView): form_class = MediaItemForm template_name = 'telemeta/mediaitem_add.html' - inlines = [ItemRelatedInline, ItemPerformanceInline, ItemKeywordInline, - ItemFormatInline, ItemIdentifierInline] def get_success_url(self): return reverse_lazy('telemeta-items') @@ -752,8 +751,6 @@ class ItemCopyView(ItemAddView): form_class = MediaItemForm template_name = 'telemeta/mediaitem_add.html' - inlines = [ItemRelatedInline, ItemPerformanceInline, ItemKeywordInline, - ItemFormatInline, ItemIdentifierInline] def get_initial(self): resource = self.model.objects.get(code=self.kwargs['public_id'])