From 344438f9accee023ef655434ff8fa85c5f0baf67 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 28 Nov 2011 17:35:35 +0100 Subject: [PATCH] edit: fix various field display conditions, closes #81 model: add MediaCorpus, add credits to MediaItemRelated --- telemeta/locale/de/LC_MESSAGES/django.mo | Bin 420 -> 420 bytes telemeta/locale/de/LC_MESSAGES/django.po | 318 ++++++++++-------- telemeta/locale/de/LC_MESSAGES/djangojs.mo | Bin 420 -> 420 bytes telemeta/locale/de/LC_MESSAGES/djangojs.po | 2 +- telemeta/locale/fr/LC_MESSAGES/django.mo | Bin 13266 -> 13299 bytes telemeta/locale/fr/LC_MESSAGES/django.po | 318 ++++++++++-------- telemeta/locale/fr/LC_MESSAGES/djangojs.mo | Bin 1466 -> 1466 bytes telemeta/locale/fr/LC_MESSAGES/djangojs.po | 2 +- telemeta/models/media.py | 36 ++ .../telemeta_default/collection_edit.html | 8 +- .../telemeta_default/mediaitem_edit.html | 12 +- .../mediaitem_related_edit.html | 6 +- 12 files changed, 410 insertions(+), 292 deletions(-) diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index dde1bb3257c3193c0bcb581156ec524ac0ac6250..b7c11dae935cbd4f5b69905755a76d97f6d3c591 100644 GIT binary patch delta 19 acmZ3&yo7l|KZlWpf}y#Uk?F?iyo>-k69r!Y delta 19 acmZ3&yo7l|KZl`#f}x3(k@?2yyo>-jp#@a{ diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index dbfdaa82..ba9664db 100644 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-10 14:27+0100\n" +"POT-Creation-Date: 2011-11-28 17:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -26,35 +26,35 @@ msgstr "" msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "" -#: models/enum.py:41 models/enum.py:139 models/media.py:421 +#: models/enum.py:41 models/enum.py:139 models/media.py:459 msgid "value" msgstr "" -#: models/enum.py:57 models/media.py:148 +#: models/enum.py:57 models/media.py:183 msgid "archive format" msgstr "" -#: models/enum.py:64 models/media.py:131 +#: models/enum.py:64 models/media.py:166 msgid "secondary edition" msgstr "" -#: models/enum.py:71 models/media.py:125 +#: models/enum.py:71 models/media.py:160 msgid "mode of acquisition" msgstr "" -#: models/enum.py:78 models/media.py:128 +#: models/enum.py:78 models/media.py:163 msgid "record author" msgstr "" -#: models/enum.py:85 models/media.py:135 +#: models/enum.py:85 models/media.py:170 msgid "record writer" msgstr "" -#: models/enum.py:92 models/media.py:121 +#: models/enum.py:92 models/media.py:156 msgid "legal rights" msgstr "" -#: models/enum.py:99 models/media.py:100 +#: models/enum.py:99 models/media.py:133 msgid "recording context" msgstr "" @@ -62,19 +62,19 @@ msgstr "" msgid "A/D conversion" msgstr "" -#: models/enum.py:113 models/media.py:252 +#: models/enum.py:113 models/media.py:289 msgid "vernacular style" msgstr "" -#: models/enum.py:120 models/media.py:254 +#: models/enum.py:120 models/media.py:291 msgid "generic style" msgstr "" -#: models/enum.py:127 models/media.py:381 +#: models/enum.py:127 models/media.py:419 msgid "keyword" msgstr "" -#: models/enum.py:134 models/media.py:111 +#: models/enum.py:134 models/media.py:146 msgid "publisher / status" msgstr "" @@ -82,12 +82,12 @@ msgstr "" msgid "publisher" msgstr "" -#: models/enum.py:153 models/enum.py:157 models/media.py:245 +#: models/enum.py:153 models/enum.py:157 models/media.py:282 msgid "population / social group" msgstr "" #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53 -#: models/location.py:51 models/location.py:158 models/media.py:420 +#: models/location.py:51 models/location.py:158 models/media.py:458 msgid "name" msgstr "" @@ -136,7 +136,7 @@ msgid "authoritative" msgstr "" #: models/location.py:112 models/location.py:169 models/location.py:184 -#: models/media.py:241 +#: models/media.py:278 msgid "location" msgstr "" @@ -168,288 +168,296 @@ msgstr "" msgid "Private data" msgstr "" -#: models/media.py:65 models/media.py:118 models/media.py:269 +#: models/media.py:65 models/media.py:89 models/media.py:153 +#: models/media.py:306 msgid "public access" msgstr "" -#: models/media.py:95 models/media.py:266 +#: models/media.py:85 models/media.py:128 models/media.py:303 msgid "reference" msgstr "" -#: models/media.py:96 models/media.py:232 models/media.py:341 -#: models/media.py:436 models/media.py:451 models/media.py:485 +#: models/media.py:86 models/media.py:129 models/media.py:269 +#: models/media.py:378 models/media.py:477 models/media.py:492 +#: models/media.py:526 msgid "title" msgstr "" -#: models/media.py:97 models/media.py:233 +#: models/media.py:87 models/media.py:380 models/media.py:493 +#: models/media.py:528 +msgid "description" +msgstr "" + +#: models/media.py:88 models/media.py:178 models/media.py:300 +msgid "code" +msgstr "" + +#: models/media.py:130 models/media.py:270 msgid "original title / translation" msgstr "" -#: models/media.py:98 +#: models/media.py:131 msgid "depositor / contributor" msgstr "" -#: models/media.py:101 +#: models/media.py:134 msgid "recording year (from)" msgstr "" -#: models/media.py:102 +#: models/media.py:135 msgid "recording year (until)" msgstr "" -#: models/media.py:103 +#: models/media.py:136 msgid "year published" msgstr "" -#: models/media.py:109 models/media.py:234 +#: models/media.py:144 models/media.py:271 msgid "recordist" msgstr "" -#: models/media.py:113 +#: models/media.py:148 msgid "publisher collection" msgstr "" -#: models/media.py:114 +#: models/media.py:149 msgid "publisher serial number" msgstr "" -#: models/media.py:115 +#: models/media.py:150 msgid "author of published notice" msgstr "" -#: models/media.py:116 +#: models/media.py:151 msgid "bibliographic references" msgstr "" -#: models/media.py:117 +#: models/media.py:152 msgid "document type" msgstr "" -#: models/media.py:126 +#: models/media.py:161 msgid "CNRS depositor" msgstr "" -#: models/media.py:129 +#: models/media.py:164 msgid "related documentation" msgstr "" -#: models/media.py:132 +#: models/media.py:167 msgid "copies" msgstr "" -#: models/media.py:133 +#: models/media.py:168 msgid "comment" msgstr "" -#: models/media.py:136 +#: models/media.py:171 msgid "archiver notes" msgstr "" -#: models/media.py:137 +#: models/media.py:172 msgid "items finished" msgstr "" -#: models/media.py:138 +#: models/media.py:173 msgid "recordist identical to depositor" msgstr "" -#: models/media.py:139 +#: models/media.py:174 msgid "published" msgstr "" -#: models/media.py:140 +#: models/media.py:175 msgid "conservation site" msgstr "" -#: models/media.py:143 models/media.py:263 -msgid "code" -msgstr "" - -#: models/media.py:144 models/media.py:264 +#: models/media.py:179 models/media.py:301 msgid "old code" msgstr "" -#: models/media.py:145 models/media.py:273 +#: models/media.py:180 models/media.py:310 msgid "approximative duration" msgstr "" -#: models/media.py:146 +#: models/media.py:181 msgid "number of components (medium / piece)" msgstr "" -#: models/media.py:150 +#: models/media.py:185 msgid "digitization" msgstr "" -#: models/media.py:151 +#: models/media.py:186 msgid "status" msgstr "" -#: models/media.py:152 +#: models/media.py:187 msgid "a_informer_07_03" msgstr "" -#: models/media.py:186 +#: models/media.py:221 msgid "states / nations" msgstr "" -#: models/media.py:200 +#: models/media.py:235 msgid "populations / social groups" msgstr "" -#: models/media.py:208 models/media.py:317 +#: models/media.py:243 models/media.py:354 msgid "computed duration" msgstr "" -#: models/media.py:236 +#: models/media.py:273 msgid "collection" msgstr "" -#: models/media.py:237 +#: models/media.py:274 msgid "recording date (from)" msgstr "" -#: models/media.py:238 +#: models/media.py:275 msgid "recording date (until)" msgstr "" -#: models/media.py:242 +#: models/media.py:279 msgid "location details" msgstr "" -#: models/media.py:243 +#: models/media.py:280 msgid "cultural area" msgstr "" -#: models/media.py:246 +#: models/media.py:283 msgid "language" msgstr "" -#: models/media.py:247 +#: models/media.py:284 msgid "comments / ethnographic context" msgstr "" -#: models/media.py:248 +#: models/media.py:285 msgid "moda_execut" msgstr "" -#: models/media.py:255 +#: models/media.py:292 msgid "author / compositor" msgstr "" -#: models/media.py:258 +#: models/media.py:295 msgid "remarks" msgstr "" -#: models/media.py:259 +#: models/media.py:296 msgid "recordist selection" msgstr "" -#: models/media.py:260 +#: models/media.py:297 msgid "recordist as in collection" msgstr "" -#: models/media.py:265 +#: models/media.py:302 msgid "item number" msgstr "" -#: models/media.py:267 +#: models/media.py:304 msgid "published references" msgstr "" -#: models/media.py:268 +#: models/media.py:305 msgid "copy of" msgstr "" -#: models/media.py:270 models/media.py:346 +#: models/media.py:307 models/media.py:384 msgid "file" msgstr "" -#: models/media.py:280 models/media.py:518 -#: templates/telemeta_default/mediaitem_detail.html:190 +#: models/media.py:317 models/media.py:559 +#: templates/telemeta_default/mediaitem_detail.html:192 +#: templates/telemeta_default/mediaitem_detail_video.html:192 msgid "keywords" msgstr "" -#: models/media.py:340 models/media.py:380 models/media.py:394 -#: models/media.py:418 models/media.py:435 models/media.py:482 -#: models/media.py:503 +#: models/media.py:377 models/media.py:418 models/media.py:432 +#: models/media.py:456 models/media.py:476 models/media.py:523 +#: models/media.py:544 msgid "item" msgstr "" -#: models/media.py:342 models/media.py:486 models/media.py:505 -#: models/media.py:519 +#: models/media.py:379 models/media.py:527 models/media.py:546 +#: models/media.py:560 msgid "date" msgstr "" -#: models/media.py:343 models/media.py:452 models/media.py:487 -msgid "description" -msgstr "" - -#: models/media.py:344 models/media.py:504 +#: models/media.py:381 models/media.py:545 msgid "mime_type" msgstr "" -#: models/media.py:345 +#: models/media.py:382 msgid "url" msgstr "" -#: models/media.py:396 +#: models/media.py:383 +msgid "credits" +msgstr "" + +#: models/media.py:434 msgid "composition" msgstr "" -#: models/media.py:398 +#: models/media.py:436 msgid "vernacular name" msgstr "" -#: models/media.py:399 +#: models/media.py:437 msgid "number" msgstr "" -#: models/media.py:400 +#: models/media.py:438 msgid "interprets" msgstr "" -#: models/media.py:419 +#: models/media.py:457 msgid "id" msgstr "" -#: models/media.py:422 +#: models/media.py:460 msgid "unit" msgstr "" -#: models/media.py:437 +#: models/media.py:478 msgid "start" msgstr "" -#: models/media.py:438 +#: models/media.py:479 msgid "end" msgstr "" -#: models/media.py:449 models/media.py:468 models/media.py:483 +#: models/media.py:490 models/media.py:509 models/media.py:524 msgid "public_id" msgstr "" -#: models/media.py:469 +#: models/media.py:510 msgid "playlist" msgstr "" -#: models/media.py:470 +#: models/media.py:511 msgid "resource_type" msgstr "" -#: models/media.py:471 +#: models/media.py:512 msgid "resource_id" msgstr "" -#: models/media.py:484 models/system.py:54 +#: models/media.py:525 models/system.py:54 msgid "time" msgstr "" -#: models/media.py:488 +#: models/media.py:529 msgid "author" msgstr "" -#: models/media.py:506 +#: models/media.py:547 msgid "transcoded" msgstr "" @@ -553,7 +561,8 @@ msgstr "" #: templates/telemeta_default/admin_enumerations.html:12 #: templates/telemeta_default/home.html:46 #: templates/telemeta_default/mediaitem_copy.html:32 -#: templates/telemeta_default/mediaitem_detail.html:293 +#: templates/telemeta_default/mediaitem_detail.html:295 +#: templates/telemeta_default/mediaitem_detail_video.html:295 #: templates/telemeta_default/mediaitem_edit.html:27 #: templates/telemeta_default/search_criteria.html:78 #: templates/telemeta_default/search_results.html:30 @@ -683,16 +692,21 @@ msgid "Collection" msgstr "" #: templates/telemeta_default/collection_detail.html:42 -#: templates/telemeta_default/mediaitem_detail.html:88 -#: templates/telemeta_default/mediaitem_detail.html:190 -#: templates/telemeta_default/mediaitem_detail.html:229 -#: templates/telemeta_default/mediaitem_detail.html:350 +#: templates/telemeta_default/mediaitem_detail.html:90 +#: templates/telemeta_default/mediaitem_detail.html:192 +#: templates/telemeta_default/mediaitem_detail.html:231 +#: templates/telemeta_default/mediaitem_detail.html:352 +#: templates/telemeta_default/mediaitem_detail_video.html:90 +#: templates/telemeta_default/mediaitem_detail_video.html:192 +#: templates/telemeta_default/mediaitem_detail_video.html:231 +#: templates/telemeta_default/mediaitem_detail_video.html:352 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "" #: templates/telemeta_default/collection_detail.html:43 -#: templates/telemeta_default/mediaitem_detail.html:89 +#: templates/telemeta_default/mediaitem_detail.html:91 +#: templates/telemeta_default/mediaitem_detail_video.html:91 msgid "Copy" msgstr "" @@ -701,7 +715,8 @@ msgid "Add item" msgstr "" #: templates/telemeta_default/collection_detail.html:47 -#: templates/telemeta_default/mediaitem_detail.html:92 +#: templates/telemeta_default/mediaitem_detail.html:94 +#: templates/telemeta_default/mediaitem_detail_video.html:94 msgid "Add to playlist" msgstr "" @@ -716,7 +731,8 @@ msgid "Recording period" msgstr "" #: templates/telemeta_default/collection_detail.html:102 -#: templates/telemeta_default/mediaitem_detail.html:174 +#: templates/telemeta_default/mediaitem_detail.html:176 +#: templates/telemeta_default/mediaitem_detail_video.html:176 msgid "Geographic and cultural informations" msgstr "" @@ -732,7 +748,8 @@ msgid "Bibliographic references" msgstr "" #: templates/telemeta_default/collection_detail.html:142 -#: templates/telemeta_default/mediaitem_detail.html:246 +#: templates/telemeta_default/mediaitem_detail.html:248 +#: templates/telemeta_default/mediaitem_detail_video.html:248 msgid "Archiving data" msgstr "" @@ -745,17 +762,20 @@ msgid "Comments" msgstr "" #: templates/telemeta_default/collection_detail.html:166 -#: templates/telemeta_default/mediaitem_detail.html:262 +#: templates/telemeta_default/mediaitem_detail.html:264 +#: templates/telemeta_default/mediaitem_detail_video.html:264 msgid "Technical data" msgstr "" #: templates/telemeta_default/collection_detail.html:171 -#: templates/telemeta_default/mediaitem_detail.html:265 +#: templates/telemeta_default/mediaitem_detail.html:267 +#: templates/telemeta_default/mediaitem_detail_video.html:267 msgid "Media type" msgstr "" #: templates/telemeta_default/collection_detail.html:171 -#: templates/telemeta_default/mediaitem_detail.html:265 +#: templates/telemeta_default/mediaitem_detail.html:267 +#: templates/telemeta_default/mediaitem_detail_video.html:267 msgid "Audio" msgstr "" @@ -766,7 +786,8 @@ msgstr "" #: templates/telemeta_default/collection_detail.html:199 #: templates/telemeta_default/home.html:35 -#: templates/telemeta_default/mediaitem_detail.html:361 +#: templates/telemeta_default/mediaitem_detail.html:363 +#: templates/telemeta_default/mediaitem_detail_video.html:363 msgid "Delete" msgstr "" @@ -828,7 +849,8 @@ msgstr "" #: templates/telemeta_default/enumeration_edit.html:14 #: templates/telemeta_default/enumeration_edit.html:28 #: templates/telemeta_default/enumeration_edit_value.html:14 -#: templates/telemeta_default/mediaitem_detail.html:134 +#: templates/telemeta_default/mediaitem_detail.html:136 +#: templates/telemeta_default/mediaitem_detail_video.html:136 msgid "Value" msgstr "" @@ -957,95 +979,117 @@ msgstr "" #: templates/telemeta_default/mediaitem_add.html:5 #: templates/telemeta_default/mediaitem_copy.html:5 -#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:489 +#: templates/telemeta_default/mediaitem_detail.html:5 +#: templates/telemeta_default/mediaitem_detail_video.html:5 web/base.py:489 msgid "Item" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:94 +#: templates/telemeta_default/mediaitem_detail.html:96 +#: templates/telemeta_default/mediaitem_detail_video.html:96 #: templates/telemeta_default/paginator.html:5 msgid "Previous" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:95 +#: templates/telemeta_default/mediaitem_detail.html:97 +#: templates/telemeta_default/mediaitem_detail_video.html:97 #: templates/telemeta_default/paginator.html:23 msgid "Next" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:123 +#: templates/telemeta_default/mediaitem_detail.html:125 +#: templates/telemeta_default/mediaitem_detail_video.html:125 msgid "Analysis" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:125 +#: templates/telemeta_default/mediaitem_detail.html:127 +#: templates/telemeta_default/mediaitem_detail_video.html:127 msgid "Markers" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:133 +#: templates/telemeta_default/mediaitem_detail.html:135 +#: templates/telemeta_default/mediaitem_detail_video.html:135 msgid "Property" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:135 +#: templates/telemeta_default/mediaitem_detail.html:137 +#: templates/telemeta_default/mediaitem_detail_video.html:137 msgid "Unit" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:143 +#: templates/telemeta_default/mediaitem_detail.html:145 +#: templates/telemeta_default/mediaitem_detail_video.html:145 msgid "Download:" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:164 +#: templates/telemeta_default/mediaitem_detail.html:166 +#: templates/telemeta_default/mediaitem_detail_video.html:166 msgid "Recording date" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:176 +#: templates/telemeta_default/mediaitem_detail.html:178 +#: templates/telemeta_default/mediaitem_detail_video.html:178 #: templates/telemeta_default/inc/mediaitem_list.html:18 msgid "Location" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:182 +#: templates/telemeta_default/mediaitem_detail.html:184 +#: templates/telemeta_default/mediaitem_detail_video.html:184 msgid "Ethnographic context" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:195 +#: templates/telemeta_default/mediaitem_detail.html:197 +#: templates/telemeta_default/mediaitem_detail_video.html:197 msgid "Musical informations" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:229 +#: templates/telemeta_default/mediaitem_detail.html:231 +#: templates/telemeta_default/mediaitem_detail_video.html:231 msgid "performance" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:234 +#: templates/telemeta_default/mediaitem_detail.html:236 +#: templates/telemeta_default/mediaitem_detail_video.html:236 msgid "General informations" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:236 +#: templates/telemeta_default/mediaitem_detail.html:238 +#: templates/telemeta_default/mediaitem_detail_video.html:238 msgid "Remarks" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:252 +#: templates/telemeta_default/mediaitem_detail.html:254 +#: templates/telemeta_default/mediaitem_detail_video.html:254 msgid "Published references" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:278 +#: templates/telemeta_default/mediaitem_detail.html:280 +#: templates/telemeta_default/mediaitem_detail_video.html:280 msgid "Related media" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:284 +#: templates/telemeta_default/mediaitem_detail.html:286 +#: templates/telemeta_default/mediaitem_detail_video.html:286 #: templates/telemeta_default/mediaitem_related_edit.html:24 msgid "Media" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:285 +#: templates/telemeta_default/mediaitem_detail.html:287 +#: templates/telemeta_default/mediaitem_detail_video.html:287 msgid "Preview" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:311 +#: templates/telemeta_default/mediaitem_detail.html:313 +#: templates/telemeta_default/mediaitem_detail_video.html:313 msgid "Description" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:314 +#: templates/telemeta_default/mediaitem_detail.html:316 +#: templates/telemeta_default/mediaitem_detail_video.html:316 msgid "URL" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:350 +#: templates/telemeta_default/mediaitem_detail.html:352 +#: templates/telemeta_default/mediaitem_detail_video.html:352 msgid "related media" msgstr "" @@ -1074,7 +1118,7 @@ msgstr "" msgid "User Profile" msgstr "" -#: templates/telemeta_default/profile_detail.html:8 web/base.py:1245 +#: templates/telemeta_default/profile_detail.html:8 web/base.py:1254 msgid "User profile" msgstr "" @@ -1186,7 +1230,7 @@ msgstr "" msgid "No item" msgstr "" -#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1275 +#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1284 msgid "Last changes" msgstr "" @@ -1373,11 +1417,11 @@ msgid_plural "%(count)d collections" msgstr[0] "" msgstr[1] "" -#: web/base.py:350 web/base.py:488 web/base.py:775 web/base.py:1244 +#: web/base.py:350 web/base.py:488 web/base.py:779 web/base.py:1253 msgid "Access not allowed" msgstr "" -#: web/base.py:352 web/base.py:490 web/base.py:777 web/base.py:1246 +#: web/base.py:352 web/base.py:490 web/base.py:781 web/base.py:1255 msgid "" "Please login or contact the website administator to get a private access." msgstr "" diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo index dde1bb3257c3193c0bcb581156ec524ac0ac6250..b7c11dae935cbd4f5b69905755a76d97f6d3c591 100644 GIT binary patch delta 19 acmZ3&yo7l|KZlWpf}y#Uk?F?iyo>-k69r!Y delta 19 acmZ3&yo7l|KZl`#f}x3(k@?2yyo>-jp#@a{ diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po index f892bb15..db5108e2 100644 --- a/telemeta/locale/de/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-11-10 14:27+0100\n" +"POT-Creation-Date: 2011-11-28 17:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index 26cf1e0d18d07b2d73f1fb7ec925cdfb5094f444..c5c2265a6737c0ac8f774437951318afa50727f4 100644 GIT binary patch delta 4680 zcmX}v3zUy#9>DQ;7?&|KX68R8GGUk*mT52}5sRE9m(f|W)3Ml7EM;m-4M*Fd{Z~Yn z)hREFmbJUdQij~xbqO0$D0Z|hy6LiMlR~?t&f4AY*ZWBl$Hv&GAc`7d z7G_{BHpSNHkj2OpQ4eesMaifyh2}I23=fP9-i!`(7dpUnq(gKc`uyxrUx2NsFTn=5 zA>7}LE@%&?;{j}jhcOdRU_a)MKBnLVC6}chEJs&ZiFw!u9cTo)qtVD_qo1JtYQz1R z=tK{q3!R5o;(T<%ZJ34o(Edj;hxwyVD7dl<=ztAdMiIp*3w^K{v$1!mUx&Veap-{e zqYIpmE?^-#;nLtU=(rou=eMEH?Z>1mJw%}w)}uRbMn3J3KzCe-b}U5~T8S>GA39JK zdKN~a{cb~F-86K(d(e53Xht7G7r3|;`FFslX>h=G=posG?)(ti;eB+XFM}7*=P#nq zXEM7J6{3f+7+vty=z@NLPB;R2+tC=b-<_9}|27nUL4zHag$LK8JKv7O@MSE-oYtuf zl%W$|jZV-Xop4BK|50ckkB&1L-OyC@@XoxwR*Cz6zC7@EmR$T5j((TzNYp1CKmiQoUPDYT>EX|%&0bfb=qUOs&!YXlLdR=bME-rSMN#VTwL#8R)C=A5XmkM+ z(9h>~w0=Lj<44i<li%W{v(h1zsRVkzCHe~6B*TrOU}>-m`d~No zm#QZ^;9&G!-iSX;XI7(2Wj3H#kC> zKN>^9i6@~0PD3C3B{sq*u{SP87jOg{<8d^lC((W%q3`q}y70X3rTQ16r@k{f?zN$P zFeXi16$J;ZMprgIJTL`4<#(bJ%tF78Md)YxJUZbaytEK(Lj5Cj0iU5~;XmlB%_l7` zq%C@wdv+%O9;)kTaN-}MpVwqGBQvoCA4LaRj~TcZo#1t>!IQ|Zb2OY!!39r2@6SNT zeK^z?q8nWm+UvTI{|p+o(%{PWpbI#GzT>ml44aju&O`ya@^Z9ae?L%^ z2hat-jc()JUvA5R|DfdM$@%}~mc|mV5tE5igjY?9ODSTf(O-$J@uJ+a@;#Iu zAr288i88|9qlv^zgqMkam8g%;EHc(31G=i_sE1JYiID-wlie~+(Ebjscw z?s?`ujvq+mXM9BIZQ`?dd7{%bYbl)}9wg=xe;{TM(}`DzF~k7kZ$vwynpjW#F}|2+ znf)B4ErjoOW86N!u+gWK4#WfV^V9am)%iU#-lIN+*c3mRUzj{i$!j?==~9XR`M`O^ zi$n%dPV^-X6QhVb39lkz1L0TnI#|(L({{Lj@)^k~p^;&BxY$UdkNe~T9gh)$97}6jq+Kv(ZlXy<0 zBfWOoD#;j1f>72YMT6DUJ1Qb1O%W;)35iN->Jj~Z{ZD!)Kc92%z3272=lnNU#=J8o zbuy7z5pi86zDq2x8AbgwqNqcC??%zk22s==AH$|N6Iay`foHG=evQ@f24-W_ zFp6qHZM4fIGDK8}Sy7aViYe6NMoD;~cW@xu(GzF~qmTyCc=Y{Aq5eEJqCOX^;nMJY zIXagB&KYEXX12niJ{bCbzhAlA<+oK)bg|6scWO2~|wB5+?{AqNc ziReUsfgNxfI^Zg-i<{B*yRkmwM<*yav-4<&SCIdr8~o#o$^0nF!M14qd*~Bk^1ZJWG&I?wc{Vqk{UxmK61yjy+JB998g|7S>+MpVFb;Whih7Hk)wnQh?5$&i9 z-3z_ZcEiw5_axfi7<8Ox(2V{Jo#32C%v;0QX<+2DEf{fp@P z*U^FMFbg+h5}j}nI-yc@z`KyI9X)`y8{U}wH=!_r8#bIDUVH^z`D*Noo3H?Hp%X6n zPI|y1bbwCifZfCWKH>g@Xg`C|1&u&A?_|uy7gFJch3L#)Mpw2GT~SrIzaP!OY4ls4 zLp%CBcpZJeHnVg>2{h#e=)zi{?Yg1u%8;)drTS5Dh9i;1MdQ$n%tkv{jt;yEP2oCx z6t{)@34SzOc|InwRjA*Iw!bgfAD!T!P=5@0KNXFj;5VLxJ#iMAnw@9|N5b>t=&AS= zU4gUI`sm7M}aub#z75_*uN2dbE84T|o12zXVNn4>VJQ(D#O8!t*~aJV>F(WDIYYZ;EY=aOVO3~K|A^Zn%ZG# zMkb&GO-C~^3tQuSw7(6=SBkcwpYR0Q?j+jZm*{&pnvs7uT~_n-@oI*yxD1^@U-Z~K z9O`4y6;DL(&q7nX2yM3^xDy@lZS+)~M)%HtLOrKNx?b2Kl^&=kH{3LRkawaH=!&PK z6IqD2k0(0NM)aFkp#$wlSNb8E$unqXuArH^7M|ZiKVeqO^!-|?P{;`;(2nxaU#KQ% zhaJ&xc{e_k!5<%NPkl*Y`p@!SY(@POG^2H?n4uzcB4y}=zmG1gAG!xp!^4fI!wV^N z0&~y-Uqn;BIJgcosaK&L?m;tj7#;9^wEZRIfJ9%Rn>x`t-QOK(yVjWL`R_=<-Q5-4 z9KG;v?2FEDF1mt>@O&{ku~*T7x1gV37rOGJ==&GZP4-o&-wgH4BC^T-9IWg4FQZ_G z51^ZA2-@K@=uBsz9nC`r_zn7lvIhM`Z-x3XY)AbP+FzqK>Go}ql}4S>1$GPe#(In& zJxIY0A4gxDj9EAZ@5B^3fj6)Q?m|<#7j1VC{if&8iT@XEU#D$)m*=7VwnguEL^D^4 zDLd>%!I||5FAPL?`J?CnqtMea4f)xReuoaY5pPcfYf?XmPT*a1FMN!C+Uw}?t3i6) z%uUce)u|o%ci?hvc)SLnse2Mz;Y75f-(ohdK?m53PvKs4lXc}NIN^cl^WkW}&xZPQ z=t6%T?pI(o^`-5}zcX9S4JS~Ae&Z8Z8~=^&iJR!m8y2S<79m-Vx}XCM4fjW(?@tKz z*}(xI2fSDgP0=f-zWxlh7G2LRYjBoyb;n-~;FaPKW0g zuom^3XuBGn)5kQ4_FIU)-x>Y?&!`859B%v&?f40FxBoQM=cBuP3Hqs)qAPt3?Qk2q zfIa8}4x$r1j!xi0czzWf=LS0Q+Fc0Ge=`cEsy(^~O3)7P!(8kad>l>vICS8N=s>?j zJA4V9=nAyIRal7Y(SeVl$M-DS&n-;3lB|++hxwRGy%5bnH}rTtgmy3<&A?Rj)VzSE zdJ*Q~GIRl((C7Qm{!XKrxQw2zZ;<~Ni5hh!|II0M@0$LzI~4iD7EM7@xfomHO5`tR zbO_yCU!WPtDotjL6?78SL;Wd-kO0d{y3*q$&@ftDB3fC;t=e07PQok_ci+D-> z!t!I(P1lD$;95gmA{G$!h>660q6^_9|3-MUJ|V^ve~vS9li43pI!YXmo8%VeyhG_l zVhV949*~<~ex8z-JLlWWB@H7E5~GQa39qNp+)fcIjou~Ri2s;d+_8$%JmLURL=+Pv zh>^rD!pj8jC62^5b2~S@=q;}Pgq!Op#Fue-UNYm&cyL~E#;JHlUO~oR;w5?c4L{(S z8?Kyqm{?4lj`!siH2Eu~3gRuo%X9SYbve#R+>@~>E>9F>{44%(qD@X^c;u!#7r&H9 zW}l_>58|`<^+cNJWtFfRuDfYCKG#zp~OAJdqgv0FtL`{9OoqSb5>E>Ncg96 zeO!_($oiDhzIaeFnXx+_oh;2hNqsD_Azqp+NL`@hwS*XTyA(x#$2r7yBAe()lo4+e zgNO-)S99V|gvaO*@hY*CxSyCxoFHB&))8LY()|D5-@DIu#Jw66X1&kNe^!oe@Md;p eanl8vwMx1)FX`5^Yxm0CEyvca?ACcl=KlbM=+%M% diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 7014e185..0fdc2116 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: 2011-11-10 14:27+0100\n" +"POT-Creation-Date: 2011-11-28 17:25+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -25,35 +25,35 @@ 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:41 models/enum.py:139 models/media.py:421 +#: models/enum.py:41 models/enum.py:139 models/media.py:459 msgid "value" msgstr "valeur" -#: models/enum.py:57 models/media.py:148 +#: models/enum.py:57 models/media.py:183 msgid "archive format" msgstr "format du support" -#: models/enum.py:64 models/media.py:131 +#: models/enum.py:64 models/media.py:166 msgid "secondary edition" msgstr "réédition" -#: models/enum.py:71 models/media.py:125 +#: models/enum.py:71 models/media.py:160 msgid "mode of acquisition" msgstr "mode d'acquisition" -#: models/enum.py:78 models/media.py:128 +#: models/enum.py:78 models/media.py:163 msgid "record author" msgstr "rédacteur fiche" -#: models/enum.py:85 models/media.py:135 +#: models/enum.py:85 models/media.py:170 msgid "record writer" msgstr "saisie fiche" -#: models/enum.py:92 models/media.py:121 +#: models/enum.py:92 models/media.py:156 msgid "legal rights" msgstr "droit d'utilisation" -#: models/enum.py:99 models/media.py:100 +#: models/enum.py:99 models/media.py:133 msgid "recording context" msgstr "contexte d'enregistrement" @@ -61,20 +61,20 @@ msgstr "contexte d'enregistrement" msgid "A/D conversion" msgstr "" -#: models/enum.py:113 models/media.py:252 +#: models/enum.py:113 models/media.py:289 msgid "vernacular style" msgstr "style vernaculaire" -#: models/enum.py:120 models/media.py:254 +#: models/enum.py:120 models/media.py:291 msgid "generic style" msgstr "style générique" -#: models/enum.py:127 models/media.py:381 +#: models/enum.py:127 models/media.py:419 #, fuzzy msgid "keyword" msgstr "Mot-clé" -#: models/enum.py:134 models/media.py:111 +#: models/enum.py:134 models/media.py:146 msgid "publisher / status" msgstr "éditeur / statut" @@ -82,12 +82,12 @@ msgstr "éditeur / statut" msgid "publisher" msgstr "éditeur" -#: models/enum.py:153 models/enum.py:157 models/media.py:245 +#: models/enum.py:153 models/enum.py:157 models/media.py:282 msgid "population / social group" msgstr "population / groupe social" #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53 -#: models/location.py:51 models/location.py:158 models/media.py:420 +#: models/location.py:51 models/location.py:158 models/media.py:458 msgid "name" msgstr "nom" @@ -136,7 +136,7 @@ msgid "authoritative" msgstr "officiel" #: models/location.py:112 models/location.py:169 models/location.py:184 -#: models/media.py:241 +#: models/media.py:278 msgid "location" msgstr "lieu" @@ -168,292 +168,300 @@ msgstr "Son et métadonnées" msgid "Private data" msgstr "Données privées" -#: models/media.py:65 models/media.py:118 models/media.py:269 +#: models/media.py:65 models/media.py:89 models/media.py:153 +#: models/media.py:306 msgid "public access" msgstr "accès public" -#: models/media.py:95 models/media.py:266 +#: models/media.py:85 models/media.py:128 models/media.py:303 msgid "reference" msgstr "référence" -#: models/media.py:96 models/media.py:232 models/media.py:341 -#: models/media.py:436 models/media.py:451 models/media.py:485 +#: models/media.py:86 models/media.py:129 models/media.py:269 +#: models/media.py:378 models/media.py:477 models/media.py:492 +#: models/media.py:526 msgid "title" msgstr "titre" -#: models/media.py:97 models/media.py:233 +#: models/media.py:87 models/media.py:380 models/media.py:493 +#: models/media.py:528 +msgid "description" +msgstr "" + +#: models/media.py:88 models/media.py:178 models/media.py:300 +msgid "code" +msgstr "cote" + +#: models/media.py:130 models/media.py:270 msgid "original title / translation" msgstr "titre original / traduction" -#: models/media.py:98 +#: models/media.py:131 msgid "depositor / contributor" msgstr "déposant / contributeur" -#: models/media.py:101 +#: models/media.py:134 msgid "recording year (from)" msgstr "année d'enregistrement (depuis)" -#: models/media.py:102 +#: models/media.py:135 msgid "recording year (until)" msgstr "année d'enregistrement (jusqu'à)" -#: models/media.py:103 +#: models/media.py:136 msgid "year published" msgstr "année de parution" -#: models/media.py:109 models/media.py:234 +#: models/media.py:144 models/media.py:271 msgid "recordist" msgstr "collecteur" -#: models/media.py:113 +#: models/media.py:148 msgid "publisher collection" msgstr "collection éditeur" -#: models/media.py:114 +#: models/media.py:149 msgid "publisher serial number" msgstr "numéro dans la série" -#: models/media.py:115 +#: models/media.py:150 msgid "author of published notice" msgstr "auteur de la notice éditée" -#: models/media.py:116 +#: models/media.py:151 msgid "bibliographic references" msgstr "références bibliographiques" -#: models/media.py:117 +#: models/media.py:152 msgid "document type" msgstr "type de document" -#: models/media.py:126 +#: models/media.py:161 msgid "CNRS depositor" msgstr "déposant CNRS" -#: models/media.py:129 +#: models/media.py:164 msgid "related documentation" msgstr "documentation associée" -#: models/media.py:132 +#: models/media.py:167 msgid "copies" msgstr "autres exemplaires" -#: models/media.py:133 +#: models/media.py:168 msgid "comment" msgstr "commentaire" -#: models/media.py:136 +#: models/media.py:171 msgid "archiver notes" msgstr "notes de l'archiviste" -#: models/media.py:137 +#: models/media.py:172 msgid "items finished" msgstr "fiches items faîtes" -#: models/media.py:138 +#: models/media.py:173 msgid "recordist identical to depositor" msgstr "collecteur identique au déposant" -#: models/media.py:139 +#: models/media.py:174 msgid "published" msgstr "édité" -#: models/media.py:140 +#: models/media.py:175 msgid "conservation site" msgstr "lieu de conservation" -#: models/media.py:143 models/media.py:263 -msgid "code" -msgstr "cote" - -#: models/media.py:144 models/media.py:264 +#: models/media.py:179 models/media.py:301 msgid "old code" msgstr "ancienne cote" -#: models/media.py:145 models/media.py:273 +#: models/media.py:180 models/media.py:310 msgid "approximative duration" msgstr "durée approximative" -#: models/media.py:146 +#: models/media.py:181 msgid "number of components (medium / piece)" msgstr "nb de composants (support / pièce)" -#: models/media.py:150 +#: models/media.py:185 msgid "digitization" msgstr "numérisation" -#: models/media.py:151 +#: models/media.py:186 msgid "status" msgstr "etat" -#: models/media.py:152 +#: models/media.py:187 msgid "a_informer_07_03" msgstr "a_informer_07_03" -#: models/media.py:186 +#: models/media.py:221 msgid "states / nations" msgstr "états / nations" -#: models/media.py:200 +#: models/media.py:235 msgid "populations / social groups" msgstr "populations / groupes sociaux" -#: models/media.py:208 models/media.py:317 +#: models/media.py:243 models/media.py:354 msgid "computed duration" msgstr "durée calculée" -#: models/media.py:236 +#: models/media.py:273 msgid "collection" msgstr "collection" -#: models/media.py:237 +#: models/media.py:274 msgid "recording date (from)" msgstr "date d'enregistrement (depuis)" -#: models/media.py:238 +#: models/media.py:275 msgid "recording date (until)" msgstr "date d'enregistrement (jusqu'à)" -#: models/media.py:242 +#: models/media.py:279 msgid "location details" msgstr "précisions lieu" -#: models/media.py:243 +#: models/media.py:280 msgid "cultural area" msgstr "aire culturelle" -#: models/media.py:246 +#: models/media.py:283 msgid "language" msgstr "langue" -#: models/media.py:247 +#: models/media.py:284 msgid "comments / ethnographic context" msgstr "commentaires / contexte ethnographique" -#: models/media.py:248 +#: models/media.py:285 msgid "moda_execut" msgstr "moda_execut" -#: models/media.py:255 +#: models/media.py:292 msgid "author / compositor" msgstr "auteur / compositeur" -#: models/media.py:258 +#: models/media.py:295 msgid "remarks" msgstr "remarques" -#: models/media.py:259 +#: models/media.py:296 msgid "recordist selection" msgstr "sélection collecteur" -#: models/media.py:260 +#: models/media.py:297 msgid "recordist as in collection" msgstr "collecteur identique à la collection" -#: models/media.py:265 +#: models/media.py:302 msgid "item number" msgstr "n° de l'item" -#: models/media.py:267 +#: models/media.py:304 msgid "published references" msgstr "références éditées" -#: models/media.py:268 +#: models/media.py:305 msgid "copy of" msgstr "copie de" -#: models/media.py:270 models/media.py:346 +#: models/media.py:307 models/media.py:384 msgid "file" msgstr "fichier" -#: models/media.py:280 models/media.py:518 -#: templates/telemeta_default/mediaitem_detail.html:190 +#: models/media.py:317 models/media.py:559 +#: templates/telemeta_default/mediaitem_detail.html:192 +#: templates/telemeta_default/mediaitem_detail_video.html:192 msgid "keywords" msgstr "mots-clés" -#: models/media.py:340 models/media.py:380 models/media.py:394 -#: models/media.py:418 models/media.py:435 models/media.py:482 -#: models/media.py:503 +#: models/media.py:377 models/media.py:418 models/media.py:432 +#: models/media.py:456 models/media.py:476 models/media.py:523 +#: models/media.py:544 msgid "item" msgstr "item" -#: models/media.py:342 models/media.py:486 models/media.py:505 -#: models/media.py:519 +#: models/media.py:379 models/media.py:527 models/media.py:546 +#: models/media.py:560 msgid "date" msgstr "" -#: models/media.py:343 models/media.py:452 models/media.py:487 -msgid "description" -msgstr "" - -#: models/media.py:344 models/media.py:504 +#: models/media.py:381 models/media.py:545 #, fuzzy msgid "mime_type" msgstr "type" -#: models/media.py:345 +#: models/media.py:382 msgid "url" msgstr "" -#: models/media.py:396 +#: models/media.py:383 +msgid "credits" +msgstr "crédits" + +#: models/media.py:434 msgid "composition" msgstr "Voix / Instruments" -#: models/media.py:398 +#: models/media.py:436 msgid "vernacular name" msgstr "nom vernaculaire" -#: models/media.py:399 +#: models/media.py:437 msgid "number" msgstr "nombre" -#: models/media.py:400 +#: models/media.py:438 msgid "interprets" msgstr "interprètes" -#: models/media.py:419 +#: models/media.py:457 msgid "id" msgstr "" -#: models/media.py:422 +#: models/media.py:460 msgid "unit" msgstr "unité" -#: models/media.py:437 +#: models/media.py:478 msgid "start" msgstr "début" -#: models/media.py:438 +#: models/media.py:479 msgid "end" msgstr "fin" -#: models/media.py:449 models/media.py:468 models/media.py:483 +#: models/media.py:490 models/media.py:509 models/media.py:524 #, fuzzy msgid "public_id" msgstr "édité" -#: models/media.py:469 +#: models/media.py:510 msgid "playlist" msgstr "liste de lecture" -#: models/media.py:470 +#: models/media.py:511 #, fuzzy msgid "resource_type" msgstr "type de ressource" -#: models/media.py:471 +#: models/media.py:512 #, fuzzy msgid "resource_id" msgstr "ressource" -#: models/media.py:484 models/system.py:54 +#: models/media.py:525 models/system.py:54 msgid "time" msgstr "heure" -#: models/media.py:488 +#: models/media.py:529 msgid "author" msgstr "auteur" -#: models/media.py:506 +#: models/media.py:547 msgid "transcoded" msgstr "" @@ -558,7 +566,8 @@ msgstr "Instruments" #: templates/telemeta_default/admin_enumerations.html:12 #: templates/telemeta_default/home.html:46 #: templates/telemeta_default/mediaitem_copy.html:32 -#: templates/telemeta_default/mediaitem_detail.html:293 +#: templates/telemeta_default/mediaitem_detail.html:295 +#: templates/telemeta_default/mediaitem_detail_video.html:295 #: templates/telemeta_default/mediaitem_edit.html:27 #: templates/telemeta_default/search_criteria.html:78 #: templates/telemeta_default/search_results.html:30 @@ -690,16 +699,21 @@ msgid "Collection" msgstr "Collection" #: templates/telemeta_default/collection_detail.html:42 -#: templates/telemeta_default/mediaitem_detail.html:88 -#: templates/telemeta_default/mediaitem_detail.html:190 -#: templates/telemeta_default/mediaitem_detail.html:229 -#: templates/telemeta_default/mediaitem_detail.html:350 +#: templates/telemeta_default/mediaitem_detail.html:90 +#: templates/telemeta_default/mediaitem_detail.html:192 +#: templates/telemeta_default/mediaitem_detail.html:231 +#: templates/telemeta_default/mediaitem_detail.html:352 +#: templates/telemeta_default/mediaitem_detail_video.html:90 +#: templates/telemeta_default/mediaitem_detail_video.html:192 +#: templates/telemeta_default/mediaitem_detail_video.html:231 +#: templates/telemeta_default/mediaitem_detail_video.html:352 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "Editer" #: templates/telemeta_default/collection_detail.html:43 -#: templates/telemeta_default/mediaitem_detail.html:89 +#: templates/telemeta_default/mediaitem_detail.html:91 +#: templates/telemeta_default/mediaitem_detail_video.html:91 msgid "Copy" msgstr "Copier" @@ -708,7 +722,8 @@ msgid "Add item" msgstr "Ajouter item" #: templates/telemeta_default/collection_detail.html:47 -#: templates/telemeta_default/mediaitem_detail.html:92 +#: templates/telemeta_default/mediaitem_detail.html:94 +#: templates/telemeta_default/mediaitem_detail_video.html:94 msgid "Add to playlist" msgstr "Ajouter à la liste" @@ -723,7 +738,8 @@ msgid "Recording period" msgstr "Période d'enregistrement" #: templates/telemeta_default/collection_detail.html:102 -#: templates/telemeta_default/mediaitem_detail.html:174 +#: templates/telemeta_default/mediaitem_detail.html:176 +#: templates/telemeta_default/mediaitem_detail_video.html:176 msgid "Geographic and cultural informations" msgstr "Indications géographiques et culturelles" @@ -739,7 +755,8 @@ msgid "Bibliographic references" msgstr "Références bibliographiques" #: templates/telemeta_default/collection_detail.html:142 -#: templates/telemeta_default/mediaitem_detail.html:246 +#: templates/telemeta_default/mediaitem_detail.html:248 +#: templates/telemeta_default/mediaitem_detail_video.html:248 msgid "Archiving data" msgstr "Données d'archivage" @@ -752,17 +769,20 @@ msgid "Comments" msgstr "Commentaires" #: templates/telemeta_default/collection_detail.html:166 -#: templates/telemeta_default/mediaitem_detail.html:262 +#: templates/telemeta_default/mediaitem_detail.html:264 +#: templates/telemeta_default/mediaitem_detail_video.html:264 msgid "Technical data" msgstr "Données techniques" #: templates/telemeta_default/collection_detail.html:171 -#: templates/telemeta_default/mediaitem_detail.html:265 +#: templates/telemeta_default/mediaitem_detail.html:267 +#: templates/telemeta_default/mediaitem_detail_video.html:267 msgid "Media type" msgstr "Type de media" #: templates/telemeta_default/collection_detail.html:171 -#: templates/telemeta_default/mediaitem_detail.html:265 +#: templates/telemeta_default/mediaitem_detail.html:267 +#: templates/telemeta_default/mediaitem_detail_video.html:267 msgid "Audio" msgstr "Audio" @@ -773,7 +793,8 @@ msgstr "Nombre d'items" #: templates/telemeta_default/collection_detail.html:199 #: templates/telemeta_default/home.html:35 -#: templates/telemeta_default/mediaitem_detail.html:361 +#: templates/telemeta_default/mediaitem_detail.html:363 +#: templates/telemeta_default/mediaitem_detail_video.html:363 msgid "Delete" msgstr "Supprimer" @@ -835,7 +856,8 @@ msgstr "Ajouter une entrée" #: templates/telemeta_default/enumeration_edit.html:14 #: templates/telemeta_default/enumeration_edit.html:28 #: templates/telemeta_default/enumeration_edit_value.html:14 -#: templates/telemeta_default/mediaitem_detail.html:134 +#: templates/telemeta_default/mediaitem_detail.html:136 +#: templates/telemeta_default/mediaitem_detail_video.html:136 msgid "Value" msgstr "Valeur" @@ -965,96 +987,118 @@ msgstr "Mot de passe oublié" #: templates/telemeta_default/mediaitem_add.html:5 #: templates/telemeta_default/mediaitem_copy.html:5 -#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:489 +#: templates/telemeta_default/mediaitem_detail.html:5 +#: templates/telemeta_default/mediaitem_detail_video.html:5 web/base.py:489 msgid "Item" msgstr "Item" -#: templates/telemeta_default/mediaitem_detail.html:94 +#: templates/telemeta_default/mediaitem_detail.html:96 +#: templates/telemeta_default/mediaitem_detail_video.html:96 #: templates/telemeta_default/paginator.html:5 msgid "Previous" msgstr "Précédent" -#: templates/telemeta_default/mediaitem_detail.html:95 +#: templates/telemeta_default/mediaitem_detail.html:97 +#: templates/telemeta_default/mediaitem_detail_video.html:97 #: templates/telemeta_default/paginator.html:23 msgid "Next" msgstr "Suivant" -#: templates/telemeta_default/mediaitem_detail.html:123 +#: templates/telemeta_default/mediaitem_detail.html:125 +#: templates/telemeta_default/mediaitem_detail_video.html:125 msgid "Analysis" msgstr "Analyse" -#: templates/telemeta_default/mediaitem_detail.html:125 +#: templates/telemeta_default/mediaitem_detail.html:127 +#: templates/telemeta_default/mediaitem_detail_video.html:127 msgid "Markers" msgstr "Marqueurs" -#: templates/telemeta_default/mediaitem_detail.html:133 +#: templates/telemeta_default/mediaitem_detail.html:135 +#: templates/telemeta_default/mediaitem_detail_video.html:135 msgid "Property" msgstr "Propriété" -#: templates/telemeta_default/mediaitem_detail.html:135 +#: templates/telemeta_default/mediaitem_detail.html:137 +#: templates/telemeta_default/mediaitem_detail_video.html:137 msgid "Unit" msgstr "Unité" -#: templates/telemeta_default/mediaitem_detail.html:143 +#: templates/telemeta_default/mediaitem_detail.html:145 +#: templates/telemeta_default/mediaitem_detail_video.html:145 msgid "Download:" msgstr "Téléchargement:" -#: templates/telemeta_default/mediaitem_detail.html:164 +#: templates/telemeta_default/mediaitem_detail.html:166 +#: templates/telemeta_default/mediaitem_detail_video.html:166 msgid "Recording date" msgstr "Date d'enregistrement" -#: templates/telemeta_default/mediaitem_detail.html:176 +#: templates/telemeta_default/mediaitem_detail.html:178 +#: templates/telemeta_default/mediaitem_detail_video.html:178 #: templates/telemeta_default/inc/mediaitem_list.html:18 msgid "Location" msgstr "Lieu" -#: templates/telemeta_default/mediaitem_detail.html:182 +#: templates/telemeta_default/mediaitem_detail.html:184 +#: templates/telemeta_default/mediaitem_detail_video.html:184 msgid "Ethnographic context" msgstr "Contexte ethnographique" -#: templates/telemeta_default/mediaitem_detail.html:195 +#: templates/telemeta_default/mediaitem_detail.html:197 +#: templates/telemeta_default/mediaitem_detail_video.html:197 msgid "Musical informations" msgstr "Informations sur la musique" -#: templates/telemeta_default/mediaitem_detail.html:229 +#: templates/telemeta_default/mediaitem_detail.html:231 +#: templates/telemeta_default/mediaitem_detail_video.html:231 msgid "performance" msgstr "composition" -#: templates/telemeta_default/mediaitem_detail.html:234 +#: templates/telemeta_default/mediaitem_detail.html:236 +#: templates/telemeta_default/mediaitem_detail_video.html:236 msgid "General informations" msgstr "Informations générales" -#: templates/telemeta_default/mediaitem_detail.html:236 +#: templates/telemeta_default/mediaitem_detail.html:238 +#: templates/telemeta_default/mediaitem_detail_video.html:238 msgid "Remarks" msgstr "Remarques" -#: templates/telemeta_default/mediaitem_detail.html:252 +#: templates/telemeta_default/mediaitem_detail.html:254 +#: templates/telemeta_default/mediaitem_detail_video.html:254 msgid "Published references" msgstr "Références éditées" -#: templates/telemeta_default/mediaitem_detail.html:278 +#: templates/telemeta_default/mediaitem_detail.html:280 +#: templates/telemeta_default/mediaitem_detail_video.html:280 msgid "Related media" msgstr "Média associés" -#: templates/telemeta_default/mediaitem_detail.html:284 +#: templates/telemeta_default/mediaitem_detail.html:286 +#: templates/telemeta_default/mediaitem_detail_video.html:286 #: templates/telemeta_default/mediaitem_related_edit.html:24 msgid "Media" msgstr "Média" -#: templates/telemeta_default/mediaitem_detail.html:285 +#: templates/telemeta_default/mediaitem_detail.html:287 +#: templates/telemeta_default/mediaitem_detail_video.html:287 msgid "Preview" msgstr "Prévisualisation" -#: templates/telemeta_default/mediaitem_detail.html:311 +#: templates/telemeta_default/mediaitem_detail.html:313 +#: templates/telemeta_default/mediaitem_detail_video.html:313 #, fuzzy msgid "Description" msgstr "Durée" -#: templates/telemeta_default/mediaitem_detail.html:314 +#: templates/telemeta_default/mediaitem_detail.html:316 +#: templates/telemeta_default/mediaitem_detail_video.html:316 msgid "URL" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:350 +#: templates/telemeta_default/mediaitem_detail.html:352 +#: templates/telemeta_default/mediaitem_detail_video.html:352 msgid "related media" msgstr "média associés" @@ -1083,7 +1127,7 @@ msgstr "Formation" msgid "User Profile" msgstr "Profil utilisateur" -#: templates/telemeta_default/profile_detail.html:8 web/base.py:1245 +#: templates/telemeta_default/profile_detail.html:8 web/base.py:1254 msgid "User profile" msgstr "Profil utilisateur" @@ -1195,7 +1239,7 @@ msgstr "Etat/Continent" msgid "No item" msgstr "Aucun item" -#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1275 +#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1284 msgid "Last changes" msgstr "Dernières modifications" @@ -1388,11 +1432,11 @@ msgid_plural "%(count)d collections" msgstr[0] "%(count)d collection" msgstr[1] "%(count)d collections" -#: web/base.py:350 web/base.py:488 web/base.py:775 web/base.py:1244 +#: web/base.py:350 web/base.py:488 web/base.py:779 web/base.py:1253 msgid "Access not allowed" msgstr "Accès non autorisé" -#: web/base.py:352 web/base.py:490 web/base.py:777 web/base.py:1246 +#: web/base.py:352 web/base.py:490 web/base.py:781 web/base.py:1255 msgid "" "Please login or contact the website administator to get a private access." msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo index a14c622236219997db06bf11ac3a924230531637..bc34d68c016342d99241799b05bc803bc2160558 100644 GIT binary patch delta 21 dcmdnRy^DLp2PO_93k5@SD\n" "Language-Team: LANGUAGE \n" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index dbe1d74e..466889a7 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -75,6 +75,39 @@ class MediaResource(ModelCore): abstract = True +class MediaCorpus(MediaResource): + "Describe a corpus of collections" + + element_type = 'corpus' + PUBLIC_ACCESS_CHOICES = (('none', 'none'), ('metadata', 'metadata'), ('full', 'full')) + + # General informations + reference = CharField(_('reference'), unique=True, null=True) + title = CharField(_('title'), required=True) + description = CharField(_('description')) + code = CharField(_('code'), unique=True, required=True) + public_access = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, + max_length=16, default="metadata") + + def __unicode__(self): + return self.code + + @property + def public_id(self): + return self.code + + def save(self, force_insert=False, force_update=False, user=None, code=None): + super(MediaCorpus, self).save(force_insert, force_update) + + class Meta(MetaCore): + db_table = 'media_corpus' + ordering = ['code'] + +class MediaCorpusForm(ModelForm): + class Meta: + model = MediaCorpus + + collection_published_code_regex = '[A-Za-z0-9._-]*' collection_unpublished_code_regex = '[A-Za-z0-9._-]*' collection_code_regex = '(?:%s|%s)' % (collection_published_code_regex, @@ -101,6 +134,8 @@ class MediaCollection(MediaResource): recorded_from_year = IntegerField(_('recording year (from)')) recorded_to_year = IntegerField(_('recording year (until)')) year_published = IntegerField(_('year published')) +# corpus = ForeignKey('MediaCorpus', related_name="collections", +# verbose_name=_('corpus')) # Geographic and cultural informations ## See "countries" and "ethnic_groups" methods below @@ -345,6 +380,7 @@ class MediaItemRelated(MediaResource): description = TextField(_('description')) mime_type = CharField(_('mime_type')) url = CharField(_('url'), max_length=500) + credits = CharField(_('credits')) file = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") def is_image(self): diff --git a/telemeta/templates/telemeta_default/collection_edit.html b/telemeta/templates/telemeta_default/collection_edit.html index d60db043..6cd84fad 100644 --- a/telemeta/templates/telemeta_default/collection_edit.html +++ b/telemeta/templates/telemeta_default/collection_edit.html @@ -15,12 +15,14 @@ {% for field in form %} - {% if not field.html_name == "copied_from_item" and not field.html_name == "doctype_code" %} - + + {% if field.html_name == "copied_from_item" or field.html_name == "doctype_code" %} + + {% else %} - {% endif %} + {% endfor %}
{% for error in form.non_field_errors %}
  • {{ error }}
  • {% endfor %}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    {{ field.errors }}
    {{ field.label_tag }}: {{ field }}
    diff --git a/telemeta/templates/telemeta_default/mediaitem_edit.html b/telemeta/templates/telemeta_default/mediaitem_edit.html index 06c99789..5767f769 100644 --- a/telemeta/templates/telemeta_default/mediaitem_edit.html +++ b/telemeta/templates/telemeta_default/mediaitem_edit.html @@ -16,13 +16,12 @@ {% for field in form %} - {% if not field.html_name == "copied_from_item" %} + {% if field.html_name == "copied_from_item" %} + + {% else %} - {% if field.html_name == "file" %} - - {% else %} {% if field.html_name == "collection" %} {% endif %} - {% endif %} - - {% else %} - {% endif %} + {% endfor %}
    {% for error in form.non_field_errors %}
  • {{ error }}
  • {% endfor %}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    {{ field.errors }}
    {{ field.label_tag }}: {{ item.file.name }}
    {{ field }}
     {% trans "Title" %} : {{ item.collection.title }}
     {% trans "Code" %} : {{ item.collection.code }}
    @@ -30,11 +29,8 @@ {% else %}
    {{ field }}
    {{ field.label_tag.as_hidden }}{{ field.as_hidden }}
    diff --git a/telemeta/templates/telemeta_default/mediaitem_related_edit.html b/telemeta/templates/telemeta_default/mediaitem_related_edit.html index d65ea1b9..506d279e 100644 --- a/telemeta/templates/telemeta_default/mediaitem_related_edit.html +++ b/telemeta/templates/telemeta_default/mediaitem_related_edit.html @@ -25,15 +25,11 @@ {% for field in form %} {{ field.errors }} - {% if not "media_item" in field.html_name %} - {% if "id" in field.html_name or "item" in field.html_name %} + {% if "media_item" in field.html_name or "id" in field.html_name or "item" in field.html_name or "mime_type" in field.html_name %} {{ field.label_tag.as_hidden }}{{ field.as_hidden }} {% else %} {{ field.label_tag }}: {{ field }} {% endif %} - {% else %} - {{ field.label_tag.as_hidden }}{{ field.as_hidden }} - {% endif %} {% endfor %} -- 2.39.5