Changeset 305d2e3


Ignore:
Timestamp:
25/05/2012 16:36:58 (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, generic, lam, lam2, mapsv3, merge, nlivemulti, release/1.4.4, sabiod, server, storage, telecaster
Children:
24b54bd
Parents:
d7de29b
git-author:
yomguy <yomguy@…> (25/05/2012 16:36:58)
git-committer:
yomguy <yomguy@…> (25/05/2012 16:36:58)
Message:

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

Location:
telemeta
Files:
1 added
14 edited

Legend:

Unmodified
Added
Removed
  • telemeta/admin.py

    rbfa68c2 r305d2e3  
    100100 
    101101admin.site.register(Location, LocationAdmin) 
    102 #admin.site.register(LocationType) 
     102admin.site.register(LocationType) 
    103103admin.site.register(LocationAlias, LocationAliasAdmin) 
    104104admin.site.register(LocationRelation, LocationRelationAdmin) 
  • telemeta/locale/de/LC_MESSAGES/django.po

    r3901268 r305d2e3  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-24 15:16+0200\n" 
     11"POT-Creation-Date: 2012-05-25 16:34+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:475 
     29#: models/enum.py:41 models/enum.py:139 models/media.py:489 
    3030#: models/system.py:103 
    3131msgid "value" 
     
    6464msgstr "" 
    6565 
    66 #: models/enum.py:113 models/media.py:335 
     66#: models/enum.py:113 models/media.py:339 
    6767msgid "vernacular style" 
    6868msgstr "" 
    6969 
    70 #: models/enum.py:120 models/media.py:337 
     70#: models/enum.py:120 models/media.py:341 
    7171msgid "generic style" 
    7272msgstr "" 
    7373 
    74 #: models/enum.py:127 models/media.py:446 
     74#: models/enum.py:127 models/media.py:460 
    7575msgid "keyword" 
    7676msgstr "" 
     
    8484msgstr "" 
    8585 
    86 #: models/enum.py:153 models/enum.py:157 models/media.py:325 
     86#: models/enum.py:153 models/enum.py:157 models/media.py:329 
    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:474 
     92#: models/media.py:488 
    9393msgid "name" 
    9494msgstr "" 
    9595 
    96 #: models/enum.py:172 models/format.py:74 
     96#: models/enum.py:172 models/format.py:75 
    9797msgid "tape wheel diameter (cm)" 
    9898msgstr "" 
     
    106106msgstr "" 
    107107 
    108 #: models/enum.py:193 models/format.py:77 
     108#: models/enum.py:193 models/format.py:78 
    109109msgid "tape speed (m/s)" 
    110110msgstr "" 
    111111 
    112 #: models/enum.py:200 models/format.py:79 
     112#: models/enum.py:200 models/format.py:80 
    113113msgid "tape vendor" 
    114114msgstr "" 
    115115 
    116 #: models/enum.py:207 models/format.py:68 
     116#: models/enum.py:207 models/format.py:69 
    117117msgid "number of channels" 
    118118msgstr "" 
    119119 
    120 #: models/enum.py:214 models/format.py:66 
    121 msgid "original location" 
    122 msgstr "" 
    123  
    124 #: models/format.py:56 models/media.py:376 models/media.py:435 
    125 #: models/media.py:445 models/media.py:456 models/media.py:472 
    126 #: models/media.py:493 models/media.py:539 models/media.py:560 
     120#: models/enum.py:214 models/media.py:346 
     121msgid "organization" 
     122msgstr "" 
     123 
     124#: models/enum.py:221 models/media.py:350 
     125msgid "rights" 
     126msgstr "" 
     127 
     128#: models/format.py:56 models/media.py:390 models/media.py:449 
     129#: models/media.py:459 models/media.py:470 models/media.py:486 
     130#: models/media.py:507 models/media.py:553 models/media.py:574 
    127131msgid "item" 
    128132msgstr "" 
     
    132136msgstr "" 
    133137 
    134 #: models/format.py:60 
     138#: models/format.py:60 models/media.py:354 
    135139msgid "original code" 
    136140msgstr "" 
     
    152156msgstr "" 
    153157 
    154 #: models/format.py:69 
     158#: models/format.py:66 
     159msgid "original location" 
     160msgstr "" 
     161 
     162#: models/format.py:70 
    155163msgid "audio quality" 
    156164msgstr "" 
    157165 
    158 #: models/format.py:70 
     166#: models/format.py:71 
    159167msgid "recording system" 
    160168msgstr "" 
    161169 
    162 #: models/format.py:75 
     170#: models/format.py:76 
    163171msgid "tape thickness (um)" 
    164172msgstr "" 
    165173 
    166 #: models/format.py:80 
     174#: models/format.py:81 
    167175msgid "tape reference" 
    168176msgstr "" 
    169177 
    170 #: models/format.py:81 
     178#: models/format.py:82 
    171179msgid "sticker presence" 
    172180msgstr "" 
    173181 
    174 #: models/format.py:85 
     182#: models/format.py:86 
    175183msgid "format" 
    176184msgstr "" 
     
    188196msgstr "" 
    189197 
    190 #: models/instrument.py:80 models/location.py:170 
     198#: models/instrument.py:80 models/location.py:171 
    191199msgid "alias" 
    192200msgstr "" 
     
    220228msgstr "" 
    221229 
     230#: models/language.py:63 
     231msgid "languages" 
     232msgstr "" 
     233 
    222234#: models/location.py:49 
    223235msgid "country" 
     
    240252msgstr "" 
    241253 
    242 #: models/location.py:58 models/location.py:171 models/location.py:187 
     254#: models/location.py:58 models/location.py:172 models/location.py:188 
    243255msgid "authoritative" 
    244256msgstr "" 
    245257 
    246 #: models/location.py:112 models/location.py:169 models/location.py:184 
    247 #: models/media.py:321 
     258#: models/location.py:112 models/location.py:170 models/location.py:185 
     259#: models/media.py:325 
    248260msgid "location" 
    249261msgstr "" 
     
    253265msgstr "" 
    254266 
    255 #: models/location.py:179 
     267#: models/location.py:166 
     268msgid "lieux types" 
     269msgstr "" 
     270 
     271#: models/location.py:180 
    256272msgid "location aliases" 
    257273msgstr "" 
    258274 
    259 #: models/location.py:185 
     275#: models/location.py:186 
    260276msgid "ancestor location" 
     277msgstr "" 
     278 
     279#: models/location.py:194 
     280msgid "location relations" 
    261281msgstr "" 
    262282 
     
    274294 
    275295#: models/media.py:77 models/media.py:97 models/media.py:193 
    276 #: models/media.py:352 
     296#: models/media.py:347 
    277297msgid "public access" 
    278298msgstr "" 
    279299 
    280300#: models/media.py:93 models/media.py:123 models/media.py:171 
    281 #: models/media.py:312 models/media.py:494 models/media.py:510 
    282 #: models/media.py:542 
     301#: models/media.py:312 models/media.py:508 models/media.py:524 
     302#: models/media.py:556 
    283303msgid "title" 
    284304msgstr "" 
    285305 
    286 #: models/media.py:94 models/media.py:125 models/media.py:511 
    287 #: models/media.py:544 
     306#: models/media.py:94 models/media.py:125 models/media.py:525 
     307#: models/media.py:558 
    288308msgid "description" 
    289309msgstr "" 
    290310 
    291 #: models/media.py:95 models/media.py:218 models/media.py:346 
     311#: models/media.py:95 models/media.py:218 models/media.py:353 
    292312msgid "code" 
    293313msgstr "" 
    294314 
    295 #: models/media.py:96 models/media.py:170 models/media.py:349 
     315#: models/media.py:96 models/media.py:170 
    296316msgid "reference" 
    297317msgstr "" 
    298318 
    299 #: models/media.py:124 models/media.py:543 models/media.py:562 
     319#: models/media.py:124 models/media.py:557 models/media.py:576 
    300320#: models/system.py:115 
    301321msgid "date" 
    302322msgstr "" 
    303323 
    304 #: models/media.py:126 models/media.py:561 
     324#: models/media.py:126 models/media.py:575 
    305325msgid "mime_type" 
    306326msgstr "" 
     
    314334msgstr "" 
    315335 
    316 #: models/media.py:129 models/media.py:354 
     336#: models/media.py:129 models/media.py:368 
    317337msgid "file" 
    318338msgstr "" 
     
    326346msgstr "" 
    327347 
    328 #: models/media.py:176 models/media.py:644 
     348#: models/media.py:176 models/media.py:658 
    329349msgid "recording year (from)" 
    330350msgstr "" 
    331351 
    332 #: models/media.py:177 models/media.py:645 
     352#: models/media.py:177 models/media.py:659 
    333353msgid "recording year (until)" 
    334354msgstr "" 
     
    338358msgstr "" 
    339359 
    340 #: models/media.py:184 models/media.py:314 
     360#: models/media.py:184 models/media.py:356 
    341361msgid "recordist" 
    342362msgstr "" 
     
    394414msgstr "" 
    395415 
    396 #: models/media.py:219 models/media.py:347 
     416#: models/media.py:219 
    397417msgid "old code" 
    398418msgstr "" 
    399419 
    400 #: models/media.py:220 models/media.py:357 
     420#: models/media.py:220 models/media.py:371 
    401421msgid "approximative duration" 
    402422msgstr "" 
     
    426446msgstr "" 
    427447 
    428 #: models/media.py:284 models/media.py:402 
     448#: models/media.py:284 models/media.py:416 
    429449msgid "computed duration" 
    430450msgstr "" 
    431451 
    432 #: models/media.py:292 models/media.py:298 models/media.py:316 
     452#: models/media.py:292 models/media.py:298 models/media.py:315 
    433453msgid "collection" 
    434454msgstr "" 
     
    438458msgstr "" 
    439459 
     460#: models/media.py:316 
     461msgid "recording date (from)" 
     462msgstr "" 
     463 
    440464#: models/media.py:317 
    441 msgid "recording date (from)" 
    442 msgstr "" 
    443  
    444 #: models/media.py:318 
    445465msgid "recording date (until)" 
    446466msgstr "" 
    447467 
     468#: models/media.py:319 
     469msgid "scientist" 
     470msgstr "" 
     471 
     472#: models/media.py:320 
     473msgid "domain" 
     474msgstr "" 
     475 
     476#: models/media.py:321 
     477msgid "summary" 
     478msgstr "" 
     479 
    448480#: models/media.py:322 
     481msgid "remarks" 
     482msgstr "" 
     483 
     484#: models/media.py:326 
    449485msgid "location details" 
    450486msgstr "" 
    451487 
    452 #: models/media.py:323 
     488#: models/media.py:327 
    453489msgid "cultural area" 
    454490msgstr "" 
    455491 
    456 #: models/media.py:326 
     492#: models/media.py:330 
    457493msgid "language" 
    458494msgstr "" 
    459495 
    460 #: models/media.py:328 
     496#: models/media.py:332 
    461497msgid "ISO language" 
    462498msgstr "" 
    463499 
    464 #: models/media.py:330 
     500#: models/media.py:334 
    465501msgid "comments / ethnographic context" 
    466502msgstr "" 
    467503 
    468 #: models/media.py:331 
     504#: models/media.py:335 
    469505msgid "moda_execut" 
    470506msgstr "" 
    471507 
    472 #: models/media.py:338 
     508#: models/media.py:342 
    473509msgid "author / compositor" 
    474510msgstr "" 
    475511 
    476 #: models/media.py:341 
    477 msgid "remarks" 
    478 msgstr "" 
    479  
    480 #: models/media.py:342 
    481 msgid "recordist selection" 
    482 msgstr "" 
    483  
    484512#: models/media.py:343 
    485 msgid "recordist as in collection" 
    486 msgstr "" 
    487  
    488 #: models/media.py:348 
     513msgid "contributor" 
     514msgstr "" 
     515 
     516#: models/media.py:349 
     517msgid "depositor" 
     518msgstr "" 
     519 
     520#: models/media.py:355 
    489521msgid "item number" 
    490522msgstr "" 
    491523 
    492 #: models/media.py:350 
     524#: models/media.py:357 
     525msgid "digitalist" 
     526msgstr "" 
     527 
     528#: models/media.py:358 
     529msgid "collector" 
     530msgstr "" 
     531 
     532#: models/media.py:359 
     533msgid "collector selection" 
     534msgstr "" 
     535 
     536#: models/media.py:360 
     537msgid "collector as in collection" 
     538msgstr "" 
     539 
     540#: models/media.py:361 
     541msgid "digitization date" 
     542msgstr "" 
     543 
     544#: models/media.py:362 
     545msgid "publishing date" 
     546msgstr "" 
     547 
     548#: models/media.py:363 
     549msgid "creator reference" 
     550msgstr "" 
     551 
     552#: models/media.py:364 
    493553msgid "published references" 
    494554msgstr "" 
    495555 
    496 #: models/media.py:351 
     556#: models/media.py:365 
    497557msgid "copy of" 
    498558msgstr "" 
    499559 
    500 #: models/media.py:364 templates/telemeta/mediaitem_edit.html:41 
     560#: models/media.py:378 templates/telemeta/mediaitem_edit.html:41 
    501561msgid "keywords" 
    502562msgstr "" 
    503563 
    504 #: models/media.py:429 
     564#: models/media.py:443 
    505565msgid "instruments" 
    506566msgstr "" 
    507567 
    508 #: models/media.py:439 models/media.py:440 
     568#: models/media.py:453 models/media.py:454 
    509569msgid "item related media" 
    510570msgstr "" 
    511571 
    512 #: models/media.py:458 
     572#: models/media.py:472 
    513573msgid "composition" 
    514574msgstr "" 
    515575 
    516 #: models/media.py:460 
     576#: models/media.py:474 
    517577msgid "vernacular name" 
    518578msgstr "" 
    519579 
    520 #: models/media.py:461 
     580#: models/media.py:475 
    521581msgid "number" 
    522582msgstr "" 
    523583 
    524 #: models/media.py:462 
     584#: models/media.py:476 
    525585msgid "interprets" 
    526586msgstr "" 
    527587 
    528 #: models/media.py:473 
     588#: models/media.py:487 
    529589msgid "id" 
    530590msgstr "" 
    531591 
    532 #: models/media.py:476 
     592#: models/media.py:490 
    533593msgid "unit" 
    534594msgstr "" 
    535595 
    536 #: models/media.py:495 
     596#: models/media.py:509 
    537597msgid "start" 
    538598msgstr "" 
    539599 
    540 #: models/media.py:496 
     600#: models/media.py:510 
    541601msgid "end" 
    542602msgstr "" 
    543603 
    544 #: models/media.py:500 
     604#: models/media.py:514 
    545605msgid "item part" 
    546606msgstr "" 
    547607 
    548 #: models/media.py:508 models/media.py:525 models/media.py:540 
     608#: models/media.py:522 models/media.py:539 models/media.py:554 
    549609msgid "public_id" 
    550610msgstr "" 
    551611 
    552 #: models/media.py:526 
     612#: models/media.py:540 
    553613msgid "playlist" 
    554614msgstr "" 
    555615 
    556 #: models/media.py:527 
     616#: models/media.py:541 
    557617msgid "resource_type" 
    558618msgstr "" 
    559619 
    560 #: models/media.py:528 
     620#: models/media.py:542 
    561621msgid "resource_id" 
    562622msgstr "" 
    563623 
    564 #: models/media.py:541 models/system.py:55 
     624#: models/media.py:555 models/system.py:55 
    565625msgid "time" 
    566626msgstr "" 
    567627 
    568 #: models/media.py:545 
     628#: models/media.py:559 
    569629msgid "author" 
    570630msgstr "" 
    571631 
    572 #: models/media.py:563 
     632#: models/media.py:577 
    573633msgid "transcoded" 
    574634msgstr "" 
    575635 
    576 #: models/media.py:643 
     636#: models/media.py:657 
    577637msgid "collections" 
    578638msgstr "" 
    579639 
    580 #: models/media.py:655 models/media.py:656 models/media.py:666 
    581 #: models/media.py:683 
     640#: models/media.py:669 models/media.py:670 models/media.py:680 
     641#: models/media.py:697 
    582642msgid "corpus" 
    583643msgstr "" 
    584644 
    585 #: models/media.py:676 models/media.py:677 models/media.py:694 
     645#: models/media.py:690 models/media.py:691 models/media.py:708 
    586646msgid "fonds" 
    587647msgstr "" 
    588648 
    589 #: models/media.py:687 models/media.py:688 
     649#: models/media.py:701 models/media.py:702 
    590650msgid "corpus related media" 
    591651msgstr "" 
    592652 
    593 #: models/media.py:698 models/media.py:699 
     653#: models/media.py:712 models/media.py:713 
    594654msgid "fonds related media" 
    595655msgstr "" 
  • telemeta/locale/de/LC_MESSAGES/djangojs.po

    r3901268 r305d2e3  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-24 15:16+0200\n" 
     11"POT-Creation-Date: 2012-05-25 16:34+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

    r3901268 r305d2e3  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-24 15:16+0200\n" 
     11"POT-Creation-Date: 2012-05-25 16:34+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:475 
     28#: models/enum.py:41 models/enum.py:139 models/media.py:489 
    2929#: models/system.py:103 
    3030msgid "value" 
     
    6161#: models/enum.py:106 
    6262msgid "A/D conversion" 
    63 msgstr "" 
    64  
    65 #: models/enum.py:113 models/media.py:335 
     63msgstr "Conversion A/N" 
     64 
     65#: models/enum.py:113 models/media.py:339 
    6666msgid "vernacular style" 
    6767msgstr "style vernaculaire" 
    6868 
    69 #: models/enum.py:120 models/media.py:337 
     69#: models/enum.py:120 models/media.py:341 
    7070msgid "generic style" 
    7171msgstr "style générique" 
    7272 
    73 #: models/enum.py:127 models/media.py:446 
     73#: models/enum.py:127 models/media.py:460 
    7474msgid "keyword" 
    7575msgstr "Mot-clé" 
     
    8383msgstr "éditeur" 
    8484 
    85 #: models/enum.py:153 models/enum.py:157 models/media.py:325 
     85#: models/enum.py:153 models/enum.py:157 models/media.py:329 
    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:474 
     91#: models/media.py:488 
    9292msgid "name" 
    9393msgstr "nom" 
    9494 
    95 #: models/enum.py:172 models/format.py:74 
     95#: models/enum.py:172 models/format.py:75 
    9696msgid "tape wheel diameter (cm)" 
    9797msgstr "diamètre de moyeu de bande (cm)" 
     
    105105msgstr "largeur de bande (pouce)" 
    106106 
    107 #: models/enum.py:193 models/format.py:77 
     107#: models/enum.py:193 models/format.py:78 
    108108msgid "tape speed (m/s)" 
    109109msgstr "vitesse de bande (m/s)" 
    110110 
    111 #: models/enum.py:200 models/format.py:79 
     111#: models/enum.py:200 models/format.py:80 
    112112msgid "tape vendor" 
    113113msgstr "marque de bande" 
    114114 
    115 #: models/enum.py:207 models/format.py:68 
     115#: models/enum.py:207 models/format.py:69 
    116116msgid "number of channels" 
    117117msgstr "Nombre de pistes" 
    118118 
    119 #: models/enum.py:214 models/format.py:66 
    120 msgid "original location" 
    121 msgstr "lieu d'archivage" 
    122  
    123 #: models/format.py:56 models/media.py:376 models/media.py:435 
    124 #: models/media.py:445 models/media.py:456 models/media.py:472 
    125 #: models/media.py:493 models/media.py:539 models/media.py:560 
     119#: models/enum.py:214 models/media.py:346 
     120msgid "organization" 
     121msgstr "organisation" 
     122 
     123#: models/enum.py:221 models/media.py:350 
     124msgid "rights" 
     125msgstr "droits" 
     126 
     127#: models/format.py:56 models/media.py:390 models/media.py:449 
     128#: models/media.py:459 models/media.py:470 models/media.py:486 
     129#: models/media.py:507 models/media.py:553 models/media.py:574 
    126130msgid "item" 
    127131msgstr "item" 
     
    131135msgstr "nature du support original" 
    132136 
    133 #: models/format.py:60 
     137#: models/format.py:60 models/media.py:354 
    134138msgid "original code" 
    135139msgstr "cote originale" 
     
    151155msgstr "commentaires / notes" 
    152156 
    153 #: models/format.py:69 
     157#: models/format.py:66 
     158msgid "original location" 
     159msgstr "lieu d'archivage" 
     160 
     161#: models/format.py:70 
    154162msgid "audio quality" 
    155163msgstr "qualité audio" 
    156164 
    157 #: models/format.py:70 
     165#: models/format.py:71 
    158166msgid "recording system" 
    159167msgstr "système d'enregistrement" 
    160168 
    161 #: models/format.py:75 
     169#: models/format.py:76 
    162170msgid "tape thickness (um)" 
    163171msgstr "épaisseur de bande (um)" 
    164172 
    165 #: models/format.py:80 
     173#: models/format.py:81 
    166174msgid "tape reference" 
    167175msgstr "référence de bande" 
    168176 
    169 #: models/format.py:81 
     177#: models/format.py:82 
    170178msgid "sticker presence" 
    171179msgstr "présence de collants" 
    172180 
    173 #: models/format.py:85 
     181#: models/format.py:86 
    174182msgid "format" 
    175183msgstr "format" 
     
    187195msgstr "instrument parent" 
    188196 
    189 #: models/instrument.py:80 models/location.py:170 
     197#: models/instrument.py:80 models/location.py:171 
    190198msgid "alias" 
    191199msgstr "alias" 
     
    219227msgstr "commentaire" 
    220228 
     229#: models/language.py:63 
     230msgid "languages" 
     231msgstr "langues" 
     232 
    221233#: models/location.py:49 
    222234msgid "country" 
     
    239251msgstr "lieu actuel" 
    240252 
    241 #: models/location.py:58 models/location.py:171 models/location.py:187 
     253#: models/location.py:58 models/location.py:172 models/location.py:188 
    242254msgid "authoritative" 
    243255msgstr "officiel" 
    244256 
    245 #: models/location.py:112 models/location.py:169 models/location.py:184 
    246 #: models/media.py:321 
     257#: models/location.py:112 models/location.py:170 models/location.py:185 
     258#: models/media.py:325 
    247259msgid "location" 
    248260msgstr "lieu" 
     
    252264msgstr "lieux" 
    253265 
    254 #: models/location.py:179 
     266#: models/location.py:166 
     267#, fuzzy 
     268msgid "lieux types" 
     269msgstr "lieux types" 
     270 
     271#: models/location.py:180 
    255272msgid "location aliases" 
    256 msgstr "location aliases" 
    257  
    258 #: models/location.py:185 
     273msgstr "lieux alias" 
     274 
     275#: models/location.py:186 
    259276msgid "ancestor location" 
    260277msgstr "lieu ancêtre" 
     278 
     279#: models/location.py:194 
     280msgid "location relations" 
     281msgstr "lieux relations" 
    261282 
    262283#: models/media.py:72 
     
    273294 
    274295#: models/media.py:77 models/media.py:97 models/media.py:193 
    275 #: models/media.py:352 
     296#: models/media.py:347 
    276297msgid "public access" 
    277298msgstr "accès public" 
    278299 
    279300#: models/media.py:93 models/media.py:123 models/media.py:171 
    280 #: models/media.py:312 models/media.py:494 models/media.py:510 
    281 #: models/media.py:542 
     301#: models/media.py:312 models/media.py:508 models/media.py:524 
     302#: models/media.py:556 
    282303msgid "title" 
    283304msgstr "titre" 
    284305 
    285 #: models/media.py:94 models/media.py:125 models/media.py:511 
    286 #: models/media.py:544 
     306#: models/media.py:94 models/media.py:125 models/media.py:525 
     307#: models/media.py:558 
    287308msgid "description" 
    288309msgstr "description" 
    289310 
    290 #: models/media.py:95 models/media.py:218 models/media.py:346 
     311#: models/media.py:95 models/media.py:218 models/media.py:353 
    291312msgid "code" 
    292313msgstr "cote" 
    293314 
    294 #: models/media.py:96 models/media.py:170 models/media.py:349 
     315#: models/media.py:96 models/media.py:170 
    295316msgid "reference" 
    296317msgstr "référence" 
    297318 
    298 #: models/media.py:124 models/media.py:543 models/media.py:562 
     319#: models/media.py:124 models/media.py:557 models/media.py:576 
    299320#: models/system.py:115 
    300321msgid "date" 
    301322msgstr "" 
    302323 
    303 #: models/media.py:126 models/media.py:561 
     324#: models/media.py:126 models/media.py:575 
    304325msgid "mime_type" 
    305326msgstr "type mime" 
     
    313334msgstr "crédits" 
    314335 
    315 #: models/media.py:129 models/media.py:354 
     336#: models/media.py:129 models/media.py:368 
    316337msgid "file" 
    317338msgstr "fichier" 
     
    325346msgstr "déposant / contributeur" 
    326347 
    327 #: models/media.py:176 models/media.py:644 
     348#: models/media.py:176 models/media.py:658 
    328349msgid "recording year (from)" 
    329350msgstr "année d'enregistrement (depuis)" 
    330351 
    331 #: models/media.py:177 models/media.py:645 
     352#: models/media.py:177 models/media.py:659 
    332353msgid "recording year (until)" 
    333354msgstr "année d'enregistrement (jusqu'à)" 
     
    337358msgstr "année de parution" 
    338359 
    339 #: models/media.py:184 models/media.py:314 
     360#: models/media.py:184 models/media.py:356 
    340361msgid "recordist" 
    341362msgstr "collecteur" 
     
    393414msgstr "lieu de conservation" 
    394415 
    395 #: models/media.py:219 models/media.py:347 
     416#: models/media.py:219 
    396417msgid "old code" 
    397418msgstr "ancienne cote" 
    398419 
    399 #: models/media.py:220 models/media.py:357 
     420#: models/media.py:220 models/media.py:371 
    400421msgid "approximative duration" 
    401422msgstr "durée approximative" 
     
    425446msgstr "populations / groupes sociaux" 
    426447 
    427 #: models/media.py:284 models/media.py:402 
     448#: models/media.py:284 models/media.py:416 
    428449msgid "computed duration" 
    429450msgstr "durée calculée" 
    430451 
    431 #: models/media.py:292 models/media.py:298 models/media.py:316 
     452#: models/media.py:292 models/media.py:298 models/media.py:315 
    432453msgid "collection" 
    433454msgstr "collection" 
     
    437458msgstr "média associés à la collection" 
    438459 
    439 #: models/media.py:317 
     460#: models/media.py:316 
    440461msgid "recording date (from)" 
    441462msgstr "date d'enregistrement (depuis)" 
    442463 
    443 #: models/media.py:318 
     464#: models/media.py:317 
    444465msgid "recording date (until)" 
    445466msgstr "date d'enregistrement (jusqu'à)" 
    446467 
     468#: models/media.py:319 
     469msgid "scientist" 
     470msgstr "reponsable scientifique" 
     471 
     472#: models/media.py:320 
     473msgid "domain" 
     474msgstr "discipline" 
     475 
     476#: models/media.py:321 
     477msgid "summary" 
     478msgstr "résumé" 
     479 
    447480#: models/media.py:322 
     481msgid "remarks" 
     482msgstr "remarques" 
     483 
     484#: models/media.py:326 
    448485msgid "location details" 
    449486msgstr "précisions lieu" 
    450487 
    451 #: models/media.py:323 
     488#: models/media.py:327 
    452489msgid "cultural area" 
    453490msgstr "aire culturelle" 
    454491 
    455 #: models/media.py:326 
     492#: models/media.py:330 
    456493msgid "language" 
    457494msgstr "langue" 
    458495 
    459 #: models/media.py:328 
     496#: models/media.py:332 
    460497msgid "ISO language" 
    461498msgstr "Langue ISO" 
    462499 
    463 #: models/media.py:330 
     500#: models/media.py:334 
    464501msgid "comments / ethnographic context" 
    465502msgstr "commentaires / contexte ethnographique" 
    466503 
    467 #: models/media.py:331 
     504#: models/media.py:335 
    468505msgid "moda_execut" 
    469506msgstr "moda_execut" 
    470507 
    471 #: models/media.py:338 
     508#: models/media.py:342 
    472509msgid "author / compositor" 
    473510msgstr "auteur / compositeur" 
    474511 
    475 #: models/media.py:341 
    476 msgid "remarks" 
    477 msgstr "remarques" 
    478  
    479 #: models/media.py:342 
    480 msgid "recordist selection" 
    481 msgstr "sélection collecteur" 
    482  
    483512#: models/media.py:343 
    484 msgid "recordist as in collection" 
    485 msgstr "collecteur identique à la collection" 
    486  
    487 #: models/media.py:348 
     513msgid "contributor" 
     514msgstr "intervenant" 
     515 
     516#: models/media.py:349 
     517msgid "depositor" 
     518msgstr "déposant" 
     519 
     520#: models/media.py:355 
    488521msgid "item number" 
    489522msgstr "n° de l'item" 
    490523 
    491 #: models/media.py:350 
     524#: models/media.py:357 
     525msgid "digitalist" 
     526msgstr "opérateur de numérisation" 
     527 
     528#: models/media.py:358 
     529msgid "collector" 
     530msgstr "collecteur" 
     531 
     532#: models/media.py:359 
     533msgid "collector selection" 
     534msgstr "sélection collecteur" 
     535 
     536#: models/media.py:360 
     537msgid "collector as in collection" 
     538msgstr "collecteur identique à la collection" 
     539 
     540#: models/media.py:361 
     541msgid "digitization date" 
     542msgstr "date de numérisation" 
     543 
     544#: models/media.py:362 
     545msgid "publishing date" 
     546msgstr "date de création du support édité" 
     547 
     548#: models/media.py:363 
     549msgid "creator reference" 
     550msgstr "référence du créateur" 
     551 
     552#: models/media.py:364 
    492553msgid "published references" 
    493554msgstr "références éditées" 
    494555 
    495 #: models/media.py:351 
     556#: models/media.py:365 
    496557msgid "copy of" 
    497558msgstr "copie de" 
    498559 
    499 #: models/media.py:364 templates/telemeta/mediaitem_edit.html:41 
     560#: models/media.py:378 templates/telemeta/mediaitem_edit.html:41 
    500561msgid "keywords" 
    501562msgstr "mots-clés" 
    502563 
    503 #: models/media.py:429 
     564#: models/media.py:443 
    504565msgid "instruments" 
    505566msgstr "instruments" 
    506567 
    507 #: models/media.py:439 models/media.py:440 
     568#: models/media.py:453 models/media.py:454 
    508569msgid "item related media" 
    509570msgstr "média associés à l'item" 
    510571 
    511 #: models/media.py:458 
     572#: models/media.py:472 
    512573msgid "composition" 
    513574msgstr "Voix / Instruments" 
    514575 
    515 #: models/media.py:460 
     576#: models/media.py:474 
    516577msgid "vernacular name" 
    517578msgstr "nom vernaculaire" 
    518579 
    519 #: models/media.py:461 
     580#: models/media.py:475 
    520581msgid "number" 
    521582msgstr "nombre" 
    522583 
    523 #: models/media.py:462 
     584#: models/media.py:476 
    524585msgid "interprets" 
    525586msgstr "interprètes" 
    526587 
    527 #: models/media.py:473 
     588#: models/media.py:487 
    528589msgid "id" 
    529590msgstr "" 
    530591 
    531 #: models/media.py:476 
     592#: models/media.py:490 
    532593msgid "unit" 
    533594msgstr "unité" 
    534595 
    535 #: models/media.py:495 
     596#: models/media.py:509 
    536597msgid "start" 
    537598msgstr "début" 
    538599 
    539 #: models/media.py:496 
     600#: models/media.py:510 
    540601msgid "end" 
    541602msgstr "fin" 
    542603 
    543 #: models/media.py:500 
     604#: models/media.py:514 
    544605msgid "item part" 
    545606msgstr "partie" 
    546607 
    547 #: models/media.py:508 models/media.py:525 models/media.py:540 
     608#: models/media.py:522 models/media.py:539 models/media.py:554 
    548609msgid "public_id" 
    549610msgstr "public_id" 
    550611 
    551 #: models/media.py:526 
     612#: models/media.py:540 
    552613msgid "playlist" 
    553614msgstr "liste de lecture" 
    554615 
    555 #: models/media.py:527 
     616#: models/media.py:541 
    556617msgid "resource_type" 
    557618msgstr "type de ressource" 
    558619 
    559 #: models/media.py:528 
     620#: models/media.py:542 
    560621msgid "resource_id" 
    561622msgstr "ressource" 
    562623 
    563 #: models/media.py:541 models/system.py:55 
     624#: models/media.py:555 models/system.py:55 
    564625msgid "time" 
    565626msgstr "heure" 
    566627 
    567 #: models/media.py:545 
     628#: models/media.py:559 
    568629msgid "author" 
    569630msgstr "auteur" 
    570631 
    571 #: models/media.py:563 
     632#: models/media.py:577 
    572633msgid "transcoded" 
    573634msgstr "" 
    574635 
    575 #: models/media.py:643 
     636#: models/media.py:657 
    576637msgid "collections" 
    577638msgstr "collections" 
    578639 
    579 #: models/media.py:655 models/media.py:656 models/media.py:666 
    580 #: models/media.py:683 
     640#: models/media.py:669 models/media.py:670 models/media.py:680 
     641#: models/media.py:697 
    581642msgid "corpus" 
    582643msgstr "corpus" 
    583644 
    584 #: models/media.py:676 models/media.py:677 models/media.py:694 
     645#: models/media.py:690 models/media.py:691 models/media.py:708 
    585646msgid "fonds" 
    586647msgstr "fonds" 
    587648 
    588 #: models/media.py:687 models/media.py:688 
     649#: models/media.py:701 models/media.py:702 
    589650msgid "corpus related media" 
    590651msgstr "média associés" 
    591652 
    592 #: models/media.py:698 models/media.py:699 
     653#: models/media.py:712 models/media.py:713 
    593654msgid "fonds related media" 
    594655msgstr "média associés" 
  • telemeta/locale/fr/LC_MESSAGES/djangojs.po

    r3901268 r305d2e3  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-05-24 15:16+0200\n" 
     11"POT-Creation-Date: 2012-05-25 16:34+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n" 
  • telemeta/models/enum.py

    r91567b1 r305d2e3  
    207207        verbose_name = _("number of channels") 
    208208 
    209 class OriginalLocation(Enumeration): 
    210     "Location of th original item or collection" 
    211  
    212     class Meta(MetaEnumeration): 
    213         db_table = 'original_location' 
    214         verbose_name = _("original location") 
     209class Organization(Enumeration): 
     210    "Organization" 
     211 
     212    class Meta(MetaEnumeration): 
     213        db_table = 'organization' 
     214        verbose_name = _("organization") 
     215 
     216class Rights(Enumeration): 
     217    "Archive rights" 
     218 
     219    class Meta(MetaEnumeration): 
     220        db_table = 'rights' 
     221        verbose_name = _("rights") 
  • telemeta/models/format.py

    r71a8bde r305d2e3  
    6363    original_state        = TextField(_('technical properties / conservation state')) 
    6464    original_comments     = TextField(_('comments / notes')) 
    65     original_location     = WeakForeignKey(OriginalLocation, related_name="format", 
    66                                         verbose_name = _("original location")) 
     65    original_location     = ForeignKey('Location', related_name="format", 
     66                                       verbose_name = _("original location"), 
     67                                       blank=True, null=True, on_delete=models.SET_NULL) 
    6768    original_channels     = WeakForeignKey(NumberOfChannels, related_name="format", 
    6869                                        verbose_name = _("number of channels")) 
  • telemeta/models/language.py

    rdc5bde6 r305d2e3  
    6161        db_table = 'languages' 
    6262        ordering = ['name'] 
     63        verbose_name_plural = _('languages') 
  • telemeta/models/location.py

    r8cae994 r305d2e3  
    5252    type             = IntegerField(_('type'), choices=TYPE_CHOICES, default=OTHER_TYPE, db_index=True) 
    5353    complete_type    = ForeignKey('LocationType', related_name="locations", verbose_name=_('complete type')) 
    54     current_location = WeakForeignKey('self', related_name="past_names",  
    55                                       verbose_name=_('current location'))  
    56     latitude         = FloatField(null=True)                                     
    57     longitude        = FloatField(null=True)                                     
     54    current_location = WeakForeignKey('self', related_name="past_names", 
     55                                      verbose_name=_('current location')) 
     56    latitude         = FloatField(null=True) 
     57    longitude        = FloatField(null=True) 
    5858    is_authoritative = BooleanField(_('authoritative')) 
    5959 
     
    7272        if direct: 
    7373            q &= Q(descendant_relations__is_direct=True) 
    74         return Location.objects.filter(q)            
     74        return Location.objects.filter(q) 
    7575 
    7676    def descendants(self, direct=False): 
     
    7878        if direct: 
    7979            q &= Q(ancestor_relations__is_direct=True) 
    80         return Location.objects.filter(q)            
     80        return Location.objects.filter(q) 
    8181 
    8282    def apparented(self): 
    8383        return Location.objects.filter( 
    84                 Q(pk=self.id) |  
    85                 Q(ancestor_relations__ancestor_location=self) |  
     84                Q(pk=self.id) | 
     85                Q(ancestor_relations__ancestor_location=self) | 
    8686                Q(current_location=self.id)).distinct() 
    8787 
     
    9191            #FIXME: might raise Duplicate Entry 
    9292            LocationRelation.objects.create(location=other, ancestor_location=location) 
    93              
     93 
    9494    def add_parent(self, other): 
    9595        LocationRelation.objects.create(location=self, ancestor_location=other, is_direct=True) 
     
    126126                return flatname 
    127127 
    128         return None                     
     128        return None 
    129129 
    130130    def paths(self): 
     
    145145            names.append(u', '.join([unicode(l) for l in path])) 
    146146        return names 
    147          
     147 
    148148    def listnames(self): 
    149149        names = [] 
     
    160160    def __unicode__(self): 
    161161        return self.name 
    162          
     162 
    163163    class Meta(MetaCore): 
    164164        db_table = 'location_types' 
    165165        ordering = ['name'] 
     166        verbose_name_plural = _('lieux types') 
    166167 
    167168class LocationAlias(ModelCore): 
     
    179180        verbose_name_plural = _('location aliases') 
    180181        ordering = ['alias'] 
    181      
     182 
    182183class LocationRelation(ModelCore): 
    183184    "Location relations" 
     
    191192        unique_together = ('location', 'ancestor_location') 
    192193        ordering = ['ancestor_location__name'] 
     194        verbose_name_plural = _('location relations') 
    193195 
    194196    def __unicode__(self): 
    195197        sep = ' > ' 
    196198        if not self.is_direct: 
    197             sep = ' >..> '  
     199            sep = ' >..> ' 
    198200        return unicode(self.ancestor_location) + sep + unicode(self.location) 
    199201 
     
    206208        super(LocationForm, self).__init__(*args, **kwds) 
    207209#        self.fields['name'].queryset = Location.objects.order_by('name') 
    208          
     210 
  • telemeta/models/media.py

    r39a8813 r305d2e3  
    312312    title                 = CharField(_('title')) 
    313313    alt_title             = CharField(_('original title / translation')) 
    314     collector             = CharField(_('recordist')) 
    315314    collection            = ForeignKey('MediaCollection', related_name="items", 
    316315                                       verbose_name=_('collection')) 
    317316    recorded_from_date    = DateField(_('recording date (from)')) 
    318317    recorded_to_date      = DateField(_('recording date (until)')) 
     318 
     319    scientist             = CharField(_('scientist')) 
     320    domain                = CharField(_('domain')) 
     321    summary               = TextField(_('summary')) 
     322    comment               = TextField(_('remarks')) 
    319323 
    320324    # Geographic and cultural informations 
     
    337341                                           verbose_name=_('generic style')) 
    338342    author                = CharField(_('author / compositor')) 
    339  
    340     # General informations 
    341     comment               = TextField(_('remarks')) 
    342     collector_selection   = CharField(_('recordist selection')) 
    343     collector_from_collection = BooleanField(_('recordist as in collection')) 
     343    contributor           = CharField(_('contributor')) 
     344 
     345    # Legal mentions 
     346    organization          = WeakForeignKey('Organization', verbose_name=_('organization')) 
     347    public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, 
     348                                      max_length=16, default="metadata") 
     349    depositor             = CharField(_('depositor')) 
     350    rights                = WeakForeignKey('Rights', verbose_name=_('rights')) 
    344351 
    345352    # Archiving data 
    346353    code                  = CharField(_('code'), unique=True, blank=True) 
    347     old_code              = CharField(_('old code'), unique=False, blank=True) 
     354    old_code              = CharField(_('original code'), unique=False, blank=True) 
    348355    track                 = CharField(_('item number')) 
    349     creator_reference     = CharField(_('reference')) 
     356    recordist             = CharField(_('recordist')) 
     357    digitalist            = CharField(_('digitalist')) 
     358    collector             = CharField(_('collector')) 
     359    collector_selection   = CharField(_('collector selection')) 
     360    collector_from_collection = BooleanField(_('collector as in collection')) 
     361    digitization_date        = DateField(_('digitization date')) 
     362    publishing_date       = DateField(_('publishing date')) 
     363    creator_reference     = CharField(_('creator reference')) 
    350364    external_references   = TextField(_('published references')) 
    351365    copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of')) 
    352     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, 
    353                                       max_length=16, default="metadata") 
     366 
     367    # Media 
    354368    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") 
    355369 
Note: See TracChangeset for help on using the changeset viewer.