Changeset 7c73024


Ignore:
Timestamp:
Jul 9, 2012 1:42:59 PM (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, crem3, dev, dev2, diadems, dj1.6, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, sabiod, search, server, storage, telecaster
Children:
2bfd2c1
Parents:
44c06ce (diff), f59decb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
yomguy <yomguy@…> (09/07/2012 13:42:59)
git-committer:
yomguy <yomguy@…> (09/07/2012 13:42:59)
Message:

Merge branch 'dev'

Files:
4 added
19 edited

Legend:

Unmodified
Added
Removed
  • telemeta/locale/de/LC_MESSAGES/django.po

    r8d83c067 r8c70403  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-07-09 01:17+0200\n" 
     11"POT-Creation-Date: 2012-07-09 01:20+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    2727msgstr "" 
    2828 
    29 #: models/enum.py:41 models/enum.py:139 models/media.py:489 
     29#: models/enum.py:41 models/enum.py:139 models/media.py:490 
    3030#: models/system.py:103 
    3131msgid "value" 
    3232msgstr "" 
    3333 
    34 #: models/enum.py:57 models/media.py:223 
     34#: models/enum.py:57 models/media.py:224 
    3535msgid "archive format" 
    3636msgstr "" 
     
    6464msgstr "" 
    6565 
    66 #: models/enum.py:113 models/media.py:339 
     66#: models/enum.py:113 models/media.py:340 
    6767msgid "vernacular style" 
    6868msgstr "" 
    6969 
    70 #: models/enum.py:120 models/media.py:341 
     70#: models/enum.py:120 models/media.py:342 
    7171msgid "generic style" 
    7272msgstr "" 
    7373 
    74 #: models/enum.py:127 models/media.py:460 
     74#: models/enum.py:127 models/media.py:461 
    7575msgid "keyword" 
    7676msgstr "" 
     
    8484msgstr "" 
    8585 
    86 #: models/enum.py:153 models/enum.py:157 models/media.py:329 
     86#: models/enum.py:153 models/enum.py:157 models/media.py:330 
    8787msgid "population / social group" 
    8888msgstr "" 
     
    9090#: models/enum.py:158 models/instrument.py:43 models/instrument.py:53 
    9191#: models/language.py:54 models/location.py:51 models/location.py:158 
    92 #: models/media.py:488 
     92#: models/media.py:489 
    9393msgid "name" 
    9494msgstr "" 
     
    118118msgstr "" 
    119119 
    120 #: models/enum.py:214 models/media.py:346 
     120#: models/enum.py:214 models/media.py:347 
    121121msgid "organization" 
    122122msgstr "" 
    123123 
    124 #: models/enum.py:221 models/media.py:350 
     124#: models/enum.py:221 models/media.py:351 
    125125msgid "rights" 
    126126msgstr "" 
    127127 
    128 #: models/enum.py:228 models/media.py:320 
    129 msgid "subject" 
    130 msgstr "" 
    131  
    132 #: models/format.py:58 models/media.py:390 models/media.py:449 
    133 #: models/media.py:459 models/media.py:470 models/media.py:486 
    134 #: models/media.py:507 models/media.py:553 models/media.py:574 
     128#: models/enum.py:228 models/media.py:321 
     129msgid "topic" 
     130msgstr "" 
     131 
     132#: models/format.py:58 models/media.py:391 models/media.py:450 
     133#: models/media.py:460 models/media.py:471 models/media.py:487 
     134#: models/media.py:508 models/media.py:554 models/media.py:575 
    135135msgid "item" 
    136136msgstr "" 
     
    140140msgstr "" 
    141141 
    142 #: models/format.py:62 models/media.py:354 
     142#: models/format.py:62 models/media.py:355 
    143143msgid "original code" 
    144144msgstr "" 
     
    261261 
    262262#: models/location.py:112 models/location.py:170 models/location.py:185 
    263 #: models/media.py:325 
     263#: models/media.py:326 
    264264msgid "location" 
    265265msgstr "" 
     
    270270 
    271271#: models/location.py:166 
    272 msgid "lieux types" 
     272msgid "location types" 
    273273msgstr "" 
    274274 
     
    298298 
    299299#: models/media.py:77 models/media.py:97 models/media.py:193 
    300 #: models/media.py:347 
     300#: models/media.py:348 
    301301msgid "public access" 
    302302msgstr "" 
    303303 
    304304#: models/media.py:93 models/media.py:123 models/media.py:171 
    305 #: models/media.py:312 models/media.py:508 models/media.py:524 
    306 #: models/media.py:556 
     305#: models/media.py:313 models/media.py:509 models/media.py:525 
     306#: models/media.py:557 
    307307msgid "title" 
    308308msgstr "" 
    309309 
    310 #: models/media.py:94 models/media.py:125 models/media.py:525 
    311 #: models/media.py:558 
     310#: models/media.py:94 models/media.py:125 models/media.py:526 
     311#: models/media.py:559 
    312312msgid "description" 
    313313msgstr "" 
    314314 
    315 #: models/media.py:95 models/media.py:218 models/media.py:353 
     315#: models/media.py:95 models/media.py:218 models/media.py:354 
    316316msgid "code" 
    317317msgstr "" 
     
    321321msgstr "" 
    322322 
    323 #: models/media.py:124 models/media.py:557 models/media.py:576 
     323#: models/media.py:124 models/media.py:558 models/media.py:577 
    324324#: models/system.py:115 
    325325msgid "date" 
    326326msgstr "" 
    327327 
    328 #: models/media.py:126 models/media.py:575 
     328#: models/media.py:126 models/media.py:576 
    329329msgid "mime_type" 
    330330msgstr "" 
     
    338338msgstr "" 
    339339 
    340 #: models/media.py:129 models/media.py:368 
     340#: models/media.py:129 models/media.py:369 
    341341msgid "file" 
    342342msgstr "" 
    343343 
    344 #: models/media.py:172 models/media.py:313 
     344#: models/media.py:172 models/media.py:314 
    345345msgid "original title / translation" 
    346346msgstr "" 
     
    350350msgstr "" 
    351351 
    352 #: models/media.py:176 models/media.py:658 
     352#: models/media.py:176 models/media.py:659 
    353353msgid "recording year (from)" 
    354354msgstr "" 
    355355 
    356 #: models/media.py:177 models/media.py:659 
     356#: models/media.py:177 models/media.py:660 
    357357msgid "recording year (until)" 
    358358msgstr "" 
     
    362362msgstr "" 
    363363 
    364 #: models/media.py:184 models/media.py:356 
     364#: models/media.py:184 models/media.py:357 
    365365msgid "recordist" 
    366366msgstr "" 
     
    418418msgstr "" 
    419419 
    420 #: models/media.py:219 
     420#: models/media.py:220 
    421421msgid "old code" 
    422422msgstr "" 
    423423 
    424 #: models/media.py:220 models/media.py:371 
     424#: models/media.py:221 models/media.py:372 
    425425msgid "approximative duration" 
    426426msgstr "" 
    427427 
    428 #: models/media.py:221 
     428#: models/media.py:222 
    429429msgid "number of components (medium / piece)" 
    430430msgstr "" 
    431431 
    432 #: models/media.py:225 
     432#: models/media.py:226 
    433433msgid "digitization" 
    434434msgstr "" 
    435435 
    436 #: models/media.py:226 
     436#: models/media.py:227 
    437437msgid "status" 
    438438msgstr "" 
    439439 
    440 #: models/media.py:227 
     440#: models/media.py:228 
    441441msgid "a_informer_07_03" 
    442442msgstr "" 
    443443 
    444 #: models/media.py:262 
     444#: models/media.py:263 
    445445msgid "states / nations" 
    446446msgstr "" 
    447447 
    448 #: models/media.py:276 
     448#: models/media.py:277 
    449449msgid "populations / social groups" 
    450450msgstr "" 
    451451 
    452 #: models/media.py:284 models/media.py:416 
     452#: models/media.py:285 models/media.py:417 
    453453msgid "computed duration" 
    454454msgstr "" 
    455455 
    456 #: models/media.py:292 models/media.py:298 models/media.py:315 
     456#: models/media.py:293 models/media.py:299 models/media.py:316 
    457457msgid "collection" 
    458458msgstr "" 
    459459 
    460 #: models/media.py:302 models/media.py:303 
     460#: models/media.py:303 models/media.py:304 
    461461msgid "collection related media" 
    462462msgstr "" 
    463463 
    464 #: models/media.py:316 
     464#: models/media.py:317 
    465465msgid "recording date (from)" 
    466466msgstr "" 
    467467 
    468 #: models/media.py:317 
     468#: models/media.py:318 
    469469msgid "recording date (until)" 
    470470msgstr "" 
    471471 
    472 #: models/media.py:319 
     472#: models/media.py:320 
    473473msgid "scientist" 
    474474msgstr "" 
    475475 
    476 #: models/media.py:321 
     476#: models/media.py:322 
    477477msgid "summary" 
    478478msgstr "" 
    479479 
    480 #: models/media.py:322 
     480#: models/media.py:323 
    481481msgid "remarks" 
    482482msgstr "" 
    483483 
    484 #: models/media.py:326 
     484#: models/media.py:327 
    485485msgid "location details" 
    486486msgstr "" 
    487487 
    488 #: models/media.py:327 
     488#: models/media.py:328 
    489489msgid "cultural area" 
    490490msgstr "" 
    491491 
    492 #: models/media.py:330 
     492#: models/media.py:331 
    493493msgid "language" 
    494494msgstr "" 
    495495 
    496 #: models/media.py:332 
     496#: models/media.py:333 
    497497msgid "ISO language" 
    498498msgstr "" 
    499499 
    500 #: models/media.py:334 
     500#: models/media.py:335 
    501501msgid "comments / ethnographic context" 
    502502msgstr "" 
    503503 
    504 #: models/media.py:335 
     504#: models/media.py:336 
    505505msgid "moda_execut" 
    506506msgstr "" 
    507507 
    508 #: models/media.py:342 
     508#: models/media.py:343 
    509509msgid "author / compositor" 
    510510msgstr "" 
    511511 
    512 #: models/media.py:343 
     512#: models/media.py:344 
    513513msgid "contributor" 
    514514msgstr "" 
    515515 
    516 #: models/media.py:349 
     516#: models/media.py:350 
    517517msgid "depositor" 
    518518msgstr "" 
    519519 
    520 #: models/media.py:355 
     520#: models/media.py:356 
    521521msgid "item number" 
    522522msgstr "" 
    523523 
    524 #: models/media.py:357 
     524#: models/media.py:358 
    525525msgid "digitalist" 
    526526msgstr "" 
    527527 
    528 #: models/media.py:358 
     528#: models/media.py:359 
    529529msgid "collector" 
    530530msgstr "" 
    531531 
    532 #: models/media.py:359 
     532#: models/media.py:360 
    533533msgid "collector selection" 
    534534msgstr "" 
    535535 
    536 #: models/media.py:360 
     536#: models/media.py:361 
    537537msgid "collector as in collection" 
    538538msgstr "" 
    539539 
    540 #: models/media.py:361 
     540#: models/media.py:362 
    541541msgid "digitization date" 
    542542msgstr "" 
    543543 
    544 #: models/media.py:362 
     544#: models/media.py:363 
    545545msgid "publishing date" 
    546546msgstr "" 
    547547 
    548 #: models/media.py:363 
     548#: models/media.py:364 
    549549msgid "creator reference" 
    550550msgstr "" 
    551551 
    552 #: models/media.py:364 
     552#: models/media.py:365 
    553553msgid "published references" 
    554554msgstr "" 
    555555 
    556 #: models/media.py:365 
     556#: models/media.py:366 
    557557msgid "copy of" 
    558558msgstr "" 
    559559 
    560 #: models/media.py:378 templates/telemeta/mediaitem_edit.html:41 
     560#: models/media.py:379 templates/telemeta/mediaitem_edit.html:41 
    561561msgid "keywords" 
    562562msgstr "" 
    563563 
    564 #: models/media.py:443 
     564#: models/media.py:444 
    565565msgid "instruments" 
    566566msgstr "" 
    567567 
    568 #: models/media.py:453 models/media.py:454 
     568#: models/media.py:454 models/media.py:455 
    569569msgid "item related media" 
    570570msgstr "" 
    571571 
    572 #: models/media.py:472 
     572#: models/media.py:473 
    573573msgid "composition" 
    574574msgstr "" 
    575575 
    576 #: models/media.py:474 
     576#: models/media.py:475 
    577577msgid "vernacular name" 
    578578msgstr "" 
    579579 
    580 #: models/media.py:475 
     580#: models/media.py:476 
    581581msgid "number" 
    582582msgstr "" 
    583583 
    584 #: models/media.py:476 
     584#: models/media.py:477 
    585585msgid "interprets" 
    586586msgstr "" 
    587587 
    588 #: models/media.py:487 
     588#: models/media.py:488 
    589589msgid "id" 
    590590msgstr "" 
    591591 
    592 #: models/media.py:490 
     592#: models/media.py:491 
    593593msgid "unit" 
    594594msgstr "" 
    595595 
    596 #: models/media.py:509 
     596#: models/media.py:510 
    597597msgid "start" 
    598598msgstr "" 
    599599 
    600 #: models/media.py:510 
     600#: models/media.py:511 
    601601msgid "end" 
    602602msgstr "" 
    603603 
    604 #: models/media.py:514 
     604#: models/media.py:515 
    605605msgid "item part" 
    606606msgstr "" 
    607607 
    608 #: models/media.py:522 models/media.py:539 models/media.py:554 
     608#: models/media.py:523 models/media.py:540 models/media.py:555 
    609609msgid "public_id" 
    610610msgstr "" 
    611611 
    612 #: models/media.py:540 
     612#: models/media.py:541 
    613613msgid "playlist" 
    614614msgstr "" 
    615615 
    616 #: models/media.py:541 
     616#: models/media.py:542 
    617617msgid "resource_type" 
    618618msgstr "" 
    619619 
    620 #: models/media.py:542 
     620#: models/media.py:543 
    621621msgid "resource_id" 
    622622msgstr "" 
    623623 
    624 #: models/media.py:555 models/system.py:55 
     624#: models/media.py:556 models/system.py:55 
    625625msgid "time" 
    626626msgstr "" 
    627627 
    628 #: models/media.py:559 
     628#: models/media.py:560 
    629629msgid "author" 
    630630msgstr "" 
    631631 
    632 #: models/media.py:577 
     632#: models/media.py:578 
    633633msgid "transcoded" 
    634634msgstr "" 
    635635 
    636 #: models/media.py:657 
     636#: models/media.py:658 
    637637msgid "collections" 
    638638msgstr "" 
    639639 
    640 #: models/media.py:669 models/media.py:670 models/media.py:680 
    641 #: models/media.py:697 
     640#: models/media.py:670 models/media.py:671 models/media.py:681 
     641#: models/media.py:698 
    642642msgid "corpus" 
    643643msgstr "" 
    644644 
    645 #: models/media.py:690 models/media.py:691 models/media.py:708 
     645#: models/media.py:691 models/media.py:692 models/media.py:709 
    646646msgid "fonds" 
    647647msgstr "" 
    648648 
    649 #: models/media.py:701 models/media.py:702 
     649#: models/media.py:702 models/media.py:703 
    650650msgid "corpus related media" 
    651651msgstr "" 
    652652 
    653 #: models/media.py:712 models/media.py:713 
     653#: models/media.py:713 models/media.py:714 
    654654msgid "fonds related media" 
    655655msgstr "" 
     
    679679msgstr "" 
    680680 
    681 #: models/system.py:87 
    682 msgid "attachment" 
     681#: models/system.py:87 templates/telemeta/profile_detail.html:46 
     682msgid "Attachment" 
    683683msgstr "" 
    684684 
     
    803803#: templates/telemeta/collection_detail.html:217 
    804804#: templates/telemeta/lists.html:58 
    805 #: templates/telemeta/mediaitem_detail.html:346 
     805#: templates/telemeta/mediaitem_detail.html:349 
    806806#: templates/telemeta/resource_detail.html:102 
    807807msgid "Delete" 
     
    11341134#: templates/telemeta/collection_detail.html:44 
    11351135#: templates/telemeta/collection_edit.html:31 templates/telemeta/lists.html:55 
    1136 #: templates/telemeta/mediaitem_detail.html:97 
     1136#: templates/telemeta/mediaitem_detail.html:100 
    11371137#: templates/telemeta/mediaitem_edit.html:41 
    11381138#: templates/telemeta/mediaitem_edit.html:44 
     
    11451145 
    11461146#: templates/telemeta/collection_detail.html:45 
    1147 #: templates/telemeta/mediaitem_detail.html:98 
     1147#: templates/telemeta/mediaitem_detail.html:101 
    11481148#: templates/telemeta/resource_detail.html:44 
    11491149msgid "Copy" 
     
    11551155 
    11561156#: templates/telemeta/collection_detail.html:49 
    1157 #: templates/telemeta/mediaitem_detail.html:101 
     1157#: templates/telemeta/mediaitem_detail.html:104 
    11581158#: templates/telemeta/resource_detail.html:47 
    11591159msgid "Add to playlist" 
     
    11711171 
    11721172#: templates/telemeta/collection_detail.html:103 
    1173 #: templates/telemeta/mediaitem_detail.html:204 
     1173#: templates/telemeta/mediaitem_detail.html:207 
    11741174#: templates/telemeta/resource_detail.html:73 
    11751175msgid "Last modification" 
     
    11771177 
    11781178#: templates/telemeta/collection_detail.html:112 
    1179 #: templates/telemeta/mediaitem_detail.html:214 
     1179#: templates/telemeta/mediaitem_detail.html:217 
    11801180msgid "Geographic and cultural informations" 
    11811181msgstr "" 
     
    11931193 
    11941194#: templates/telemeta/collection_detail.html:152 
    1195 #: templates/telemeta/mediaitem_detail.html:284 
     1195#: templates/telemeta/mediaitem_detail.html:287 
    11961196msgid "Archiving data" 
    11971197msgstr "" 
     
    12021202 
    12031203#: templates/telemeta/collection_detail.html:162 
    1204 #: templates/telemeta/mediaitem_detail.html:315 
     1204#: templates/telemeta/mediaitem_detail.html:318 
    12051205msgid "Comments" 
    12061206msgstr "" 
    12071207 
    12081208#: templates/telemeta/collection_detail.html:176 
    1209 #: templates/telemeta/mediaitem_detail.html:300 
     1209#: templates/telemeta/mediaitem_detail.html:303 
    12101210msgid "Technical data" 
    12111211msgstr "" 
    12121212 
    12131213#: templates/telemeta/collection_detail.html:181 
    1214 #: templates/telemeta/mediaitem_detail.html:303 
     1214#: templates/telemeta/mediaitem_detail.html:306 
    12151215msgid "Media type" 
    12161216msgstr "" 
     
    13051305#: templates/telemeta/enumeration_edit.html:31 
    13061306#: templates/telemeta/enumeration_edit_value.html:11 
    1307 #: templates/telemeta/mediaitem_detail.html:166 
     1307#: templates/telemeta/mediaitem_detail.html:169 
    13081308msgid "Value" 
    13091309msgstr "" 
     
    14351435msgstr "" 
    14361436 
    1437 #: templates/telemeta/mediaitem_detail.html:103 
     1437#: templates/telemeta/mediaitem_detail.html:106 
    14381438#: templates/telemeta/paginator.html:5 
    14391439msgid "Previous" 
    14401440msgstr "" 
    14411441 
    1442 #: templates/telemeta/mediaitem_detail.html:104 
     1442#: templates/telemeta/mediaitem_detail.html:107 
    14431443#: templates/telemeta/paginator.html:23 
    14441444msgid "Next" 
    14451445msgstr "" 
    14461446 
    1447 #: templates/telemeta/mediaitem_detail.html:155 
     1447#: templates/telemeta/mediaitem_detail.html:158 
    14481448msgid "Analysis" 
    14491449msgstr "" 
    14501450 
    1451 #: templates/telemeta/mediaitem_detail.html:157 
     1451#: templates/telemeta/mediaitem_detail.html:160 
    14521452msgid "Markers" 
    14531453msgstr "" 
    14541454 
    1455 #: templates/telemeta/mediaitem_detail.html:165 
     1455#: templates/telemeta/mediaitem_detail.html:168 
    14561456msgid "Property" 
    14571457msgstr "" 
    14581458 
    1459 #: templates/telemeta/mediaitem_detail.html:167 
     1459#: templates/telemeta/mediaitem_detail.html:170 
    14601460msgid "Unit" 
    14611461msgstr "" 
    14621462 
    1463 #: templates/telemeta/mediaitem_detail.html:175 
     1463#: templates/telemeta/mediaitem_detail.html:178 
    14641464msgid "Download:" 
    14651465msgstr "" 
    14661466 
    1467 #: templates/telemeta/mediaitem_detail.html:196 
     1467#: templates/telemeta/mediaitem_detail.html:199 
    14681468msgid "Recording date" 
    14691469msgstr "" 
    14701470 
    1471 #: templates/telemeta/mediaitem_detail.html:200 
     1471#: templates/telemeta/mediaitem_detail.html:203 
    14721472msgid "Remarks" 
    14731473msgstr "" 
    14741474 
    1475 #: templates/telemeta/mediaitem_detail.html:216 
     1475#: templates/telemeta/mediaitem_detail.html:219 
    14761476#: templates/telemeta/inc/mediaitem_list.html:18 
    14771477msgid "Location" 
    14781478msgstr "" 
    14791479 
    1480 #: templates/telemeta/mediaitem_detail.html:222 
     1480#: templates/telemeta/mediaitem_detail.html:225 
    14811481msgid "Language ISO" 
    14821482msgstr "" 
    14831483 
    1484 #: templates/telemeta/mediaitem_detail.html:226 
     1484#: templates/telemeta/mediaitem_detail.html:229 
    14851485msgid "Ethnographic context" 
    14861486msgstr "" 
    14871487 
    1488 #: templates/telemeta/mediaitem_detail.html:237 
     1488#: templates/telemeta/mediaitem_detail.html:240 
    14891489msgid "Musical informations" 
    14901490msgstr "" 
    14911491 
    1492 #: templates/telemeta/mediaitem_detail.html:274 
     1492#: templates/telemeta/mediaitem_detail.html:277 
    14931493msgid "General informations" 
    14941494msgstr "" 
    14951495 
    1496 #: templates/telemeta/mediaitem_detail.html:290 
     1496#: templates/telemeta/mediaitem_detail.html:293 
    14971497msgid "Published references" 
    14981498msgstr "" 
     
    15431543#: templates/telemeta/profile_detail.html:41 
    15441544msgid "Email" 
    1545 msgstr "" 
    1546  
    1547 #: templates/telemeta/profile_detail.html:46 
    1548 msgid "Attachment" 
    15491545msgstr "" 
    15501546 
  • telemeta/locale/de/LC_MESSAGES/djangojs.po

    r8d83c067 r8c70403  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-07-09 01:17+0200\n" 
     11"POT-Creation-Date: 2012-07-09 01:20+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
  • telemeta/locale/fr/LC_MESSAGES/django.po

    r8d83c067 r8c70403  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-07-09 01:17+0200\n" 
     11"POT-Creation-Date: 2012-07-09 01:20+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Olivier Guilyardi <olivier samalyse com>\n" 
     
    2626msgstr "Entrez une durée valide au format HH:MM[:ss]" 
    2727 
    28 #: models/enum.py:41 models/enum.py:139 models/media.py:489 
     28#: models/enum.py:41 models/enum.py:139 models/media.py:490 
    2929#: models/system.py:103 
    3030msgid "value" 
    3131msgstr "valeur" 
    3232 
    33 #: models/enum.py:57 models/media.py:223 
     33#: models/enum.py:57 models/media.py:224 
    3434msgid "archive format" 
    3535msgstr "format du support" 
     
    6363msgstr "Conversion A/N" 
    6464 
    65 #: models/enum.py:113 models/media.py:339 
     65#: models/enum.py:113 models/media.py:340 
    6666msgid "vernacular style" 
    6767msgstr "style vernaculaire" 
    6868 
    69 #: models/enum.py:120 models/media.py:341 
     69#: models/enum.py:120 models/media.py:342 
    7070msgid "generic style" 
    7171msgstr "style générique" 
    7272 
    73 #: models/enum.py:127 models/media.py:460 
     73#: models/enum.py:127 models/media.py:461 
    7474msgid "keyword" 
    7575msgstr "Mot-clé" 
     
    8383msgstr "éditeur" 
    8484 
    85 #: models/enum.py:153 models/enum.py:157 models/media.py:329 
     85#: models/enum.py:153 models/enum.py:157 models/media.py:330 
    8686msgid "population / social group" 
    8787msgstr "population / groupe social" 
     
    8989#: models/enum.py:158 models/instrument.py:43 models/instrument.py:53 
    9090#: models/language.py:54 models/location.py:51 models/location.py:158 
    91 #: models/media.py:488 
     91#: models/media.py:489 
    9292msgid "name" 
    9393msgstr "nom" 
     
    117117msgstr "Nombre de pistes" 
    118118 
    119 #: models/enum.py:214 models/media.py:346 
     119#: models/enum.py:214 models/media.py:347 
    120120msgid "organization" 
    121121msgstr "organisation" 
    122122 
    123 #: models/enum.py:221 models/media.py:350 
     123#: models/enum.py:221 models/media.py:351 
    124124msgid "rights" 
    125125msgstr "droits" 
    126126 
    127 #: models/enum.py:228 models/media.py:320 
    128 msgid "subject" 
     127#: models/enum.py:228 models/media.py:321 
     128msgid "topic" 
    129129msgstr "discipline" 
    130130 
    131 #: models/format.py:58 models/media.py:390 models/media.py:449 
    132 #: models/media.py:459 models/media.py:470 models/media.py:486 
    133 #: models/media.py:507 models/media.py:553 models/media.py:574 
     131#: models/format.py:58 models/media.py:391 models/media.py:450 
     132#: models/media.py:460 models/media.py:471 models/media.py:487 
     133#: models/media.py:508 models/media.py:554 models/media.py:575 
    134134msgid "item" 
    135135msgstr "item" 
     
    139139msgstr "nature du support original" 
    140140 
    141 #: models/format.py:62 models/media.py:354 
     141#: models/format.py:62 models/media.py:355 
    142142msgid "original code" 
    143143msgstr "cote originale" 
     
    260260 
    261261#: models/location.py:112 models/location.py:170 models/location.py:185 
    262 #: models/media.py:325 
     262#: models/media.py:326 
    263263msgid "location" 
    264264msgstr "lieu" 
     
    269269 
    270270#: models/location.py:166 
    271 #, fuzzy 
    272 msgid "lieux types" 
    273 msgstr "lieux types" 
     271msgid "location types" 
     272msgstr "types de lieux" 
    274273 
    275274#: models/location.py:180 
     
    298297 
    299298#: models/media.py:77 models/media.py:97 models/media.py:193 
    300 #: models/media.py:347 
     299#: models/media.py:348 
    301300msgid "public access" 
    302301msgstr "accès public" 
    303302 
    304303#: models/media.py:93 models/media.py:123 models/media.py:171 
    305 #: models/media.py:312 models/media.py:508 models/media.py:524 
    306 #: models/media.py:556 
     304#: models/media.py:313 models/media.py:509 models/media.py:525 
     305#: models/media.py:557 
    307306msgid "title" 
    308307msgstr "titre" 
    309308 
    310 #: models/media.py:94 models/media.py:125 models/media.py:525 
    311 #: models/media.py:558 
     309#: models/media.py:94 models/media.py:125 models/media.py:526 
     310#: models/media.py:559 
    312311msgid "description" 
    313312msgstr "description" 
    314313 
    315 #: models/media.py:95 models/media.py:218 models/media.py:353 
     314#: models/media.py:95 models/media.py:218 models/media.py:354 
    316315msgid "code" 
    317316msgstr "cote" 
     
    321320msgstr "référence" 
    322321 
    323 #: models/media.py:124 models/media.py:557 models/media.py:576 
     322#: models/media.py:124 models/media.py:558 models/media.py:577 
    324323#: models/system.py:115 
    325324msgid "date" 
    326325msgstr "" 
    327326 
    328 #: models/media.py:126 models/media.py:575 
     327#: models/media.py:126 models/media.py:576 
    329328msgid "mime_type" 
    330329msgstr "type mime" 
     
    338337msgstr "crédits" 
    339338 
    340 #: models/media.py:129 models/media.py:368 
     339#: models/media.py:129 models/media.py:369 
    341340msgid "file" 
    342341msgstr "fichier" 
    343342 
    344 #: models/media.py:172 models/media.py:313 
     343#: models/media.py:172 models/media.py:314 
    345344msgid "original title / translation" 
    346345msgstr "titre original / traduction" 
     
    350349msgstr "déposant / contributeur" 
    351350 
    352 #: models/media.py:176 models/media.py:658 
     351#: models/media.py:176 models/media.py:659 
    353352msgid "recording year (from)" 
    354353msgstr "année d'enregistrement (depuis)" 
    355354 
    356 #: models/media.py:177 models/media.py:659 
     355#: models/media.py:177 models/media.py:660 
    357356msgid "recording year (until)" 
    358357msgstr "année d'enregistrement (jusqu'à)" 
     
    362361msgstr "année de parution" 
    363362 
    364 #: models/media.py:184 models/media.py:356 
     363#: models/media.py:184 models/media.py:357 
    365364msgid "recordist" 
    366365msgstr "opérateur d'enregistrement" 
     
    418417msgstr "lieu de conservation" 
    419418 
    420 #: models/media.py:219 
     419#: models/media.py:220 
    421420msgid "old code" 
    422421msgstr "ancienne cote" 
    423422 
    424 #: models/media.py:220 models/media.py:371 
     423#: models/media.py:221 models/media.py:372 
    425424msgid "approximative duration" 
    426425msgstr "durée approximative" 
    427426 
    428 #: models/media.py:221 
     427#: models/media.py:222 
    429428msgid "number of components (medium / piece)" 
    430429msgstr "nb de composants (support / pièce)" 
    431430 
    432 #: models/media.py:225 
     431#: models/media.py:226 
    433432msgid "digitization" 
    434433msgstr "numérisation" 
    435434 
    436 #: models/media.py:226 
     435#: models/media.py:227 
    437436msgid "status" 
    438437msgstr "etat" 
    439438 
    440 #: models/media.py:227 
     439#: models/media.py:228 
    441440msgid "a_informer_07_03" 
    442441msgstr "a_informer_07_03" 
    443442 
    444 #: models/media.py:262 
     443#: models/media.py:263 
    445444msgid "states / nations" 
    446445msgstr "états / nations" 
    447446 
    448 #: models/media.py:276 
     447#: models/media.py:277 
    449448msgid "populations / social groups" 
    450449msgstr "populations / groupes sociaux" 
    451450 
    452 #: models/media.py:284 models/media.py:416 
     451#: models/media.py:285 models/media.py:417 
    453452msgid "computed duration" 
    454453msgstr "durée calculée" 
    455454 
    456 #: models/media.py:292 models/media.py:298 models/media.py:315 
     455#: models/media.py:293 models/media.py:299 models/media.py:316 
    457456msgid "collection" 
    458457msgstr "collection" 
    459458 
    460 #: models/media.py:302 models/media.py:303 
     459#: models/media.py:303 models/media.py:304 
    461460msgid "collection related media" 
    462461msgstr "média associés à la collection" 
    463462 
    464 #: models/media.py:316 
     463#: models/media.py:317 
    465464msgid "recording date (from)" 
    466465msgstr "date d'enregistrement (depuis)" 
    467466 
    468 #: models/media.py:317 
     467#: models/media.py:318 
    469468msgid "recording date (until)" 
    470469msgstr "date d'enregistrement (jusqu'à)" 
    471470 
    472 #: models/media.py:319 
     471#: models/media.py:320 
    473472msgid "scientist" 
    474473msgstr "reponsable scientifique" 
    475474 
    476 #: models/media.py:321 
     475#: models/media.py:322 
    477476msgid "summary" 
    478477msgstr "résumé" 
    479478 
    480 #: models/media.py:322 
     479#: models/media.py:323 
    481480msgid "remarks" 
    482481msgstr "remarques" 
    483482 
    484 #: models/media.py:326 
     483#: models/media.py:327 
    485484msgid "location details" 
    486485msgstr "précisions lieu" 
    487486 
    488 #: models/media.py:327 
     487#: models/media.py:328 
    489488msgid "cultural area" 
    490489msgstr "aire culturelle" 
    491490 
    492 #: models/media.py:330 
     491#: models/media.py:331 
    493492msgid "language" 
    494493msgstr "langue" 
    495494 
    496 #: models/media.py:332 
     495#: models/media.py:333 
    497496msgid "ISO language" 
    498497msgstr "Langue ISO" 
    499498 
    500 #: models/media.py:334 
     499#: models/media.py:335 
    501500msgid "comments / ethnographic context" 
    502501msgstr "commentaires / contexte ethnographique" 
    503502 
    504 #: models/media.py:335 
     503#: models/media.py:336 
    505504msgid "moda_execut" 
    506505msgstr "moda_execut" 
    507506 
    508 #: models/media.py:342 
     507#: models/media.py:343 
    509508msgid "author / compositor" 
    510509msgstr "auteur / compositeur" 
    511510 
    512 #: models/media.py:343 
     511#: models/media.py:344 
    513512msgid "contributor" 
    514513msgstr "intervenant" 
    515514 
    516 #: models/media.py:349 
     515#: models/media.py:350 
    517516msgid "depositor" 
    518517msgstr "déposant" 
    519518 
    520 #: models/media.py:355 
     519#: models/media.py:356 
    521520msgid "item number" 
    522521msgstr "n° de l'item" 
    523522 
    524 #: models/media.py:357 
     523#: models/media.py:358 
    525524msgid "digitalist" 
    526525msgstr "opérateur de numérisation" 
    527526 
    528 #: models/media.py:358 
     527#: models/media.py:359 
    529528msgid "collector" 
    530529msgstr "collecteur" 
    531530 
    532 #: models/media.py:359 
     531#: models/media.py:360 
    533532msgid "collector selection" 
    534533msgstr "sélection collecteur" 
    535534 
    536 #: models/media.py:360 
     535#: models/media.py:361 
    537536msgid "collector as in collection" 
    538537msgstr "collecteur identique à la collection" 
    539538 
    540 #: models/media.py:361 
     539#: models/media.py:362 
    541540msgid "digitization date" 
    542541msgstr "date de numérisation" 
    543542 
    544 #: models/media.py:362 
     543#: models/media.py:363 
    545544msgid "publishing date" 
    546545msgstr "date de création du support édité" 
    547546 
    548 #: models/media.py:363 
     547#: models/media.py:364 
    549548msgid "creator reference" 
    550549msgstr "référence du créateur" 
    551550 
    552 #: models/media.py:364 
     551#: models/media.py:365 
    553552msgid "published references" 
    554553msgstr "références éditées" 
    555554 
    556 #: models/media.py:365 
     555#: models/media.py:366 
    557556msgid "copy of" 
    558557msgstr "copie de" 
    559558 
    560 #: models/media.py:378 templates/telemeta/mediaitem_edit.html:41 
     559#: models/media.py:379 templates/telemeta/mediaitem_edit.html:41 
    561560msgid "keywords" 
    562561msgstr "mots-clés" 
    563562 
    564 #: models/media.py:443 
     563#: models/media.py:444 
    565564msgid "instruments" 
    566565msgstr "instruments" 
    567566 
    568 #: models/media.py:453 models/media.py:454 
     567#: models/media.py:454 models/media.py:455 
    569568msgid "item related media" 
    570569msgstr "média associés à l'item" 
    571570 
    572 #: models/media.py:472 
     571#: models/media.py:473 
    573572msgid "composition" 
    574573msgstr "Voix / Instruments" 
    575574 
    576 #: models/media.py:474 
     575#: models/media.py:475 
    577576msgid "vernacular name" 
    578577msgstr "nom vernaculaire" 
    579578 
    580 #: models/media.py:475 
     579#: models/media.py:476 
    581580msgid "number" 
    582581msgstr "nombre" 
    583582 
    584 #: models/media.py:476 
     583#: models/media.py:477 
    585584msgid "interprets" 
    586585msgstr "interprètes" 
    587586 
    588 #: models/media.py:487 
     587#: models/media.py:488 
    589588msgid "id" 
    590589msgstr "" 
    591590 
    592 #: models/media.py:490 
     591#: models/media.py:491 
    593592msgid "unit" 
    594593msgstr "unité" 
    595594 
    596 #: models/media.py:509 
     595#: models/media.py:510 
    597596msgid "start" 
    598597msgstr "début" 
    599598 
    600 #: models/media.py:510 
     599#: models/media.py:511 
    601600msgid "end" 
    602601msgstr "fin" 
    603602 
    604 #: models/media.py:514 
     603#: models/media.py:515 
    605604msgid "item part" 
    606605msgstr "partie" 
    607606 
    608 #: models/media.py:522 models/media.py:539 models/media.py:554 
     607#: models/media.py:523 models/media.py:540 models/media.py:555 
    609608msgid "public_id" 
    610609msgstr "public_id" 
    611610 
    612 #: models/media.py:540 
     611#: models/media.py:541 
    613612msgid "playlist" 
    614613msgstr "liste de lecture" 
    615614 
    616 #: models/media.py:541 
     615#: models/media.py:542 
    617616msgid "resource_type" 
    618617msgstr "type de ressource" 
    619618 
    620 #: models/media.py:542 
     619#: models/media.py:543 
    621620msgid "resource_id" 
    622621msgstr "ressource" 
    623622 
    624 #: models/media.py:555 models/system.py:55 
     623#: models/media.py:556 models/system.py:55 
    625624msgid "time" 
    626625msgstr "heure" 
    627626 
    628 #: models/media.py:559 
     627#: models/media.py:560 
    629628msgid "author" 
    630629msgstr "auteur" 
    631630 
    632 #: models/media.py:577 
     631#: models/media.py:578 
    633632msgid "transcoded" 
    634633msgstr "" 
    635634 
    636 #: models/media.py:657 
     635#: models/media.py:658 
    637636msgid "collections" 
    638637msgstr "collections" 
    639638 
    640 #: models/media.py:669 models/media.py:670 models/media.py:680 
    641 #: models/media.py:697 
     639#: models/media.py:670 models/media.py:671 models/media.py:681 
     640#: models/media.py:698 
    642641msgid "corpus" 
    643642msgstr "corpus" 
    644643 
    645 #: models/media.py:690 models/media.py:691 models/media.py:708 
     644#: models/media.py:691 models/media.py:692 models/media.py:709 
    646645msgid "fonds" 
    647646msgstr "fonds" 
    648647 
    649 #: models/media.py:701 models/media.py:702 
     648#: models/media.py:702 models/media.py:703 
    650649msgid "corpus related media" 
    651650msgstr "média associés" 
    652651 
    653 #: models/media.py:712 models/media.py:713 
     652#: models/media.py:713 models/media.py:714 
    654653msgid "fonds related media" 
    655654msgstr "média associés" 
     
    679678msgstr "Département" 
    680679 
    681 #: models/system.py:87 
    682 msgid "attachment" 
    683 msgstr "rattachement" 
     680#: models/system.py:87 templates/telemeta/profile_detail.html:46 
     681msgid "Attachment" 
     682msgstr "Rattachement" 
    684683 
    685684#: models/system.py:88 templates/telemeta/profile_detail.html:45 
     
    804803#: templates/telemeta/collection_detail.html:217 
    805804#: templates/telemeta/lists.html:58 
    806 #: templates/telemeta/mediaitem_detail.html:346 
     805#: templates/telemeta/mediaitem_detail.html:349 
    807806#: templates/telemeta/resource_detail.html:102 
    808807msgid "Delete" 
     
    11391138#: templates/telemeta/collection_detail.html:44 
    11401139#: templates/telemeta/collection_edit.html:31 templates/telemeta/lists.html:55 
    1141 #: templates/telemeta/mediaitem_detail.html:97 
     1140#: templates/telemeta/mediaitem_detail.html:100 
    11421141#: templates/telemeta/mediaitem_edit.html:41 
    11431142#: templates/telemeta/mediaitem_edit.html:44 
     
    11501149 
    11511150#: templates/telemeta/collection_detail.html:45 
    1152 #: templates/telemeta/mediaitem_detail.html:98 
     1151#: templates/telemeta/mediaitem_detail.html:101 
    11531152#: templates/telemeta/resource_detail.html:44 
    11541153msgid "Copy" 
     
    11601159 
    11611160#: templates/telemeta/collection_detail.html:49 
    1162 #: templates/telemeta/mediaitem_detail.html:101 
     1161#: templates/telemeta/mediaitem_detail.html:104 
    11631162#: templates/telemeta/resource_detail.html:47 
    11641163msgid "Add to playlist" 
     
    11761175 
    11771176#: templates/telemeta/collection_detail.html:103 
    1178 #: templates/telemeta/mediaitem_detail.html:204 
     1177#: templates/telemeta/mediaitem_detail.html:207 
    11791178#: templates/telemeta/resource_detail.html:73 
    11801179msgid "Last modification" 
     
    11821181 
    11831182#: templates/telemeta/collection_detail.html:112 
    1184 #: templates/telemeta/mediaitem_detail.html:214 
     1183#: templates/telemeta/mediaitem_detail.html:217 
    11851184msgid "Geographic and cultural informations" 
    11861185msgstr "Indications géographiques et culturelles" 
     
    11981197 
    11991198#: templates/telemeta/collection_detail.html:152 
    1200 #: templates/telemeta/mediaitem_detail.html:284 
     1199#: templates/telemeta/mediaitem_detail.html:287 
    12011200msgid "Archiving data" 
    12021201msgstr "Données d'archivage" 
     
    12071206 
    12081207#: templates/telemeta/collection_detail.html:162 
    1209 #: templates/telemeta/mediaitem_detail.html:315 
     1208#: templates/telemeta/mediaitem_detail.html:318 
    12101209msgid "Comments" 
    12111210msgstr "Commentaires" 
    12121211 
    12131212#: templates/telemeta/collection_detail.html:176 
    1214 #: templates/telemeta/mediaitem_detail.html:300 
     1213#: templates/telemeta/mediaitem_detail.html:303 
    12151214msgid "Technical data" 
    12161215msgstr "Données techniques" 
    12171216 
    12181217#: templates/telemeta/collection_detail.html:181 
    1219 #: templates/telemeta/mediaitem_detail.html:303 
     1218#: templates/telemeta/mediaitem_detail.html:306 
    12201219msgid "Media type" 
    12211220msgstr "Type de media" 
     
    13101309#: templates/telemeta/enumeration_edit.html:31 
    13111310#: templates/telemeta/enumeration_edit_value.html:11 
    1312 #: templates/telemeta/mediaitem_detail.html:166 
     1311#: templates/telemeta/mediaitem_detail.html:169 
    13131312msgid "Value" 
    13141313msgstr "Valeur" 
     
    14411440msgstr "Item" 
    14421441 
    1443 #: templates/telemeta/mediaitem_detail.html:103 
     1442#: templates/telemeta/mediaitem_detail.html:106 
    14441443#: templates/telemeta/paginator.html:5 
    14451444msgid "Previous" 
    14461445msgstr "Précédent" 
    14471446 
    1448 #: templates/telemeta/mediaitem_detail.html:104 
     1447#: templates/telemeta/mediaitem_detail.html:107 
    14491448#: templates/telemeta/paginator.html:23 
    14501449msgid "Next" 
    14511450msgstr "Suivant" 
    14521451 
    1453 #: templates/telemeta/mediaitem_detail.html:155 
     1452#: templates/telemeta/mediaitem_detail.html:158 
    14541453msgid "Analysis" 
    14551454msgstr "Analyse" 
    14561455 
    1457 #: templates/telemeta/mediaitem_detail.html:157 
     1456#: templates/telemeta/mediaitem_detail.html:160 
    14581457msgid "Markers" 
    14591458msgstr "Marqueurs" 
    14601459 
    1461 #: templates/telemeta/mediaitem_detail.html:165 
     1460#: templates/telemeta/mediaitem_detail.html:168 
    14621461msgid "Property" 
    14631462msgstr "Propriété" 
    14641463 
    1465 #: templates/telemeta/mediaitem_detail.html:167 
     1464#: templates/telemeta/mediaitem_detail.html:170 
    14661465msgid "Unit" 
    14671466msgstr "Unité" 
    14681467 
    1469 #: templates/telemeta/mediaitem_detail.html:175 
     1468#: templates/telemeta/mediaitem_detail.html:178 
    14701469msgid "Download:" 
    14711470msgstr "Téléchargement:" 
    14721471 
    1473 #: templates/telemeta/mediaitem_detail.html:196 
     1472#: templates/telemeta/mediaitem_detail.html:199 
    14741473msgid "Recording date" 
    14751474msgstr "Date d'enregistrement" 
    14761475 
    1477 #: templates/telemeta/mediaitem_detail.html:200 
     1476#: templates/telemeta/mediaitem_detail.html:203 
    14781477msgid "Remarks" 
    14791478msgstr "Remarques" 
    14801479 
    1481 #: templates/telemeta/mediaitem_detail.html:216 
     1480#: templates/telemeta/mediaitem_detail.html:219 
    14821481#: templates/telemeta/inc/mediaitem_list.html:18 
    14831482msgid "Location" 
    14841483msgstr "Lieu" 
    14851484 
    1486 #: templates/telemeta/mediaitem_detail.html:222 
     1485#: templates/telemeta/mediaitem_detail.html:225 
    14871486msgid "Language ISO" 
    14881487msgstr "Langue ISO" 
    14891488 
    1490 #: templates/telemeta/mediaitem_detail.html:226 
     1489#: templates/telemeta/mediaitem_detail.html:229 
    14911490msgid "Ethnographic context" 
    14921491msgstr "Contexte ethnographique" 
    14931492 
    1494 #: templates/telemeta/mediaitem_detail.html:237 
     1493#: templates/telemeta/mediaitem_detail.html:240 
    14951494msgid "Musical informations" 
    14961495msgstr "Informations sur la musique" 
    14971496 
    1498 #: templates/telemeta/mediaitem_detail.html:274 
     1497#: templates/telemeta/mediaitem_detail.html:277 
    14991498msgid "General informations" 
    15001499msgstr "Informations générales" 
    15011500 
    1502 #: templates/telemeta/mediaitem_detail.html:290 
     1501#: templates/telemeta/mediaitem_detail.html:293 
    15031502msgid "Published references" 
    15041503msgstr "Références éditées" 
     
    15501549msgid "Email" 
    15511550msgstr "Courriel" 
    1552  
    1553 #: templates/telemeta/profile_detail.html:46 
    1554 msgid "Attachment" 
    1555 msgstr "Rattachement" 
    15561551 
    15571552#: templates/telemeta/profile_detail.html:49 
     
    19321927msgstr "Dernières modifications" 
    19331928 
     1929#~ msgid "attachment" 
     1930#~ msgstr "rattachement" 
     1931 
     1932#, fuzzy 
     1933#~ msgid "lieux types" 
     1934#~ msgstr "lieux types" 
     1935 
     1936#~ msgid "subject" 
     1937#~ msgstr "discipline" 
     1938 
    19341939#~ msgid "domain" 
    19351940#~ msgstr "discipline" 
  • telemeta/locale/fr/LC_MESSAGES/djangojs.po

    r8d83c067 r8c70403  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-07-09 01:17+0200\n" 
     11"POT-Creation-Date: 2012-07-09 01:20+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n" 
  • telemeta/models/dublincore.py

    r5c42a44 rf6bc1e0  
    6666        result = [] 
    6767        for element in self.elements: 
    68             result.append((element.name, unicode(element.value))) 
     68            if isinstance(element.value, str): 
     69                value = element.value.decode('utf8') 
     70            else: 
     71                value = element.value 
     72            result.append((element.name, unicode(value))) 
    6973        return result 
    7074 
  • telemeta/models/enum.py

    r64bc9e8 r521a3e9  
    221221        verbose_name = _("rights") 
    222222 
    223 class Subject(Enumeration): 
    224     "Scientific subject" 
    225  
    226     class Meta(MetaEnumeration): 
    227         db_table = 'subject' 
    228         verbose_name = _("subject") 
     223class Topic(Enumeration): 
     224    "Topic, subject of the study, research, etc.." 
     225 
     226    class Meta(MetaEnumeration): 
     227        db_table = 'topic' 
     228        verbose_name = _("topic") 
  • telemeta/models/location.py

    r305d2e3 r188eaaa  
    164164        db_table = 'location_types' 
    165165        ordering = ['name'] 
    166         verbose_name_plural = _('lieux types') 
     166        verbose_name_plural = _('location types') 
    167167 
    168168class LocationAlias(ModelCore): 
  • telemeta/models/media.py

    r64bc9e8 rf6bc1e0  
    216216 
    217217    # Technical data 
    218     code                  = CharField(_('code'), unique=True, required=True, validators=[is_valid_collection_code]) 
     218    code                  = CharField(_('code'), unique=True, required=True, 
     219                                      validators=[is_valid_collection_code]) 
    219220    old_code              = CharField(_('old code'), unique=False, null=True, blank=True) 
    220221    approx_duration       = DurationField(_('approximative duration')) 
     
    318319 
    319320    scientist             = CharField(_('scientist')) 
    320     subject               = WeakForeignKey('Subject', verbose_name=_('subject')) 
     321    topic                 = WeakForeignKey('Topic', verbose_name=_('topic')) 
    321322    summary               = TextField(_('summary')) 
    322323    comment               = TextField(_('remarks')) 
     
    382383        if self.code: 
    383384            return self.code 
    384         return self.id 
     385        return str(self.id) 
    385386 
    386387    class Meta(MetaCore): 
  • telemeta/models/system.py

    rfad4d14 rf6bc1e0  
    8585    institution     = CharField(_('Institution')) 
    8686    department      = CharField(_('Department')) 
    87     attachment      = CharField(_('attachment')) 
     87    attachment      = CharField(_('Attachment')) 
    8888    function        = CharField(_('Function')) 
    8989    address         = TextField(_('Address')) 
  • telemeta/static/telemeta/css/telemeta.css

    rf0c855e rf6bc1e0  
    727727    text-decoration: none; 
    728728    margin: 0; 
    729     background: #fff url(more.png) no-repeat left top; 
     729    background: #fff url(/static/telemeta/images/more.png) no-repeat left top; 
    730730    background-position: 0 -16px; 
    731731    padding-bottom: 2px; 
  • telemeta/templates/telemeta/mediaitem_detail.html

    ra7f10c1 rf6bc1e0  
    4343 
    4444        //initializing the visualizers to be passed to the player 
     45        {% block graphers %} 
    4546        var visualizers = {}; 
    4647        {% for v in visualizers %} 
    4748            visualizers["{{v.name}}"] = "{% url telemeta-item-visualize item.public_id,v.id,"WIDTH","HEIGHT" %}"; 
    4849        {% endfor %} 
     50        {% endblock graphers %} 
     51 
    4952        {% if user.is_superuser %} 
    5053             loadPlayer('{% url telemeta-item-analyze-xml item.public_id %}', 
  • telemeta/templatetags/telemeta_utils.py

    r0073410 rf59decb  
    1717from django.conf import settings 
    1818from django.template.defaultfilters import stringfilter 
     19from django.template import NodeList 
    1920 
    2021register = template.Library() 
     
    398399        return 'Audio' 
    399400 
    400 @register.filter 
    401 def installed(app): 
    402     return app in settings.INSTALLED_APPS 
     401 
     402def do_ifloaded(parser, token): 
     403    bits = token.split_contents()[1:] 
     404    var = bits[0] 
     405    nodelist_true = parser.parse(('else', 'endifloaded')) 
     406    token = parser.next_token() 
     407    if token.contents == 'else': 
     408        nodelist_false = parser.parse(('endifloaded',)) 
     409        parser.delete_first_token() 
     410    else: 
     411        nodelist_false = NodeList() 
     412    return IfLoadedNode(var, nodelist_true, nodelist_false) 
     413register.tag('ifloaded', do_ifloaded) 
     414 
     415 
     416class IfLoadedNode(template.Node): 
     417    def __init__(self, var, nodelist_true, nodelist_false=None): 
     418        self.nodelist_true, self.nodelist_false = nodelist_true, nodelist_false 
     419        self.var = var 
     420 
     421    def __repr__(self): 
     422        return '<IfLoaded node>' 
     423 
     424    def __iter__(self): 
     425        for node in self.nodelist_true: 
     426            yield node 
     427        for node in self.nodelist_false: 
     428            yield node 
     429 
     430    def get_nodes_by_type(self, nodetype): 
     431        nodes = [] 
     432        if isinstance(self, nodetype): 
     433            nodes.append(self) 
     434        nodes.extend(self.nodelist_true.get_nodes_by_type(nodetype)) 
     435        nodes.extend(self.nodelist_false.get_nodes_by_type(nodetype)) 
     436        return nodes 
     437 
     438    def render(self, context): 
     439        for app in settings.INSTALLED_APPS: 
     440            if str(app) == str(self.var): 
     441                return self.nodelist_true.render(context) 
     442        return self.nodelist_false.render(context) 
  • telemeta/urls.py

    rc676291 rf6bc1e0  
    115115    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/simple/$', item_view.item_detail, 
    116116        dict(template='telemeta/mediaitem_player_simple.html'), name="telemeta-item-player-simple"), 
     117    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/countour/$', item_view.item_detail, 
     118        dict(template='telemeta/mediaitem_player_contour.html'), name="telemeta-item-player-contour"), 
    117119    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/performances/$', item_view.item_performances_edit, 
    118120        dict(template='telemeta/mediaitem_performances_edit.html'), name="telemeta-item-performances_edit"), 
  • tools/dev/push.sh

    rd7de29b rf6bc1e0  
    2222#echo "Update jimi.parisson.com:" 
    2323echo "Update angus.parisson.com:" 
    24 ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \ 
    25                         cd /home/telemeta/telemeta-develop; git pull; \ 
    26                         cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations; 
    27                         cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;  
    28                         cd /home/telemeta/parisson/; ./manage.py migrate telemeta --delete-ghost-migrations; " 
     24ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \ 
     25                        cd /home/telemeta/telemeta-develop; git pull origin dev; \ 
     26                        cd /home/telemeta/demo/; ./manage.py migrate --delete-ghost-migrations; 
     27                        cd /home/telemeta/sandbox/; ./manage.py migrate --delete-ghost-migrations;  
     28                        cd /home/telemeta/parisson/; ./manage.py migrate --delete-ghost-migrations; " 
    2929 
    3030echo "Done !" 
Note: See TracChangeset for help on using the changeset viewer.