Changeset 48a34e7


Ignore:
Timestamp:
May 31, 2012 10:30:05 PM (2 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, 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, server, storage, telecaster
Children:
38d04ee, 01f1b2e
Parents:
d7d1e42 (diff), c1baf24 (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@…> (31/05/2012 22:30:05)
git-committer:
yomguy <yomguy@…> (31/05/2012 22:30:05)
Message:

Merge branch 'release/1.4.3-2'

Files:
10 added
27 edited

Legend:

Unmodified
Added
Removed
  • example/sandbox_mysql/settings.py

    rbf8dc4f rf38d30a  
    33 
    44import os.path 
     5from django.core.urlresolvers import reverse_lazy 
    56 
    67DEBUG = True 
     
    5960MEDIA_URL = '/media/' 
    6061 
    61 # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a 
    62 # trailing slash. 
    63 # Examples: "http://foo.com/media/", "/media/". 
    64 ADMIN_MEDIA_PREFIX = 'http://localhost/django/media/' 
     62# Absolute path to the directory static files should be collected to. 
     63# Don't put anything in this directory yourself; store your static files 
     64# in apps' "static/" subdirectories and in STATICFILES_DIRS. 
     65# Example: "/home/media/media.lawrence.com/static/" 
     66STATIC_ROOT = '/home/dev/telemeta/static/' 
     67 
     68# URL prefix for static files. 
     69# Example: "http://media.lawrence.com/static/" 
     70STATIC_URL = '/static/' 
     71 
     72# Additional locations of static files 
     73STATICFILES_DIRS = ( 
     74# Put strings here, like "/home/html/static" or "C:/www/django/static". 
     75# Always use forward slashes, even on Windows. 
     76# Don't forget to use absolute paths, not relative paths. 
     77) 
     78 
     79# List of finder classes that know how to find static files in 
     80# various locations. 
     81STATICFILES_FINDERS = ( 
     82'django.contrib.staticfiles.finders.FileSystemFinder', 
     83'django.contrib.staticfiles.finders.AppDirectoriesFinder', 
     84#    'django.contrib.staticfiles.finders.DefaultStorageFinder', 
     85) 
    6586 
    6687# Make this unique, and don't share it with anybody. 
     
    84105) 
    85106 
    86 ROOT_URLCONF = 'sandbox.urls' 
     107ROOT_URLCONF = 'sandbox_mysql.urls' 
    87108 
    88109TEMPLATE_DIRS = ( 
     
    100121    'django.contrib.messages', 
    101122    'django.contrib.admin', 
     123    'django.contrib.staticfiles', 
    102124    'telemeta', 
    103125    'jsonrpc', 
     
    109131    'django.core.context_processors.request', 
    110132    'django.contrib.auth.context_processors.auth', 
     133    "django.core.context_processors.i18n", 
     134    "django.core.context_processors.media", 
     135    'django.core.context_processors.static', 
    111136) 
    112137 
     
    116141TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA' 
    117142TELEMETA_CACHE_DIR = MEDIA_ROOT + 'cache' 
    118 TELEMETA_EXPORT_CACHE_DIR = TELEMETA_CACHE_DIR + "/export" 
     143TELEMETA_EXPORT_CACHE_DIR = MEDIA_ROOT + 'export' 
    119144TELEMETA_DATA_CACHE_DIR = TELEMETA_CACHE_DIR + "/data" 
    120145 
    121146TELEMETA_DOWNLOAD_ENABLED = True 
    122147TELEMETA_STREAMING_FORMATS = ('mp3', 'webm') 
    123 TELEMETA_STREAMING_FORMATS = ('wav', 'mp3', 'webm') 
     148TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') 
    124149TELEMETA_PUBLIC_ACCESS_PERIOD = 51 
     150TELEMETA_DEFAULT_WAVEFORM_SIZES = ['360x130', '640x130'] 
     151 
    125152AUTH_PROFILE_MODULE = 'telemeta.userprofile' 
    126153SESSION_EXPIRE_AT_BROWSER_CLOSE = False 
    127154 
     155LOGIN_URL = '/login/' 
     156LOGIN_REDIRECT_URL = reverse_lazy('telemeta-desk-lists') 
     157 
    128158EMAIL_HOST = 'smtp.free.fr' 
    129159DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' 
  • example/sandbox_sqlite/settings.py

    re12b60a8 rf38d30a  
    33 
    44import os 
     5from django.core.urlresolvers import reverse_lazy 
    56 
    67DEBUG = True 
     
    155156SESSION_EXPIRE_AT_BROWSER_CLOSE = False 
    156157 
     158LOGIN_URL = '/login/' 
     159LOGIN_REDIRECT_URL = reverse_lazy('telemeta-desk-lists') 
     160 
    157161EMAIL_HOST = 'localhost' 
    158162DEFAULT_FROM_EMAIL = 'webmaster@parisson.com' 
    159  
  • telemeta/__init__.py

    raa83e80 ra7f10c1  
    1313 
    1414__docformat__ = 'epytext en' 
    15 __version__ = '1.4.3' 
     15__version__ = '1.4.4' 
    1616__url__ = 'http://telemeta.org' 
    1717__copyright__ = '(C) 2007-2012 Parisson' 
  • telemeta/admin.py

    rbfa68c2 r752ebd9  
    7777 
    7878class FormatAdmin(admin.ModelAdmin): 
    79     search_fields = ['code', 'vendor'] 
     79    search_fields = ['original_code', 'tape_reference'] 
    8080 
    8181class UserProfileInline(admin.StackedInline): 
     
    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/forms/__init__.py

    r396801e rbc866e5  
    33from language import * 
    44from system import * 
     5from format import * 
  • telemeta/locale/de/LC_MESSAGES/django.po

    r66fb568 rc1baf24  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-04-02 17:22+0200\n" 
     11"POT-Creation-Date: 2012-05-30 13:14+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:455 
    30 #: models/system.py:102 
     29#: models/enum.py:41 models/enum.py:139 models/media.py:489 
     30#: models/system.py:103 
    3131msgid "value" 
    3232msgstr "" 
    3333 
    34 #: models/enum.py:57 models/media.py:222 
     34#: models/enum.py:57 models/media.py:223 
    3535msgid "archive format" 
    3636msgstr "" 
    3737 
    38 #: models/enum.py:64 models/media.py:205 
     38#: models/enum.py:64 models/media.py:206 
    3939msgid "secondary edition" 
    4040msgstr "" 
    4141 
    42 #: models/enum.py:71 models/media.py:199 
     42#: models/enum.py:71 models/media.py:200 
    4343msgid "mode of acquisition" 
    4444msgstr "" 
    4545 
    46 #: models/enum.py:78 models/media.py:202 
     46#: models/enum.py:78 models/media.py:203 
    4747msgid "record author" 
    4848msgstr "" 
    4949 
    50 #: models/enum.py:85 models/media.py:209 
     50#: models/enum.py:85 models/media.py:210 
    5151msgid "record writer" 
    5252msgstr "" 
    5353 
    54 #: models/enum.py:92 models/media.py:195 
     54#: models/enum.py:92 models/media.py:196 
    5555msgid "legal rights" 
    5656msgstr "" 
    5757 
    58 #: models/enum.py:99 models/media.py:174 
     58#: models/enum.py:99 models/media.py:175 
    5959msgid "recording context" 
    6060msgstr "" 
     
    6464msgstr "" 
    6565 
    66 #: models/enum.py:113 models/media.py:334 
     66#: models/enum.py:113 models/media.py:339 
    6767msgid "vernacular style" 
    6868msgstr "" 
    6969 
    70 #: models/enum.py:120 models/media.py:336 
     70#: models/enum.py:120 models/media.py:341 
    7171msgid "generic style" 
    7272msgstr "" 
    7373 
    74 #: models/enum.py:127 models/media.py:426 
     74#: models/enum.py:127 models/media.py:460 
    7575msgid "keyword" 
    7676msgstr "" 
    7777 
    78 #: models/enum.py:134 models/media.py:185 
     78#: models/enum.py:134 models/media.py:186 
    7979msgid "publisher / status" 
    8080msgstr "" 
     
    8484msgstr "" 
    8585 
    86 #: models/enum.py:153 models/enum.py:157 models/media.py:324 
     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:454 
     92#: models/media.py:488 
    9393msgid "name" 
    9494msgstr "" 
    9595 
    96 #: models/enum.py:171 models/media.py:689 
     96#: models/enum.py:172 models/format.py:77 
     97msgid "tape wheel diameter (cm)" 
     98msgstr "" 
     99 
     100#: models/enum.py:179 
    97101msgid "tape length (cm)" 
    98102msgstr "" 
    99103 
    100 #: models/enum.py:178 models/media.py:690 
     104#: models/enum.py:186 
    101105msgid "tape width (inch)" 
    102106msgstr "" 
    103107 
    104 #: models/enum.py:185 models/media.py:691 
    105 msgid "tape speed (m/s)" 
    106 msgstr "" 
    107  
    108 #: models/enum.py:192 
     108#: models/enum.py:193 models/format.py:80 
     109msgid "tape speed (cm/s)" 
     110msgstr "" 
     111 
     112#: models/enum.py:200 models/format.py:82 
    109113msgid "tape vendor" 
     114msgstr "" 
     115 
     116#: models/enum.py:207 models/format.py:71 
     117msgid "number of channels" 
     118msgstr "" 
     119 
     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/enum.py:228 models/media.py:320 
     129msgid "subject" 
     130msgstr "" 
     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 
     135msgid "item" 
     136msgstr "" 
     137 
     138#: models/format.py:61 
     139msgid "physical format" 
     140msgstr "" 
     141 
     142#: models/format.py:62 models/media.py:354 
     143msgid "original code" 
     144msgstr "" 
     145 
     146#: models/format.py:63 
     147msgid "original number" 
     148msgstr "" 
     149 
     150#: models/format.py:64 
     151msgid "original status" 
     152msgstr "" 
     153 
     154#: models/format.py:65 
     155msgid "technical properties / conservation state" 
     156msgstr "" 
     157 
     158#: models/format.py:66 
     159msgid "comments / notes" 
     160msgstr "" 
     161 
     162#: models/format.py:68 
     163msgid "original location" 
     164msgstr "" 
     165 
     166#: models/format.py:72 
     167msgid "audio quality" 
     168msgstr "" 
     169 
     170#: models/format.py:73 
     171msgid "recording system" 
     172msgstr "" 
     173 
     174#: models/format.py:78 
     175msgid "tape thickness (um)" 
     176msgstr "" 
     177 
     178#: models/format.py:83 
     179msgid "tape reference" 
     180msgstr "" 
     181 
     182#: models/format.py:84 
     183msgid "sticker presence" 
     184msgstr "" 
     185 
     186#: models/format.py:88 
     187msgid "format" 
    110188msgstr "" 
    111189 
     
    122200msgstr "" 
    123201 
    124 #: models/instrument.py:80 models/location.py:170 
     202#: models/instrument.py:80 models/location.py:171 
    125203msgid "alias" 
    126204msgstr "" 
     
    150228msgstr "" 
    151229 
    152 #: models/language.py:55 models/media.py:207 
     230#: models/language.py:55 models/media.py:208 
    153231msgid "comment" 
     232msgstr "" 
     233 
     234#: models/language.py:63 
     235msgid "languages" 
    154236msgstr "" 
    155237 
     
    174256msgstr "" 
    175257 
    176 #: models/location.py:58 models/location.py:171 models/location.py:187 
     258#: models/location.py:58 models/location.py:172 models/location.py:188 
    177259msgid "authoritative" 
    178260msgstr "" 
    179261 
    180 #: models/location.py:112 models/location.py:169 models/location.py:184 
    181 #: models/media.py:320 
     262#: models/location.py:112 models/location.py:170 models/location.py:185 
     263#: models/media.py:325 
    182264msgid "location" 
    183265msgstr "" 
     
    187269msgstr "" 
    188270 
    189 #: models/location.py:179 
     271#: models/location.py:166 
     272msgid "lieux types" 
     273msgstr "" 
     274 
     275#: models/location.py:180 
    190276msgid "location aliases" 
    191277msgstr "" 
    192278 
    193 #: models/location.py:185 
     279#: models/location.py:186 
    194280msgid "ancestor location" 
    195281msgstr "" 
    196282 
    197 #: models/media.py:71 
     283#: models/location.py:194 
     284msgid "location relations" 
     285msgstr "" 
     286 
     287#: models/media.py:72 
    198288msgid "Metadata only" 
    199289msgstr "" 
    200290 
    201 #: models/media.py:73 
     291#: models/media.py:74 
    202292msgid "Sound and metadata" 
    203293msgstr "" 
    204294 
    205 #: models/media.py:75 
     295#: models/media.py:76 
    206296msgid "Private data" 
    207297msgstr "" 
    208298 
    209 #: models/media.py:76 models/media.py:96 models/media.py:192 
    210 #: models/media.py:351 
     299#: models/media.py:77 models/media.py:97 models/media.py:193 
     300#: models/media.py:347 
    211301msgid "public access" 
    212302msgstr "" 
    213303 
    214 #: models/media.py:92 models/media.py:122 models/media.py:170 
    215 #: models/media.py:311 models/media.py:474 models/media.py:490 
    216 #: models/media.py:521 
     304#: 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 
    217307msgid "title" 
    218308msgstr "" 
    219309 
    220 #: models/media.py:93 models/media.py:124 models/media.py:491 
    221 #: models/media.py:523 
     310#: models/media.py:94 models/media.py:125 models/media.py:525 
     311#: models/media.py:558 
    222312msgid "description" 
    223313msgstr "" 
    224314 
    225 #: models/media.py:94 models/media.py:217 models/media.py:345 
     315#: models/media.py:95 models/media.py:218 models/media.py:353 
    226316msgid "code" 
    227317msgstr "" 
    228318 
    229 #: models/media.py:95 models/media.py:169 models/media.py:348 
     319#: models/media.py:96 models/media.py:170 
    230320msgid "reference" 
    231321msgstr "" 
    232322 
    233 #: models/media.py:123 models/media.py:522 models/media.py:541 
    234 #: models/system.py:114 
     323#: models/media.py:124 models/media.py:557 models/media.py:576 
     324#: models/system.py:115 
    235325msgid "date" 
    236326msgstr "" 
    237327 
    238 #: models/media.py:125 models/media.py:540 
     328#: models/media.py:126 models/media.py:575 
    239329msgid "mime_type" 
    240330msgstr "" 
    241331 
    242 #: models/media.py:126 
     332#: models/media.py:127 
    243333msgid "url" 
    244334msgstr "" 
    245335 
    246 #: models/media.py:127 
     336#: models/media.py:128 
    247337msgid "credits" 
    248338msgstr "" 
    249339 
    250 #: models/media.py:128 models/media.py:352 
     340#: models/media.py:129 models/media.py:368 
    251341msgid "file" 
    252342msgstr "" 
    253343 
    254 #: models/media.py:171 models/media.py:312 
     344#: models/media.py:172 models/media.py:313 
    255345msgid "original title / translation" 
    256346msgstr "" 
    257347 
    258 #: models/media.py:172 
     348#: models/media.py:173 
    259349msgid "depositor / contributor" 
    260350msgstr "" 
    261351 
    262 #: models/media.py:175 models/media.py:622 
     352#: models/media.py:176 models/media.py:658 
    263353msgid "recording year (from)" 
    264354msgstr "" 
    265355 
    266 #: models/media.py:176 models/media.py:623 
     356#: models/media.py:177 models/media.py:659 
    267357msgid "recording year (until)" 
    268358msgstr "" 
    269359 
    270 #: models/media.py:177 
     360#: models/media.py:178 
    271361msgid "year published" 
    272362msgstr "" 
    273363 
    274 #: models/media.py:183 models/media.py:313 
     364#: models/media.py:184 models/media.py:356 
    275365msgid "recordist" 
    276366msgstr "" 
    277367 
    278 #: models/media.py:187 
     368#: models/media.py:188 
    279369msgid "publisher collection" 
    280370msgstr "" 
    281371 
    282 #: models/media.py:188 
     372#: models/media.py:189 
    283373msgid "publisher serial number" 
    284374msgstr "" 
    285375 
    286 #: models/media.py:189 
     376#: models/media.py:190 
    287377msgid "author of published notice" 
    288378msgstr "" 
    289379 
    290 #: models/media.py:190 
     380#: models/media.py:191 
    291381msgid "bibliographic references" 
    292382msgstr "" 
    293383 
    294 #: models/media.py:191 
     384#: models/media.py:192 
    295385msgid "document type" 
    296386msgstr "" 
    297387 
    298 #: models/media.py:200 
     388#: models/media.py:201 
    299389msgid "CNRS depositor" 
    300390msgstr "" 
    301391 
    302 #: models/media.py:203 
     392#: models/media.py:204 
    303393msgid "related documentation" 
    304394msgstr "" 
    305395 
    306 #: models/media.py:206 
     396#: models/media.py:207 
    307397msgid "copies" 
    308398msgstr "" 
    309399 
    310 #: models/media.py:210 
     400#: models/media.py:211 
    311401msgid "archiver notes" 
    312402msgstr "" 
    313403 
    314 #: models/media.py:211 
     404#: models/media.py:212 
    315405msgid "items finished" 
    316406msgstr "" 
    317407 
    318 #: models/media.py:212 
     408#: models/media.py:213 
    319409msgid "recordist identical to depositor" 
    320410msgstr "" 
    321411 
    322 #: models/media.py:213 
     412#: models/media.py:214 
    323413msgid "published" 
    324414msgstr "" 
    325415 
    326 #: models/media.py:214 
     416#: models/media.py:215 
    327417msgid "conservation site" 
    328418msgstr "" 
    329419 
    330 #: models/media.py:218 models/media.py:346 
     420#: models/media.py:219 
    331421msgid "old code" 
    332422msgstr "" 
    333423 
    334 #: models/media.py:219 models/media.py:355 
     424#: models/media.py:220 models/media.py:371 
    335425msgid "approximative duration" 
    336426msgstr "" 
    337427 
    338 #: models/media.py:220 
     428#: models/media.py:221 
    339429msgid "number of components (medium / piece)" 
    340430msgstr "" 
    341431 
    342 #: models/media.py:224 
     432#: models/media.py:225 
    343433msgid "digitization" 
    344434msgstr "" 
    345435 
    346 #: models/media.py:225 models/media.py:685 
     436#: models/media.py:226 
    347437msgid "status" 
    348438msgstr "" 
    349439 
    350 #: models/media.py:226 
     440#: models/media.py:227 
    351441msgid "a_informer_07_03" 
    352442msgstr "" 
    353443 
    354 #: models/media.py:261 
     444#: models/media.py:262 
    355445msgid "states / nations" 
    356446msgstr "" 
    357447 
    358 #: models/media.py:275 
     448#: models/media.py:276 
    359449msgid "populations / social groups" 
    360450msgstr "" 
    361451 
    362 #: models/media.py:283 models/media.py:400 
     452#: models/media.py:284 models/media.py:416 
    363453msgid "computed duration" 
    364454msgstr "" 
    365455 
    366 #: models/media.py:291 models/media.py:297 models/media.py:315 
     456#: models/media.py:292 models/media.py:298 models/media.py:315 
    367457msgid "collection" 
    368458msgstr "" 
    369459 
    370 #: models/media.py:301 models/media.py:302 
     460#: models/media.py:302 models/media.py:303 
    371461msgid "collection related media" 
    372462msgstr "" 
     
    380470msgstr "" 
    381471 
     472#: models/media.py:319 
     473msgid "scientist" 
     474msgstr "" 
     475 
    382476#: models/media.py:321 
     477msgid "summary" 
     478msgstr "" 
     479 
     480#: models/media.py:322 
     481msgid "remarks" 
     482msgstr "" 
     483 
     484#: models/media.py:326 
    383485msgid "location details" 
    384486msgstr "" 
    385487 
    386 #: models/media.py:322 
     488#: models/media.py:327 
    387489msgid "cultural area" 
    388490msgstr "" 
    389491 
    390 #: models/media.py:325 
     492#: models/media.py:330 
    391493msgid "language" 
    392494msgstr "" 
    393495 
    394 #: models/media.py:327 
     496#: models/media.py:332 
    395497msgid "ISO language" 
    396498msgstr "" 
    397499 
    398 #: models/media.py:329 
     500#: models/media.py:334 
    399501msgid "comments / ethnographic context" 
    400502msgstr "" 
    401503 
    402 #: models/media.py:330 
     504#: models/media.py:335 
    403505msgid "moda_execut" 
    404506msgstr "" 
    405507 
    406 #: models/media.py:337 
     508#: models/media.py:342 
    407509msgid "author / compositor" 
    408510msgstr "" 
    409511 
    410 #: models/media.py:340 
    411 msgid "remarks" 
    412 msgstr "" 
    413  
    414 #: models/media.py:341 
    415 msgid "recordist selection" 
    416 msgstr "" 
    417  
    418 #: models/media.py:342 
    419 msgid "recordist as in collection" 
    420 msgstr "" 
    421  
    422 #: models/media.py:347 
     512#: models/media.py:343 
     513msgid "contributor" 
     514msgstr "" 
     515 
     516#: models/media.py:349 
     517msgid "depositor" 
     518msgstr "" 
     519 
     520#: models/media.py:355 
    423521msgid "item number" 
    424522msgstr "" 
    425523 
    426 #: models/media.py:349 
     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 
    427553msgid "published references" 
    428554msgstr "" 
    429555 
    430 #: models/media.py:350 
     556#: models/media.py:365 
    431557msgid "copy of" 
    432558msgstr "" 
    433559 
    434 #: models/media.py:362 templates/telemeta/mediaitem_edit.html:39 
     560#: models/media.py:378 templates/telemeta/mediaitem_edit.html:41 
    435561msgid "keywords" 
    436562msgstr "" 
    437563 
    438 #: models/media.py:374 models/media.py:415 models/media.py:425 
    439 #: models/media.py:436 models/media.py:452 models/media.py:473 
    440 #: models/media.py:518 models/media.py:539 models/media.py:682 
    441 msgid "item" 
    442 msgstr "" 
    443  
    444 #: models/media.py:419 models/media.py:420 
     564#: models/media.py:443 
     565msgid "instruments" 
     566msgstr "" 
     567 
     568#: models/media.py:453 models/media.py:454 
    445569msgid "item related media" 
    446570msgstr "" 
    447571 
    448 #: models/media.py:438 
     572#: models/media.py:472 
    449573msgid "composition" 
    450574msgstr "" 
    451575 
    452 #: models/media.py:440 
     576#: models/media.py:474 
    453577msgid "vernacular name" 
    454578msgstr "" 
    455579 
    456 #: models/media.py:441 
     580#: models/media.py:475 
    457581msgid "number" 
    458582msgstr "" 
    459583 
    460 #: models/media.py:442 
     584#: models/media.py:476 
    461585msgid "interprets" 
    462586msgstr "" 
    463587 
    464 #: models/media.py:453 
     588#: models/media.py:487 
    465589msgid "id" 
    466590msgstr "" 
    467591 
    468 #: models/media.py:456 
     592#: models/media.py:490 
    469593msgid "unit" 
    470594msgstr "" 
    471595 
    472 #: models/media.py:475 
     596#: models/media.py:509 
    473597msgid "start" 
    474598msgstr "" 
    475599 
    476 #: models/media.py:476 
     600#: models/media.py:510 
    477601msgid "end" 
    478602msgstr "" 
    479603 
    480 #: models/media.py:480 
     604#: models/media.py:514 
    481605msgid "item part" 
    482606msgstr "" 
    483607 
    484 #: models/media.py:488 models/media.py:504 models/media.py:519 
     608#: models/media.py:522 models/media.py:539 models/media.py:554 
    485609msgid "public_id" 
    486610msgstr "" 
    487611 
    488 #: models/media.py:505 
     612#: models/media.py:540 
    489613msgid "playlist" 
    490614msgstr "" 
    491615 
    492 #: models/media.py:506 
     616#: models/media.py:541 
    493617msgid "resource_type" 
    494618msgstr "" 
    495619 
    496 #: models/media.py:507 
     620#: models/media.py:542 
    497621msgid "resource_id" 
    498622msgstr "" 
    499623 
    500 #: models/media.py:520 models/system.py:55 
     624#: models/media.py:555 models/system.py:55 
    501625msgid "time" 
    502626msgstr "" 
    503627 
    504 #: models/media.py:524 
     628#: models/media.py:559 
    505629msgid "author" 
    506630msgstr "" 
    507631 
    508 #: models/media.py:542 
     632#: models/media.py:577 
    509633msgid "transcoded" 
    510634msgstr "" 
    511635 
    512 #: models/media.py:621 
     636#: models/media.py:657 
    513637msgid "collections" 
    514638msgstr "" 
    515639 
    516 #: models/media.py:633 models/media.py:634 models/media.py:643 
    517 #: models/media.py:660 
     640#: models/media.py:669 models/media.py:670 models/media.py:680 
     641#: models/media.py:697 
    518642msgid "corpus" 
    519643msgstr "" 
    520644 
    521 #: models/media.py:653 models/media.py:654 models/media.py:671 
     645#: models/media.py:690 models/media.py:691 models/media.py:708 
    522646msgid "fonds" 
    523647msgstr "" 
    524648 
    525 #: models/media.py:664 models/media.py:665 
     649#: models/media.py:701 models/media.py:702 
    526650msgid "corpus related media" 
    527651msgstr "" 
    528652 
    529 #: models/media.py:675 models/media.py:676 
     653#: models/media.py:712 models/media.py:713 
    530654msgid "fonds related media" 
    531 msgstr "" 
    532  
    533 #: models/media.py:683 
    534 msgid "original code" 
    535 msgstr "" 
    536  
    537 #: models/media.py:684 
    538 msgid "tape number" 
    539 msgstr "" 
    540  
    541 #: models/media.py:686 
    542 msgid "conservation state" 
    543 msgstr "" 
    544  
    545 #: models/media.py:687 
    546 msgid "comments" 
    547 msgstr "" 
    548  
    549 #: models/media.py:693 
    550 msgid "tape thickness (um)" 
    551 msgstr "" 
    552  
    553 #: models/media.py:694 
    554 msgid "tape diameter (mm)" 
    555 msgstr "" 
    556  
    557 #: models/media.py:695 
    558 msgid "tape reference" 
    559 msgstr "" 
    560  
    561 #: models/media.py:699 
    562 msgid "format" 
    563655msgstr "" 
    564656 
     
    583675msgstr "" 
    584676 
    585 #: models/system.py:86 templates/telemeta/profile_detail.html:45 
     677#: models/system.py:86 templates/telemeta/profile_detail.html:44 
     678msgid "Department" 
     679msgstr "" 
     680 
     681#: models/system.py:87 
     682msgid "attachment" 
     683msgstr "" 
     684 
     685#: models/system.py:88 templates/telemeta/profile_detail.html:45 
    586686msgid "Function" 
    587687msgstr "" 
    588688 
    589 #: models/system.py:87 templates/telemeta/profile_detail.html:47 
     689#: models/system.py:89 templates/telemeta/profile_detail.html:47 
    590690msgid "Address" 
    591691msgstr "" 
    592692 
    593 #: models/system.py:88 templates/telemeta/profile_detail.html:48 
     693#: models/system.py:90 templates/telemeta/profile_detail.html:48 
    594694msgid "Telephone" 
    595695msgstr "" 
    596696 
    597 #: models/system.py:89 
     697#: models/system.py:91 
    598698msgid "Expiration_date" 
    599699msgstr "" 
    600700 
    601 #: models/system.py:90 
    602 msgid "Password initialization" 
    603 msgstr "" 
    604  
    605 #: models/system.py:101 
     701#: models/system.py:102 
    606702msgid "key" 
    607703msgstr "" 
    608704 
    609 #: models/system.py:115 templates/telemeta/inc/children_list.html:16 
     705#: models/system.py:116 templates/telemeta/inc/children_list.html:16 
    610706#: templates/telemeta/inc/collection_related.html:39 
    611707#: templates/telemeta/inc/mediaitem_related.html:39 
     
    615711msgstr "" 
    616712 
    617 #: models/system.py:117 
     713#: models/system.py:118 
    618714msgid "criteria" 
    619715msgstr "" 
     
    707803#: templates/telemeta/collection_detail.html:217 
    708804#: templates/telemeta/lists.html:58 
    709 #: templates/telemeta/mediaitem_detail.html:340 
     805#: templates/telemeta/mediaitem_detail.html:346 
    710806#: templates/telemeta/resource_detail.html:102 
    711807msgid "Delete" 
     
    861957 
    862958#: templates/telemeta/admin_enumerations.html:14 
    863 #: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_add.html:33 
    864 #: templates/telemeta/mediaitem_copy.html:34 
    865 #: templates/telemeta/mediaitem_edit.html:26 
    866 #: templates/telemeta/search_criteria.html:78 
    867 #: templates/telemeta/search_results.html:41 
     959#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_add.html:34 
     960#: templates/telemeta/mediaitem_copy.html:35 
     961#: templates/telemeta/mediaitem_edit.html:27 
     962#: templates/telemeta/search_criteria.html:83 
     963#: templates/telemeta/search_results.html:44 
    868964#: templates/telemeta/inc/children_list.html:15 
    869965#: templates/telemeta/inc/collection_list.html:13 
     
    9161012msgstr "" 
    9171013 
    918 #: templates/telemeta/base.html:75 templates/telemeta/search_criteria.html:138 
     1014#: templates/telemeta/base.html:75 templates/telemeta/search_criteria.html:143 
    9191015msgid "Search" 
    9201016msgstr "" 
     
    9901086#: templates/telemeta/instrument_edit_value.html:19 
    9911087#: templates/telemeta/mediaitem_add.html:15 
    992 #: templates/telemeta/mediaitem_add.html:45 
     1088#: templates/telemeta/mediaitem_add.html:47 
    9931089#: templates/telemeta/mediaitem_copy.html:16 
    994 #: templates/telemeta/mediaitem_copy.html:45 
     1090#: templates/telemeta/mediaitem_copy.html:47 
    9951091#: templates/telemeta/mediaitem_edit.html:10 
    996 #: templates/telemeta/mediaitem_edit.html:37 
     1092#: templates/telemeta/mediaitem_edit.html:39 
    9971093#: templates/telemeta/mediaitem_keywords_edit.html:12 
    9981094#: templates/telemeta/mediaitem_keywords_edit.html:39 
     
    10171113#: templates/telemeta/enumeration_edit_value.html:17 
    10181114#: templates/telemeta/instrument_edit_value.html:17 
    1019 #: templates/telemeta/mediaitem_add.html:47 
    1020 #: templates/telemeta/mediaitem_copy.html:47 
    1021 #: templates/telemeta/mediaitem_edit.html:47 
     1115#: templates/telemeta/mediaitem_add.html:49 
     1116#: templates/telemeta/mediaitem_copy.html:49 
     1117#: templates/telemeta/mediaitem_edit.html:49 
    10221118#: templates/telemeta/mediaitem_keywords_edit.html:41 
    10231119#: templates/telemeta/mediaitem_performances_edit.html:45 
     
    10311127 
    10321128#: templates/telemeta/collection_detail.html:5 
    1033 #: templates/telemeta/collection_detail_dc.html:5 views/base.py:439 
     1129#: templates/telemeta/collection_detail_dc.html:5 views/base.py:448 
    10341130msgid "Collection" 
    10351131msgstr "" 
     
    10381134#: templates/telemeta/collection_edit.html:31 templates/telemeta/lists.html:55 
    10391135#: templates/telemeta/mediaitem_detail.html:97 
    1040 #: templates/telemeta/mediaitem_edit.html:39 
    1041 #: templates/telemeta/mediaitem_edit.html:42 
    1042 #: templates/telemeta/mediaitem_edit.html:45 
     1136#: templates/telemeta/mediaitem_edit.html:41 
     1137#: templates/telemeta/mediaitem_edit.html:44 
     1138#: templates/telemeta/mediaitem_edit.html:47 
    10431139#: templates/telemeta/profile_detail.html:72 
    10441140#: templates/telemeta/resource_detail.html:43 
     
    10741170 
    10751171#: templates/telemeta/collection_detail.html:103 
    1076 #: templates/telemeta/mediaitem_detail.html:199 
     1172#: templates/telemeta/mediaitem_detail.html:204 
    10771173#: templates/telemeta/resource_detail.html:73 
    10781174msgid "Last modification" 
     
    10801176 
    10811177#: templates/telemeta/collection_detail.html:112 
    1082 #: templates/telemeta/mediaitem_detail.html:209 
     1178#: templates/telemeta/mediaitem_detail.html:214 
    10831179msgid "Geographic and cultural informations" 
    10841180msgstr "" 
     
    10961192 
    10971193#: templates/telemeta/collection_detail.html:152 
    1098 #: templates/telemeta/mediaitem_detail.html:281 
     1194#: templates/telemeta/mediaitem_detail.html:284 
    10991195msgid "Archiving data" 
    11001196msgstr "" 
     
    11051201 
    11061202#: templates/telemeta/collection_detail.html:162 
     1203#: templates/telemeta/mediaitem_detail.html:315 
    11071204msgid "Comments" 
    11081205msgstr "" 
    11091206 
    11101207#: templates/telemeta/collection_detail.html:176 
    1111 #: templates/telemeta/mediaitem_detail.html:297 
     1208#: templates/telemeta/mediaitem_detail.html:300 
    11121209msgid "Technical data" 
    11131210msgstr "" 
    11141211 
    11151212#: templates/telemeta/collection_detail.html:181 
    1116 #: templates/telemeta/mediaitem_detail.html:300 
     1213#: templates/telemeta/mediaitem_detail.html:303 
    11171214msgid "Media type" 
    11181215msgstr "" 
     
    11381235 
    11391236#: templates/telemeta/collection_edit.html:31 
    1140 #: templates/telemeta/mediaitem_edit.html:45 
     1237#: templates/telemeta/mediaitem_edit.html:47 
    11411238#: templates/telemeta/resource_edit.html:31 
    11421239msgid "related media" 
     
    12071304#: templates/telemeta/enumeration_edit.html:31 
    12081305#: templates/telemeta/enumeration_edit_value.html:11 
    1209 #: templates/telemeta/mediaitem_detail.html:164 
     1306#: templates/telemeta/mediaitem_detail.html:166 
    12101307msgid "Value" 
    12111308msgstr "" 
     
    12961393msgstr "" 
    12971394 
    1298 #: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_add.html:34 
    1299 #: templates/telemeta/mediaitem_copy.html:35 
    1300 #: templates/telemeta/mediaitem_edit.html:27 
     1395#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_add.html:35 
     1396#: templates/telemeta/mediaitem_copy.html:36 
     1397#: templates/telemeta/mediaitem_edit.html:28 
    13011398#: templates/telemeta/inc/children_list.html:17 
    13021399#: templates/telemeta/inc/collection_list.html:14 
     
    13071404 
    13081405#: templates/telemeta/lists.html:74 
    1309 #: templates/telemeta/search_criteria.html:130 
    1310 #: templates/telemeta/search_results.html:58 
     1406#: templates/telemeta/search_criteria.html:135 
     1407#: templates/telemeta/search_results.html:61 
    13111408#: templates/telemeta/inc/collection_list.html:18 
    13121409#: templates/telemeta/inc/mediaitem_list.html:23 
     
    13331430#: templates/telemeta/mediaitem_add.html:5 
    13341431#: templates/telemeta/mediaitem_copy.html:5 
    1335 #: templates/telemeta/mediaitem_detail.html:5 views/base.py:610 
     1432#: templates/telemeta/mediaitem_detail.html:5 views/base.py:619 
    13361433msgid "Item" 
    13371434msgstr "" 
     
    13471444msgstr "" 
    13481445 
    1349 #: templates/telemeta/mediaitem_detail.html:153 
     1446#: templates/telemeta/mediaitem_detail.html:155 
    13501447msgid "Analysis" 
    13511448msgstr "" 
    13521449 
    1353 #: templates/telemeta/mediaitem_detail.html:155 
     1450#: templates/telemeta/mediaitem_detail.html:157 
    13541451msgid "Markers" 
    13551452msgstr "" 
    13561453 
    1357 #: templates/telemeta/mediaitem_detail.html:163 
     1454#: templates/telemeta/mediaitem_detail.html:165 
    13581455msgid "Property" 
    13591456msgstr "" 
    13601457 
    1361 #: templates/telemeta/mediaitem_detail.html:165 
     1458#: templates/telemeta/mediaitem_detail.html:167 
    13621459msgid "Unit" 
    13631460msgstr "" 
    13641461 
    1365 #: templates/telemeta/mediaitem_detail.html:173 
     1462#: templates/telemeta/mediaitem_detail.html:175 
    13661463msgid "Download:" 
    13671464msgstr "" 
    13681465 
    1369 #: templates/telemeta/mediaitem_detail.html:194 
     1466#: templates/telemeta/mediaitem_detail.html:196 
    13701467msgid "Recording date" 
    13711468msgstr "" 
    13721469 
    1373 #: templates/telemeta/mediaitem_detail.html:211 
     1470#: templates/telemeta/mediaitem_detail.html:200 
     1471msgid "Remarks" 
     1472msgstr "" 
     1473 
     1474#: templates/telemeta/mediaitem_detail.html:216 
    13741475#: templates/telemeta/inc/mediaitem_list.html:18 
    13751476msgid "Location" 
    13761477msgstr "" 
    13771478 
    1378 #: templates/telemeta/mediaitem_detail.html:217 
     1479#: templates/telemeta/mediaitem_detail.html:222 
    13791480msgid "Language ISO" 
    13801481msgstr "" 
    13811482 
    1382 #: templates/telemeta/mediaitem_detail.html:221 
     1483#: templates/telemeta/mediaitem_detail.html:226 
    13831484msgid "Ethnographic context" 
    13841485msgstr "" 
    13851486 
    1386 #: templates/telemeta/mediaitem_detail.html:232 
     1487#: templates/telemeta/mediaitem_detail.html:237 
    13871488msgid "Musical informations" 
    13881489msgstr "" 
    13891490 
    1390 #: templates/telemeta/mediaitem_detail.html:269 
     1491#: templates/telemeta/mediaitem_detail.html:274 
    13911492msgid "General informations" 
    13921493msgstr "" 
    13931494 
    1394 #: templates/telemeta/mediaitem_detail.html:271 
    1395 #: templates/telemeta/mediaitem_detail.html:315 
    1396 msgid "Remarks" 
    1397 msgstr "" 
    1398  
    1399 #: templates/telemeta/mediaitem_detail.html:287 
     1495#: templates/telemeta/mediaitem_detail.html:290 
    14001496msgid "Published references" 
    14011497msgstr "" 
     
    14051501msgstr "" 
    14061502 
    1407 #: templates/telemeta/mediaitem_edit.html:42 
     1503#: templates/telemeta/mediaitem_edit.html:44 
    14081504msgid "performance" 
    14091505msgstr "" 
     
    14261522msgstr "" 
    14271523 
    1428 #: templates/telemeta/profile_detail.html:8 views/base.py:1407 
     1524#: templates/telemeta/profile_detail.html:8 views/base.py:1482 
    14291525msgid "User profile" 
    14301526msgstr "" 
     
    14461542#: templates/telemeta/profile_detail.html:41 
    14471543msgid "Email" 
    1448 msgstr "" 
    1449  
    1450 #: templates/telemeta/profile_detail.html:44 
    1451 msgid "Department" 
    14521544msgstr "" 
    14531545 
     
    15061598msgstr "" 
    15071599 
    1508 #: templates/telemeta/search_criteria.html:94 
    1509 #: templates/telemeta/search_results.html:44 
     1600#: templates/telemeta/search_criteria.html:99 
     1601#: templates/telemeta/search_results.html:47 
    15101602#: templates/telemeta/inc/mediaitem_list.html:22 
    15111603msgid "Year of recording" 
    15121604msgstr "" 
    15131605 
    1514 #: templates/telemeta/search_criteria.html:101 
    1515 #: templates/telemeta/search_criteria.html:120 
    1516 #: templates/telemeta/search_results.html:46 
    1517 #: templates/telemeta/search_results.html:53 
     1606#: templates/telemeta/search_criteria.html:106 
     1607#: templates/telemeta/search_criteria.html:125 
     1608#: templates/telemeta/search_results.html:49 
     1609#: templates/telemeta/search_results.html:56 
    15181610msgid "to" 
    15191611msgstr "" 
    15201612 
    1521 #: templates/telemeta/search_criteria.html:113 
    1522 #: templates/telemeta/search_results.html:51 
     1613#: templates/telemeta/search_criteria.html:118 
     1614#: templates/telemeta/search_results.html:54 
    15231615msgid "Year of publication" 
    15241616msgstr "" 
     
    18061898msgstr "" 
    18071899 
    1808 #: views/base.py:248 views/base.py:438 views/base.py:609 views/base.py:929 
    1809 #: views/base.py:1406 
     1900#: views/base.py:248 views/base.py:447 views/base.py:618 views/base.py:1001 
     1901#: views/base.py:1481 
    18101902msgid "Access not allowed" 
    18111903msgstr "" 
    18121904 
    1813 #: views/base.py:250 views/base.py:440 views/base.py:611 views/base.py:931 
    1814 #: views/base.py:1408 
     1905#: views/base.py:250 views/base.py:449 views/base.py:620 views/base.py:1003 
     1906#: views/base.py:1483 
    18151907msgid "" 
    18161908"Please login or contact the website administator to get a private access." 
    18171909msgstr "" 
    18181910 
    1819 #: views/base.py:1438 
     1911#: views/base.py:1513 
    18201912msgid "Last changes" 
    18211913msgstr "" 
  • telemeta/locale/de/LC_MESSAGES/djangojs.po

    r66fb568 rc1baf24  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-04-02 17:22+0200\n" 
     11"POT-Creation-Date: 2012-05-30 13:14+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    1919"Plural-Forms: nplurals=2; plural=(n != 1)\n" 
    2020 
    21 #: htdocs/js/locale.js:2 
     21#: htdocs/js/locale.js:2 static/telemeta/js/locale.js:2 
    2222msgid "title" 
    2323msgstr "" 
    2424 
    25 #: htdocs/js/locale.js:3 
     25#: htdocs/js/locale.js:3 static/telemeta/js/locale.js:3 
    2626msgid "description" 
    2727msgstr "" 
    2828 
    29 #: htdocs/js/locale.js:4 
     29#: htdocs/js/locale.js:4 static/telemeta/js/locale.js:4 
    3030msgid "delete the marker permanently?" 
    3131msgstr "" 
    3232 
    33 #: htdocs/js/locale.js:5 
     33#: htdocs/js/locale.js:5 static/telemeta/js/locale.js:5 
    3434msgid "marker added to the selected playlist" 
    3535msgstr "" 
    3636 
    37 #: htdocs/js/locale.js:6 
     37#: htdocs/js/locale.js:6 static/telemeta/js/locale.js:6 
    3838msgid "item added to the selected playlist" 
    3939msgstr "" 
    4040 
    41 #: htdocs/js/locale.js:7 
     41#: htdocs/js/locale.js:7 static/telemeta/js/locale.js:7 
    4242msgid "collection added to the selected playlist" 
    4343msgstr "" 
    4444 
    45 #: htdocs/js/locale.js:8 
     45#: htdocs/js/locale.js:8 static/telemeta/js/locale.js:8 
    4646msgid "resource added to the selected playlist" 
    4747msgstr "" 
    4848 
    49 #: htdocs/js/locale.js:9 
     49#: htdocs/js/locale.js:9 static/telemeta/js/locale.js:9 
    5050msgid "there are unsaved or modified markers" 
    5151msgstr "" 
    5252 
    53 #: htdocs/js/locale.js:10 
     53#: htdocs/js/locale.js:10 static/telemeta/js/locale.js:10 
    5454msgid "If you exit the page you will loose your changes" 
    5555msgstr "" 
    5656 
    57 #: htdocs/js/locale.js:11 
     57#: htdocs/js/locale.js:11 static/telemeta/js/locale.js:11 
    5858msgid "author" 
    5959msgstr "" 
    6060 
    61 #: htdocs/js/locale.js:12 
     61#: htdocs/js/locale.js:12 static/telemeta/js/locale.js:12 
    6262msgid "Paste HTML to embed player in website" 
    6363msgstr "" 
    6464 
    65 #: htdocs/js/locale.js:13 
     65#: htdocs/js/locale.js:13 static/telemeta/js/locale.js:13 
    6666msgid "delete the item permanently?" 
    6767msgstr "" 
    6868 
    69 #: htdocs/js/locale.js:14 
     69#: htdocs/js/locale.js:14 static/telemeta/js/locale.js:14 
    7070msgid "delete the collection permanently?" 
    7171msgstr "" 
    7272 
    73 #: htdocs/js/locale.js:15 
     73#: htdocs/js/locale.js:15 static/telemeta/js/locale.js:15 
    7474msgid "delete the playlist permanently?" 
    7575msgstr "" 
    7676 
    77 #: htdocs/js/locale.js:16 
     77#: htdocs/js/locale.js:16 static/telemeta/js/locale.js:16 
    7878msgid "delete the resource from the playlist permanently?" 
    7979msgstr "" 
  • telemeta/locale/fr/LC_MESSAGES/django.po

    r66fb568 rc1baf24  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-04-02 17:22+0200\n" 
     11"POT-Creation-Date: 2012-05-30 13:14+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:455 
    29 #: models/system.py:102 
     28#: models/enum.py:41 models/enum.py:139 models/media.py:489 
     29#: models/system.py:103 
    3030msgid "value" 
    3131msgstr "valeur" 
    3232 
    33 #: models/enum.py:57 models/media.py:222 
     33#: models/enum.py:57 models/media.py:223 
    3434msgid "archive format" 
    3535msgstr "format du support" 
    3636 
    37 #: models/enum.py:64 models/media.py:205 
     37#: models/enum.py:64 models/media.py:206 
    3838msgid "secondary edition" 
    3939msgstr "réédition" 
    4040 
    41 #: models/enum.py:71 models/media.py:199 
     41#: models/enum.py:71 models/media.py:200 
    4242msgid "mode of acquisition" 
    4343msgstr "mode d'acquisition" 
    4444 
    45 #: models/enum.py:78 models/media.py:202 
     45#: models/enum.py:78 models/media.py:203 
    4646msgid "record author" 
    4747msgstr "rédacteur fiche" 
    4848 
    49 #: models/enum.py:85 models/media.py:209 
     49#: models/enum.py:85 models/media.py:210 
    5050msgid "record writer" 
    5151msgstr "saisie fiche" 
    5252 
    53 #: models/enum.py:92 models/media.py:195 
     53#: models/enum.py:92 models/media.py:196 
    5454msgid "legal rights" 
    5555msgstr "droit d'utilisation" 
    5656 
    57 #: models/enum.py:99 models/media.py:174 
     57#: models/enum.py:99 models/media.py:175 
    5858msgid "recording context" 
    5959msgstr "contexte d'enregistrement" 
     
    6161#: models/enum.py:106 
    6262msgid "A/D conversion" 
    63 msgstr "" 
    64  
    65 #: models/enum.py:113 models/media.py:334 
     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:336 
     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:426 
     73#: models/enum.py:127 models/media.py:460 
    7474msgid "keyword" 
    7575msgstr "Mot-clé" 
    7676 
    77 #: models/enum.py:134 models/media.py:185 
     77#: models/enum.py:134 models/media.py:186 
    7878msgid "publisher / status" 
    7979msgstr "éditeur / statut" 
     
    8383msgstr "éditeur" 
    8484 
    85 #: models/enum.py:153 models/enum.py:157 models/media.py:324 
     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:454 
     91#: models/media.py:488 
    9292msgid "name" 
    9393msgstr "nom" 
    9494 
    95 #: models/enum.py:171 models/media.py:689 
     95#: models/enum.py:172 models/format.py:77 
     96msgid "tape wheel diameter (cm)" 
     97msgstr "diamètre de bobine (cm)" 
     98 
     99#: models/enum.py:179 
    96100msgid "tape length (cm)" 
    97101msgstr "longueur de bande (cm)" 
    98102 
    99 #: models/enum.py:178 models/media.py:690 
     103#: models/enum.py:186 
    100104msgid "tape width (inch)" 
    101105msgstr "largeur de bande (pouce)" 
    102106 
    103 #: models/enum.py:185 models/media.py:691 
    104 msgid "tape speed (m/s)" 
    105 msgstr "vitesse de bande (m/s)" 
    106  
    107 #: models/enum.py:192 
     107#: models/enum.py:193 models/format.py:80 
     108msgid "tape speed (cm/s)" 
     109msgstr "vitesse de bande (cm/s)" 
     110 
     111#: models/enum.py:200 models/format.py:82 
    108112msgid "tape vendor" 
    109113msgstr "marque de bande" 
     114 
     115#: models/enum.py:207 models/format.py:71 
     116msgid "number of channels" 
     117msgstr "Nombre de pistes" 
     118 
     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/enum.py:228 models/media.py:320 
     128msgid "subject" 
     129msgstr "discipline" 
     130 
     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 
     134msgid "item" 
     135msgstr "item" 
     136 
     137#: models/format.py:61 
     138msgid "physical format" 
     139msgstr "nature du support original" 
     140 
     141#: models/format.py:62 models/media.py:354 
     142msgid "original code" 
     143msgstr "cote originale" 
     144 
     145#: models/format.py:63 
     146msgid "original number" 
     147msgstr "numéro de support" 
     148 
     149#: models/format.py:64 
     150msgid "original status" 
     151msgstr "status" 
     152 
     153#: models/format.py:65 
     154msgid "technical properties / conservation state" 
     155msgstr "état de conservation" 
     156 
     157#: models/format.py:66 
     158msgid "comments / notes" 
     159msgstr "commentaires / notes" 
     160 
     161#: models/format.py:68 
     162msgid "original location" 
     163msgstr "lieu d'archivage" 
     164 
     165#: models/format.py:72 
     166msgid "audio quality" 
     167msgstr "qualité audio" 
     168 
     169#: models/format.py:73 
     170msgid "recording system" 
     171msgstr "système d'enregistrement" 
     172 
     173#: models/format.py:78 
     174msgid "tape thickness (um)" 
     175msgstr "épaisseur de bande (um)" 
     176 
     177#: models/format.py:83 
     178msgid "tape reference" 
     179msgstr "référence de bande" 
     180 
     181#: models/format.py:84 
     182msgid "sticker presence" 
     183msgstr "présence de collants" 
     184 
     185#: models/format.py:88 
     186msgid "format" 
     187msgstr "format" 
    110188 
    111189#: models/instrument.py:57 
     
    121199msgstr "instrument parent" 
    122200 
    123 #: models/instrument.py:80 models/location.py:170 
     201#: models/instrument.py:80 models/location.py:171 
    124202msgid "alias" 
    125203msgstr "alias" 
     
    149227msgstr "type" 
    150228 
    151 #: models/language.py:55 models/media.py:207 
     229#: models/language.py:55 models/media.py:208 
    152230msgid "comment" 
    153231msgstr "commentaire" 
     232 
     233#: models/language.py:63 
     234msgid "languages" 
     235msgstr "langues" 
    154236 
    155237#: models/location.py:49 
     
    173255msgstr "lieu actuel" 
    174256 
    175 #: models/location.py:58 models/location.py:171 models/location.py:187 
     257#: models/location.py:58 models/location.py:172 models/location.py:188 
    176258msgid "authoritative" 
    177259msgstr "officiel" 
    178260 
    179 #: models/location.py:112 models/location.py:169 models/location.py:184 
    180 #: models/media.py:320 
     261#: models/location.py:112 models/location.py:170 models/location.py:185 
     262#: models/media.py:325 
    181263msgid "location" 
    182264msgstr "lieu" 
     
    186268msgstr "lieux" 
    187269 
    188 #: models/location.py:179 
     270#: models/location.py:166 
     271#, fuzzy 
     272msgid "lieux types" 
     273msgstr "lieux types" 
     274 
     275#: models/location.py:180 
    189276msgid "location aliases" 
    190 msgstr "location aliases" 
    191  
    192 #: models/location.py:185 
     277msgstr "lieux alias" 
     278 
     279#: models/location.py:186 
    193280msgid "ancestor location" 
    194281msgstr "lieu ancêtre" 
    195282 
    196 #: models/media.py:71 
     283#: models/location.py:194 
     284msgid "location relations" 
     285msgstr "lieux relations" 
     286 
     287#: models/media.py:72 
    197288msgid "Metadata only" 
    198289msgstr "Métadonnées uniquement" 
    199290 
    200 #: models/media.py:73 
     291#: models/media.py:74 
    201292msgid "Sound and metadata" 
    202293msgstr "Son et métadonnées" 
    203294 
    204 #: models/media.py:75 
     295#: models/media.py:76 
    205296msgid "Private data" 
    206297msgstr "Données privées" 
    207298 
    208 #: models/media.py:76 models/media.py:96 models/media.py:192 
    209 #: models/media.py:351 
     299#: models/media.py:77 models/media.py:97 models/media.py:193 
     300#: models/media.py:347 
    210301msgid "public access" 
    211302msgstr "accès public" 
    212303 
    213 #: models/media.py:92 models/media.py:122 models/media.py:170 
    214 #: models/media.py:311 models/media.py:474 models/media.py:490 
    215 #: models/media.py:521 
     304#: 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 
    216307msgid "title" 
    217308msgstr "titre" 
    218309 
    219 #: models/media.py:93 models/media.py:124 models/media.py:491 
    220 #: models/media.py:523 
     310#: models/media.py:94 models/media.py:125 models/media.py:525 
     311#: models/media.py:558 
    221312msgid "description" 
    222313msgstr "description" 
    223314 
    224 #: models/media.py:94 models/media.py:217 models/media.py:345 
     315#: models/media.py:95 models/media.py:218 models/media.py:353 
    225316msgid "code" 
    226317msgstr "cote" 
    227318 
    228 #: models/media.py:95 models/media.py:169 models/media.py:348 
     319#: models/media.py:96 models/media.py:170 
    229320msgid "reference" 
    230321msgstr "référence" 
    231322 
    232 #: models/media.py:123 models/media.py:522 models/media.py:541 
    233 #: models/system.py:114 
     323#: models/media.py:124 models/media.py:557 models/media.py:576 
     324#: models/system.py:115 
    234325msgid "date" 
    235326msgstr "" 
    236327 
    237 #: models/media.py:125 models/media.py:540 
     328#: models/media.py:126 models/media.py:575 
    238329msgid "mime_type" 
    239330msgstr "type mime" 
    240331 
    241 #: models/media.py:126 
     332#: models/media.py:127 
    242333msgid "url" 
    243334msgstr "" 
    244335 
    245 #: models/media.py:127 
     336#: models/media.py:128 
    246337msgid "credits" 
    247338msgstr "crédits" 
    248339 
    249 #: models/media.py:128 models/media.py:352 
     340#: models/media.py:129 models/media.py:368 
    250341msgid "file" 
    251342msgstr "fichier" 
    252343 
    253 #: models/media.py:171 models/media.py:312 
     344#: models/media.py:172 models/media.py:313 
    254345msgid "original title / translation" 
    255346msgstr "titre original / traduction" 
    256347 
    257 #: models/media.py:172 
     348#: models/media.py:173 
    258349msgid "depositor / contributor" 
    259350msgstr "déposant / contributeur" 
    260351 
    261 #: models/media.py:175 models/media.py:622 
     352#: models/media.py:176 models/media.py:658 
    262353msgid "recording year (from)" 
    263354msgstr "année d'enregistrement (depuis)" 
    264355 
    265 #: models/media.py:176 models/media.py:623 
     356#: models/media.py:177 models/media.py:659 
    266357msgid "recording year (until)" 
    267358msgstr "année d'enregistrement (jusqu'à)" 
    268359 
    269 #: models/media.py:177 
     360#: models/media.py:178 
    270361msgid "year published" 
    271362msgstr "année de parution" 
    272363 
    273 #: models/media.py:183 models/media.py:313 
     364#: models/media.py:184 models/media.py:356 
    274365msgid "recordist" 
    275 msgstr "collecteur" 
    276  
    277 #: models/media.py:187 
     366msgstr "opérateur d'enregistrement" 
     367 
     368#: models/media.py:188 
    278369msgid "publisher collection" 
    279370msgstr "collection éditeur" 
    280371 
    281 #: models/media.py:188 
     372#: models/media.py:189 
    282373msgid "publisher serial number" 
    283374msgstr "numéro dans la série" 
    284375 
    285 #: models/media.py:189 
     376#: models/media.py:190 
    286377msgid "author of published notice" 
    287378msgstr "auteur de la notice éditée" 
    288379 
    289 #: models/media.py:190 
     380#: models/media.py:191 
    290381msgid "bibliographic references" 
    291382msgstr "références bibliographiques" 
    292383 
    293 #: models/media.py:191 
     384#: models/media.py:192 
    294385msgid "document type" 
    295386msgstr "type de document" 
    296387 
    297 #: models/media.py:200 
     388#: models/media.py:201 
    298389msgid "CNRS depositor" 
    299390msgstr "déposant CNRS" 
    300391 
    301 #: models/media.py:203 
     392#: models/media.py:204 
    302393msgid "related documentation" 
    303394msgstr "documentation associée" 
    304395 
    305 #: models/media.py:206 
     396#: models/media.py:207 
    306397msgid "copies" 
    307398msgstr "autres exemplaires" 
    308399 
    309 #: models/media.py:210 
     400#: models/media.py:211 
    310401msgid "archiver notes" 
    311402msgstr "notes de l'archiviste" 
    312403 
    313 #: models/media.py:211 
     404#: models/media.py:212 
    314405msgid "items finished" 
    315406msgstr "fiches items faites" 
    316407 
    317 #: models/media.py:212 
     408#: models/media.py:213 
    318409msgid "recordist identical to depositor" 
    319410msgstr "collecteur identique au déposant" 
    320411 
    321 #: models/media.py:213 
     412#: models/media.py:214 
    322413msgid "published" 
    323414msgstr "édité" 
    324415 
    325 #: models/media.py:214 
     416#: models/media.py:215 
    326417msgid "conservation site" 
    327418msgstr "lieu de conservation" 
    328419 
    329 #: models/media.py:218 models/media.py:346 
     420#: models/media.py:219 
    330421msgid "old code" 
    331422msgstr "ancienne cote" 
    332423 
    333 #: models/media.py:219 models/media.py:355 
     424#: models/media.py:220 models/media.py:371 
    334425msgid "approximative duration" 
    335426msgstr "durée approximative" 
    336427 
    337 #: models/media.py:220 
     428#: models/media.py:221 
    338429msgid "number of components (medium / piece)" 
    339430msgstr "nb de composants (support / pièce)" 
    340431 
    341 #: models/media.py:224 
     432#: models/media.py:225 
    342433msgid "digitization" 
    343434msgstr "numérisation" 
    344435 
    345 #: models/media.py:225 models/media.py:685 
     436#: models/media.py:226 
    346437msgid "status" 
    347438msgstr "etat" 
    348439 
    349 #: models/media.py:226 
     440#: models/media.py:227 
    350441msgid "a_informer_07_03" 
    351442msgstr "a_informer_07_03" 
    352443 
    353 #: models/media.py:261 
     444#: models/media.py:262 
    354445msgid "states / nations" 
    355446msgstr "états / nations" 
    356447 
    357 #: models/media.py:275 
     448#: models/media.py:276 
    358449msgid "populations / social groups" 
    359450msgstr "populations / groupes sociaux" 
    360451 
    361 #: models/media.py:283 models/media.py:400 
     452#: models/media.py:284 models/media.py:416 
    362453msgid "computed duration" 
    363454msgstr "durée calculée" 
    364455 
    365 #: models/media.py:291 models/media.py:297 models/media.py:315 
     456#: models/media.py:292 models/media.py:298 models/media.py:315 
    366457msgid "collection" 
    367458msgstr "collection" 
    368459 
    369 #: models/media.py:301 models/media.py:302 
    370 #, fuzzy 
     460#: models/media.py:302 models/media.py:303 
    371461msgid "collection related media" 
    372 msgstr "média associés" 
     462msgstr "média associés à la collection" 
    373463 
    374464#: models/media.py:316 
     
    380470msgstr "date d'enregistrement (jusqu'à)" 
    381471 
     472#: models/media.py:319 
     473msgid "scientist" 
     474msgstr "reponsable scientifique" 
     475 
    382476#: models/media.py:321 
     477msgid "summary" 
     478msgstr "résumé" 
     479 
     480#: models/media.py:322 
     481msgid "remarks" 
     482msgstr "remarques" 
     483 
     484#: models/media.py:326 
    383485msgid "location details" 
    384486msgstr "précisions lieu" 
    385487 
    386 #: models/media.py:322 
     488#: models/media.py:327 
    387489msgid "cultural area" 
    388490msgstr "aire culturelle" 
    389491 
    390 #: models/media.py:325 
     492#: models/media.py:330 
    391493msgid "language" 
    392494msgstr "langue" 
    393495 
    394 #: models/media.py:327 
     496#: models/media.py:332 
    395497msgid "ISO language" 
    396498msgstr "Langue ISO" 
    397499 
    398 #: models/media.py:329 
     500#: models/media.py:334 
    399501msgid "comments / ethnographic context" 
    400502msgstr "commentaires / contexte ethnographique" 
    401503 
    402 #: models/media.py:330 
     504#: models/media.py:335 
    403505msgid "moda_execut" 
    404506msgstr "moda_execut" 
    405507 
    406 #: models/media.py:337 
     508#: models/media.py:342 
    407509msgid "author / compositor" 
    408510msgstr "auteur / compositeur" 
    409511 
    410 #: models/media.py:340 
    411 msgid "remarks" 
    412 msgstr "remarques" 
    413  
    414 #: models/media.py:341 
    415 msgid "recordist selection" 
    416 msgstr "sélection collecteur" 
    417  
    418 #: models/media.py:342 
    419 msgid "recordist as in collection" 
    420 msgstr "collecteur identique à la collection" 
    421  
    422 #: models/media.py:347 
     512#: models/media.py:343 
     513msgid "contributor" 
     514msgstr "intervenant" 
     515 
     516#: models/media.py:349 
     517msgid "depositor" 
     518msgstr "déposant" 
     519 
     520#: models/media.py:355 
    423521msgid "item number" 
    424522msgstr "n° de l'item" 
    425523 
    426 #: models/media.py:349 
     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 
    427553msgid "published references" 
    428554msgstr "références éditées" 
    429555 
    430 #: models/media.py:350 
     556#: models/media.py:365 
    431557msgid "copy of" 
    432558msgstr "copie de" 
    433559 
    434 #: models/media.py:362 templates/telemeta/mediaitem_edit.html:39 
     560#: models/media.py:378 templates/telemeta/mediaitem_edit.html:41 
    435561msgid "keywords" 
    436562msgstr "mots-clés" 
    437563 
    438 #: models/media.py:374 models/media.py:415 models/media.py:425 
    439 #: models/media.py:436 models/media.py:452 models/media.py:473 
    440 #: models/media.py:518 models/media.py:539 models/media.py:682 
    441 msgid "item" 
    442 msgstr "item" 
    443  
    444 #: models/media.py:419 models/media.py:420 
    445 #, fuzzy 
     564#: models/media.py:443 
     565msgid "instruments" 
     566msgstr "instruments" 
     567 
     568#: models/media.py:453 models/media.py:454 
    446569msgid "item related media" 
    447 msgstr "média associés" 
    448  
    449 #: models/media.py:438 
     570msgstr "média associés à l'item" 
     571 
     572#: models/media.py:472 
    450573msgid "composition" 
    451574msgstr "Voix / Instruments" 
    452575 
    453 #: models/media.py:440 
     576#: models/media.py:474 
    454577msgid "vernacular name" 
    455578msgstr "nom vernaculaire" 
    456579 
    457 #: models/media.py:441 
     580#: models/media.py:475 
    458581msgid "number" 
    459582msgstr "nombre" 
    460583 
    461 #: models/media.py:442 
     584#: models/media.py:476 
    462585msgid "interprets" 
    463586msgstr "interprètes" 
    464587 
    465 #: models/media.py:453 
     588#: models/media.py:487 
    466589msgid "id" 
    467590msgstr "" 
    468591 
    469 #: models/media.py:456 
     592#: models/media.py:490 
    470593msgid "unit" 
    471594msgstr "unité" 
    472595 
    473 #: models/media.py:475 
     596#: models/media.py:509 
    474597msgid "start" 
    475598msgstr "début" 
    476599 
    477 #: models/media.py:476 
     600#: models/media.py:510 
    478601msgid "end" 
    479602msgstr "fin" 
    480603 
    481 #: models/media.py:480 
     604#: models/media.py:514 
    482605msgid "item part" 
    483606msgstr "partie" 
    484607 
    485 #: models/media.py:488 models/media.py:504 models/media.py:519 
     608#: models/media.py:522 models/media.py:539 models/media.py:554 
    486609msgid "public_id" 
    487610msgstr "public_id" 
    488611 
    489 #: models/media.py:505 
     612#: models/media.py:540 
    490613msgid "playlist" 
    491614msgstr "liste de lecture" 
    492615 
    493 #: models/media.py:506 
     616#: models/media.py:541 
    494617msgid "resource_type" 
    495618msgstr "type de ressource" 
    496619 
    497 #: models/media.py:507 
     620#: models/media.py:542 
    498621msgid "resource_id" 
    499622msgstr "ressource" 
    500623 
    501 #: models/media.py:520 models/system.py:55 
     624#: models/media.py:555 models/system.py:55 
    502625msgid "time" 
    503626msgstr "heure" 
    504627 
    505 #: models/media.py:524 
     628#: models/media.py:559 
    506629msgid "author" 
    507630msgstr "auteur" 
    508631 
    509 #: models/media.py:542 
     632#: models/media.py:577 
    510633msgid "transcoded" 
    511634msgstr "" 
    512635 
    513 #: models/media.py:621 
     636#: models/media.py:657 
    514637msgid "collections" 
    515638msgstr "collections" 
    516639 
    517 #: models/media.py:633 models/media.py:634 models/media.py:643 
    518 #: models/media.py:660 
     640#: models/media.py:669 models/media.py:670 models/media.py:680 
     641#: models/media.py:697 
    519642msgid "corpus" 
    520643msgstr "corpus" 
    521644 
    522 #: models/media.py:653 models/media.py:654 models/media.py:671 
     645#: models/media.py:690 models/media.py:691 models/media.py:708 
    523646msgid "fonds" 
    524647msgstr "fonds" 
    525648 
    526 #: models/media.py:664 models/media.py:665 
     649#: models/media.py:701 models/media.py:702 
    527650msgid "corpus related media" 
    528651msgstr "média associés" 
    529652 
    530 #: models/media.py:675 models/media.py:676 
     653#: models/media.py:712 models/media.py:713 
    531654msgid "fonds related media" 
    532655msgstr "média associés" 
    533  
    534 #: models/media.py:683 
    535 msgid "original code" 
    536 msgstr "cote original" 
    537  
    538 #: models/media.py:684 
    539 #, fuzzy 
    540 msgid "tape number" 
    541 msgstr "n° de l'item" 
    542  
    543 #: models/media.py:686 
    544 msgid "conservation state" 
    545 msgstr "état de conservation" 
    546  
    547 #: models/media.py:687 
    548 msgid "comments" 
    549 msgstr "commentaires" 
    550  
    551 #: models/media.py:693 
    552 msgid "tape thickness (um)" 
    553 msgstr "épaisseur de bande (um)" 
    554  
    555 #: models/media.py:694 
    556 msgid "tape diameter (mm)" 
    557 msgstr "diamètre de bande (mm)" 
    558  
    559 #: models/media.py:695 
    560 msgid "tape reference" 
    561 msgstr "référence de bande" 
    562  
    563 #: models/media.py:699 
    564 msgid "format" 
    565 msgstr "format" 
    566656 
    567657#: models/system.py:52 
     
    585675msgstr "Institution" 
    586676 
    587 #: models/system.py:86 templates/telemeta/profile_detail.html:45 
     677#: models/system.py:86 templates/telemeta/profile_detail.html:44 
     678msgid "Department" 
     679msgstr "Département" 
     680 
     681#: models/system.py:87 
     682msgid "attachment" 
     683msgstr "rattachement" 
     684 
     685#: models/system.py:88 templates/telemeta/profile_detail.html:45 
    588686msgid "Function" 
    589687msgstr "Fonction" 
    590688 
    591 #: models/system.py:87 templates/telemeta/profile_detail.html:47 
     689#: models/system.py:89 templates/telemeta/profile_detail.html:47 
    592690msgid "Address" 
    593691msgstr "Adresse" 
    594692 
    595 #: models/system.py:88 templates/telemeta/profile_detail.html:48 
     693#: models/system.py:90 templates/telemeta/profile_detail.html:48 
    596694msgid "Telephone" 
    597695msgstr "Téléphone" 
    598696 
    599 #: models/system.py:89 
     697#: models/system.py:91 
    600698msgid "Expiration_date" 
    601699msgstr "Date d'expiration" 
    602700 
    603 #: models/system.py:90 
    604 #, fuzzy 
    605 msgid "Password initialization" 
    606 msgstr "Mot de passe (encore)" 
    607  
    608 #: models/system.py:101 
     701#: models/system.py:102 
    609702msgid "key" 
    610703msgstr "Mot-clé" 
    611704 
    612 #: models/system.py:115 templates/telemeta/inc/children_list.html:16 
     705#: models/system.py:116 templates/telemeta/inc/children_list.html:16 
    613706#: templates/telemeta/inc/collection_related.html:39 
    614707#: templates/telemeta/inc/mediaitem_related.html:39 
     
    618711msgstr "Description" 
    619712 
    620 #: models/system.py:117 
     713#: models/system.py:118 
    621714msgid "criteria" 
    622715msgstr "critères" 
     
    659752 
    660753#: templates/postman/base.html:14 templates/postman/write.html:3 
    661 #, fuzzy 
    662754msgid "Write" 
    663 msgstr "critères" 
     755msgstr "Ecrire" 
    664756 
    665757#: templates/postman/base.html:15 templates/telemeta/base.html:97 
     
    669761#: templates/postman/base.html:16 
    670762msgid "Trash" 
    671 msgstr "" 
     763msgstr "Corbeille" 
    672764 
    673765#: templates/postman/base_folder.html:8 
     
    676768 
    677769#: templates/postman/base_folder.html:13 
    678 #, fuzzy 
    679770msgid "by conversation" 
    680 msgstr "lieu de conservation" 
     771msgstr "par conversation" 
    681772 
    682773#: templates/postman/base_folder.html:14 
    683774msgid "by message" 
    684 msgstr "" 
     775msgstr "par message" 
    685776 
    686777#: templates/postman/base_folder.html:23 templates/telemeta/lists.html:75 
     
    713804#: templates/telemeta/collection_detail.html:217 
    714805#: templates/telemeta/lists.html:58 
    715 #: templates/telemeta/mediaitem_detail.html:340 
     806#: templates/telemeta/mediaitem_detail.html:346 
    716807#: templates/telemeta/resource_detail.html:102 
    717808msgid "Delete" 
     
    777868 
    778869#: templates/postman/email_user.txt:17 templates/postman/email_visitor.txt:16 
    779 #, fuzzy 
    780870msgid "The site administrator" 
    781 msgstr "Administration Telemeta" 
     871msgstr "L'administrateur du site" 
    782872 
    783873#: templates/postman/email_user.txt:19 templates/postman/email_visitor.txt:18 
     
    837927 
    838928#: templates/postman/view.html:5 
    839 #, fuzzy 
    840929msgid "Conversation" 
    841 msgstr "Enumération" 
     930msgstr "" 
    842931 
    843932#: templates/postman/view.html:5 
     
    871960 
    872961#: templates/telemeta/admin_enumerations.html:14 
    873 #: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_add.html:33 
    874 #: templates/telemeta/mediaitem_copy.html:34 
    875 #: templates/telemeta/mediaitem_edit.html:26 
    876 #: templates/telemeta/search_criteria.html:78 
    877 #: templates/telemeta/search_results.html:41 
     962#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_add.html:34 
     963#: templates/telemeta/mediaitem_copy.html:35 
     964#: templates/telemeta/mediaitem_edit.html:27 
     965#: templates/telemeta/search_criteria.html:83 
     966#: templates/telemeta/search_results.html:44 
    878967#: templates/telemeta/inc/children_list.html:15 
    879968#: templates/telemeta/inc/collection_list.html:13 
     
    9261015msgstr "Connexion" 
    9271016 
    928 #: templates/telemeta/base.html:75 templates/telemeta/search_criteria.html:138 
     1017#: templates/telemeta/base.html:75 templates/telemeta/search_criteria.html:143 
    9291018msgid "Search" 
    9301019msgstr "Recherche" 
     
    10021091#: templates/telemeta/instrument_edit_value.html:19 
    10031092#: templates/telemeta/mediaitem_add.html:15 
    1004 #: templates/telemeta/mediaitem_add.html:45 
     1093#: templates/telemeta/mediaitem_add.html:47 
    10051094#: templates/telemeta/mediaitem_copy.html:16 
    1006 #: templates/telemeta/mediaitem_copy.html:45 
     1095#: templates/telemeta/mediaitem_copy.html:47 
    10071096#: templates/telemeta/mediaitem_edit.html:10 
    1008 #: templates/telemeta/mediaitem_edit.html:37 
     1097#: templates/telemeta/mediaitem_edit.html:39 
    10091098#: templates/telemeta/mediaitem_keywords_edit.html:12 
    10101099#: templates/telemeta/mediaitem_keywords_edit.html:39 
     
    10291118#: templates/telemeta/enumeration_edit_value.html:17 
    10301119#: templates/telemeta/instrument_edit_value.html:17 
    1031 #: templates/telemeta/mediaitem_add.html:47 
    1032 #: templates/telemeta/mediaitem_copy.html:47 
    1033 #: templates/telemeta/mediaitem_edit.html:47 
     1120#: templates/telemeta/mediaitem_add.html:49 
     1121#: templates/telemeta/mediaitem_copy.html:49 
     1122#: templates/telemeta/mediaitem_edit.html:49 
    10341123#: templates/telemeta/mediaitem_keywords_edit.html:41 
    10351124#: templates/telemeta/mediaitem_performances_edit.html:45 
     
    10431132 
    10441133#: templates/telemeta/collection_detail.html:5 
    1045 #: templates/telemeta/collection_detail_dc.html:5 views/base.py:439 
     1134#: templates/telemeta/collection_detail_dc.html:5 views/base.py:448 
    10461135msgid "Collection" 
    10471136msgstr "Collection" 
     
    10501139#: templates/telemeta/collection_edit.html:31 templates/telemeta/lists.html:55 
    10511140#: templates/telemeta/mediaitem_detail.html:97 
    1052 #: templates/telemeta/mediaitem_edit.html:39 
    1053 #: templates/telemeta/mediaitem_edit.html:42 
    1054 #: templates/telemeta/mediaitem_edit.html:45 
     1141#: templates/telemeta/mediaitem_edit.html:41 
     1142#: templates/telemeta/mediaitem_edit.html:44 
     1143#: templates/telemeta/mediaitem_edit.html:47 
    10551144#: templates/telemeta/profile_detail.html:72 
    10561145#: templates/telemeta/resource_detail.html:43 
     
    10861175 
    10871176#: templates/telemeta/collection_detail.html:103 
    1088 #: templates/telemeta/mediaitem_detail.html:199 
     1177#: templates/telemeta/mediaitem_detail.html:204 
    10891178#: templates/telemeta/resource_detail.html:73 
    10901179msgid "Last modification" 
     
    10921181 
    10931182#: templates/telemeta/collection_detail.html:112 
    1094 #: templates/telemeta/mediaitem_detail.html:209 
     1183#: templates/telemeta/mediaitem_detail.html:214 
    10951184msgid "Geographic and cultural informations" 
    10961185msgstr "Indications géographiques et culturelles" 
     
    11081197 
    11091198#: templates/telemeta/collection_detail.html:152 
    1110 #: templates/telemeta/mediaitem_detail.html:281 
     1199#: templates/telemeta/mediaitem_detail.html:284 
    11111200msgid "Archiving data" 
    11121201msgstr "Données d'archivage" 
     
    11171206 
    11181207#: templates/telemeta/collection_detail.html:162 
     1208#: templates/telemeta/mediaitem_detail.html:315 
    11191209msgid "Comments" 
    11201210msgstr "Commentaires" 
    11211211 
    11221212#: templates/telemeta/collection_detail.html:176 
    1123 #: templates/telemeta/mediaitem_detail.html:297 
     1213#: templates/telemeta/mediaitem_detail.html:300 
    11241214msgid "Technical data" 
    11251215msgstr "Données techniques" 
    11261216 
    11271217#: templates/telemeta/collection_detail.html:181 
    1128 #: templates/telemeta/mediaitem_detail.html:300 
     1218#: templates/telemeta/mediaitem_detail.html:303 
    11291219msgid "Media type" 
    11301220msgstr "Type de media" 
     
    11501240 
    11511241#: templates/telemeta/collection_edit.html:31 
    1152 #: templates/telemeta/mediaitem_edit.html:45 
     1242#: templates/telemeta/mediaitem_edit.html:47 
    11531243#: templates/telemeta/resource_edit.html:31 
    11541244msgid "related media" 
     
    12191309#: templates/telemeta/enumeration_edit.html:31 
    12201310#: templates/telemeta/enumeration_edit_value.html:11 
    1221 #: templates/telemeta/mediaitem_detail.html:164 
     1311#: templates/telemeta/mediaitem_detail.html:166 
    12221312msgid "Value" 
    12231313msgstr "Valeur" 
     
    13081398msgstr "Type" 
    13091399 
    1310 #: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_add.html:34 
    1311 #: templates/telemeta/mediaitem_copy.html:35 
    1312 #: templates/telemeta/mediaitem_edit.html:27 
     1400#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_add.html:35 
     1401#: templates/telemeta/mediaitem_copy.html:36 
     1402#: templates/telemeta/mediaitem_edit.html:28 
    13131403#: templates/telemeta/inc/children_list.html:17 
    13141404#: templates/telemeta/inc/collection_list.html:14 
     
    13191409 
    13201410#: templates/telemeta/lists.html:74 
    1321 #: templates/telemeta/search_criteria.html:130 
    1322 #: templates/telemeta/search_results.html:58 
     1411#: templates/telemeta/search_criteria.html:135 
     1412#: templates/telemeta/search_results.html:61 
    13231413#: templates/telemeta/inc/collection_list.html:18 
    13241414#: templates/telemeta/inc/mediaitem_list.html:23 
     
    13461436#: templates/telemeta/mediaitem_add.html:5 
    13471437#: templates/telemeta/mediaitem_copy.html:5 
    1348 #: templates/telemeta/mediaitem_detail.html:5 views/base.py:610 
     1438#: templates/telemeta/mediaitem_detail.html:5 views/base.py:619 
    13491439msgid "Item" 
    13501440msgstr "Item" 
     
    13601450msgstr "Suivant" 
    13611451 
    1362 #: templates/telemeta/mediaitem_detail.html:153 
     1452#: templates/telemeta/mediaitem_detail.html:155 
    13631453msgid "Analysis" 
    13641454msgstr "Analyse" 
    13651455 
    1366 #: templates/telemeta/mediaitem_detail.html:155 
     1456#: templates/telemeta/mediaitem_detail.html:157 
    13671457msgid "Markers" 
    13681458msgstr "Marqueurs" 
    13691459 
    1370 #: templates/telemeta/mediaitem_detail.html:163 
     1460#: templates/telemeta/mediaitem_detail.html:165 
    13711461msgid "Property" 
    13721462msgstr "Propriété" 
    13731463 
    1374 #: templates/telemeta/mediaitem_detail.html:165 
     1464#: templates/telemeta/mediaitem_detail.html:167 
    13751465msgid "Unit" 
    13761466msgstr "Unité" 
    13771467 
    1378 #: templates/telemeta/mediaitem_detail.html:173 
     1468#: templates/telemeta/mediaitem_detail.html:175 
    13791469msgid "Download:" 
    13801470msgstr "Téléchargement:" 
    13811471 
    1382 #: templates/telemeta/mediaitem_detail.html:194 
     1472#: templates/telemeta/mediaitem_detail.html:196 
    13831473msgid "Recording date" 
    13841474msgstr "Date d'enregistrement" 
    13851475 
    1386 #: templates/telemeta/mediaitem_detail.html:211 
     1476#: templates/telemeta/mediaitem_detail.html:200 
     1477msgid "Remarks" 
     1478msgstr "Remarques" 
     1479 
     1480#: templates/telemeta/mediaitem_detail.html:216 
    13871481#: templates/telemeta/inc/mediaitem_list.html:18 
    13881482msgid "Location" 
    13891483msgstr "Lieu" 
    13901484 
    1391 #: templates/telemeta/mediaitem_detail.html:217 
     1485#: templates/telemeta/mediaitem_detail.html:222 
    13921486msgid "Language ISO" 
    13931487msgstr "Langue ISO" 
    13941488 
    1395 #: templates/telemeta/mediaitem_detail.html:221 
     1489#: templates/telemeta/mediaitem_detail.html:226 
    13961490msgid "Ethnographic context" 
    13971491msgstr "Contexte ethnographique" 
    13981492 
    1399 #: templates/telemeta/mediaitem_detail.html:232 
     1493#: templates/telemeta/mediaitem_detail.html:237 
    14001494msgid "Musical informations" 
    14011495msgstr "Informations sur la musique" 
    14021496 
    1403 #: templates/telemeta/mediaitem_detail.html:269 
     1497#: templates/telemeta/mediaitem_detail.html:274 
    14041498msgid "General informations" 
    14051499msgstr "Informations générales" 
    14061500 
    1407 #: templates/telemeta/mediaitem_detail.html:271 
    1408 #: templates/telemeta/mediaitem_detail.html:315 
    1409 msgid "Remarks" 
    1410 msgstr "Remarques" 
    1411  
    1412 #: templates/telemeta/mediaitem_detail.html:287 
     1501#: templates/telemeta/mediaitem_detail.html:290 
    14131502msgid "Published references" 
    14141503msgstr "Références éditées" 
     
    14181507msgstr "Item introuvable" 
    14191508 
    1420 #: templates/telemeta/mediaitem_edit.html:42 
     1509#: templates/telemeta/mediaitem_edit.html:44 
    14211510msgid "performance" 
    14221511msgstr "composition" 
     
    14391528msgstr "Profil utilisateur" 
    14401529 
    1441 #: templates/telemeta/profile_detail.html:8 views/base.py:1407 
     1530#: templates/telemeta/profile_detail.html:8 views/base.py:1482 
    14421531msgid "User profile" 
    14431532msgstr "Profil utilisateur" 
     
    14601549msgid "Email" 
    14611550msgstr "Courriel" 
    1462  
    1463 #: templates/telemeta/profile_detail.html:44 
    1464 msgid "Department" 
    1465 msgstr "Département" 
    14661551 
    14671552#: templates/telemeta/profile_detail.html:46 
     
    15191604msgstr "Recherche avancée" 
    15201605 
    1521 #: templates/telemeta/search_criteria.html:94 
    1522 #: templates/telemeta/search_results.html:44 
     1606#: templates/telemeta/search_criteria.html:99 
     1607#: templates/telemeta/search_results.html:47 
    15231608#: templates/telemeta/inc/mediaitem_list.html:22 
    15241609msgid "Year of recording" 
    15251610msgstr "Année d'enregistrement" 
    15261611 
    1527 #: templates/telemeta/search_criteria.html:101 
    1528 #: templates/telemeta/search_criteria.html:120 
    1529 #: templates/telemeta/search_results.html:46 
    1530 #: templates/telemeta/search_results.html:53 
     1612#: templates/telemeta/search_criteria.html:106 
     1613#: templates/telemeta/search_criteria.html:125 
     1614#: templates/telemeta/search_results.html:49 
     1615#: templates/telemeta/search_results.html:56 
    15311616msgid "to" 
    15321617msgstr "à" 
    15331618 
    1534 #: templates/telemeta/search_criteria.html:113 
    1535 #: templates/telemeta/search_results.html:51 
     1619#: templates/telemeta/search_criteria.html:118 
     1620#: templates/telemeta/search_results.html:54 
    15361621msgid "Year of publication" 
    15371622msgstr "Année de publication" 
     
    18251910msgstr "mots clés" 
    18261911 
    1827 #: views/base.py:248 views/base.py:438 views/base.py:609 views/base.py:929 
    1828 #: views/base.py:1406 
     1912#: views/base.py:248 views/base.py:447 views/base.py:618 views/base.py:1001 
     1913#: views/base.py:1481 
    18291914msgid "Access not allowed" 
    18301915msgstr "Accès non autorisé" 
    18311916 
    1832 #: views/base.py:250 views/base.py:440 views/base.py:611 views/base.py:931 
    1833 #: views/base.py:1408 
     1917#: views/base.py:250 views/base.py:449 views/base.py:620 views/base.py:1003 
     1918#: views/base.py:1483 
    18341919msgid "" 
    18351920"Please login or contact the website administator to get a private access." 
     
    18381923"pour obtenir un accès privé." 
    18391924 
    1840 #: views/base.py:1438 
     1925#: views/base.py:1513 
    18411926msgid "Last changes" 
    18421927msgstr "Dernières modifications" 
     1928 
     1929#~ msgid "domain" 
     1930#~ msgstr "discipline" 
     1931 
     1932#, fuzzy 
     1933#~ msgid "channel number" 
     1934#~ msgstr "n° de l'item" 
     1935 
     1936#~ msgid "original format" 
     1937#~ msgstr "support original" 
     1938 
     1939#, fuzzy 
     1940#~ msgid "Password initialization" 
     1941#~ msgstr "Mot de passe (encore)" 
    18431942 
    18441943#~ msgid "support number" 
  • telemeta/locale/fr/LC_MESSAGES/djangojs.po

    r66fb568 rc1baf24  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-04-02 17:22+0200\n" 
     11"POT-Creation-Date: 2012-05-30 13:14+0200\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n" 
     
    1919"Plural-Forms: nplurals=2; plural=n>1\n" 
    2020 
    21 #: htdocs/js/locale.js:2 
     21#: htdocs/js/locale.js:2 static/telemeta/js/locale.js:2 
    2222msgid "title" 
    2323msgstr "titre" 
    2424 
    25 #: htdocs/js/locale.js:3 
     25#: htdocs/js/locale.js:3 static/telemeta/js/locale.js:3 
    2626msgid "description" 
    2727msgstr "description" 
    2828 
    29 #: htdocs/js/locale.js:4 
     29#: htdocs/js/locale.js:4 static/telemeta/js/locale.js:4 
    3030msgid "delete the marker permanently?" 
    3131msgstr "supprimer le marqueur définitivement ?" 
    3232 
    33 #: htdocs/js/locale.js:5 
     33#: htdocs/js/locale.js:5 static/telemeta/js/locale.js:5 
    3434msgid "marker added to the selected playlist" 
    3535msgstr "marqueur ajouté à la liste de lecture" 
    3636 
    37 #: htdocs/js/locale.js:6 
     37#: htdocs/js/locale.js:6 static/telemeta/js/locale.js:6 
    3838msgid "item added to the selected playlist" 
    3939msgstr "item ajouté à la liste de lecture" 
    4040 
    41 #: htdocs/js/locale.js:7 
     41#: htdocs/js/locale.js:7 static/telemeta/js/locale.js:7 
    4242msgid "collection added to the selected playlist" 
    4343msgstr "collection ajoutée à la liste de lecture" 
    4444 
    45 #: htdocs/js/locale.js:8 
     45#: htdocs/js/locale.js:8 static/telemeta/js/locale.js:8 
    4646msgid "resource added to the selected playlist" 
    4747msgstr "ressource ajoutée à la liste de lecture" 
    4848 
    49 #: htdocs/js/locale.js:9 
     49#: htdocs/js/locale.js:9 static/telemeta/js/locale.js:9 
    5050msgid "there are unsaved or modified markers" 
    5151msgstr "il y a des marqueurs modifiés ou non sauvegardés" 
    5252 
    53 #: htdocs/js/locale.js:10 
     53#: htdocs/js/locale.js:10 static/telemeta/js/locale.js:10 
    5454msgid "If you exit the page you will loose your changes" 
    5555msgstr "Si vous sortez de la page, vous perdrez vos modifications" 
    5656 
    57 #: htdocs/js/locale.js:11 
     57#: htdocs/js/locale.js:11 static/telemeta/js/locale.js:11 
    5858msgid "author" 
    5959msgstr "auteur" 
    6060 
    61 #: htdocs/js/locale.js:12 
     61#: htdocs/js/locale.js:12 static/telemeta/js/locale.js:12 
    6262msgid "Paste HTML to embed player in website" 
    6363msgstr "Coller le code HTML pour inclure le lecteur dans un site" 
    6464 
    65 #: htdocs/js/locale.js:13 
     65#: htdocs/js/locale.js:13 static/telemeta/js/locale.js:13 
    6666msgid "delete the item permanently?" 
    6767msgstr "supprimer l'item définitivement ?" 
    6868 
    69 #: htdocs/js/locale.js:14 
     69#: htdocs/js/locale.js:14 static/telemeta/js/locale.js:14 
    7070msgid "delete the collection permanently?" 
    7171msgstr "supprimer la collection définitivement ?" 
    7272 
    73 #: htdocs/js/locale.js:15 
     73#: htdocs/js/locale.js:15 static/telemeta/js/locale.js:15 
    7474msgid "delete the playlist permanently?" 
    7575msgstr "supprimer la liste de lecture définitivement ?" 
    7676 
    77 #: htdocs/js/locale.js:16 
     77#: htdocs/js/locale.js:16 static/telemeta/js/locale.js:16 
    7878msgid "delete the resource from the playlist permanently?" 
    7979msgstr "supprimer la ressource de la liste de lecture définitivement ?" 
  • telemeta/management/commands/telemeta-init-formats.py

    rc8cdfbe r6b3e6e5  
    1818        file = open(path, 'r') 
    1919        for format in file.readlines(): 
    20             if not OriginalFormat.objects.filter(value=format): 
    21                 format = OriginalFormat(value=format) 
     20            if not PhysicalFormat.objects.filter(value=format): 
     21                format = PhysicalFormat(value=format) 
    2222                format.save() 
    2323 
  • telemeta/models/core.py

    r3511758 rbc866e5  
    347347        return required 
    348348 
    349     def save(self, force_insert=False, force_update=False): 
     349    def save(self, force_insert=False, force_update=False, *args, **kwargs): 
    350350        required = self.required_fields() 
    351351        for field in required: 
    352352            if not getattr(self, field.name): 
    353353                raise RequiredFieldError(self, field) 
    354         super(ModelCore, self).save(force_insert, force_update) 
     354        super(ModelCore, self).save(force_insert, force_update, *args, **kwargs) 
    355355 
    356356    @classmethod 
  • telemeta/models/enum.py

    rc8cdfbe r64bc9e8  
    165165 
    166166# Tape formats 
    167 class WheelDiameter(Enumeration): 
     167class TapeWheelDiameter(Enumeration): 
    168168    "Tape wheel diameter (cm)" 
    169169 
     
    187187 
    188188class TapeSpeed(Enumeration): 
    189     "Tape speed (m/s)" 
     189    "Tape speed (cm/s)" 
    190190 
    191191    class Meta(MetaEnumeration): 
    192192        db_table = 'tape_speed' 
    193         verbose_name = _("tape speed (m/s)") 
     193        verbose_name = _("tape speed (cm/s)") 
    194194 
    195195class TapeVendor(Enumeration): 
     
    200200        verbose_name = _("tape vendor") 
    201201 
    202 class OriginalFormat(Enumeration): 
    203     "Item original format" 
    204  
    205     class Meta(MetaEnumeration): 
    206         db_table = 'original_format' 
    207         verbose_name = _("original format") 
    208  
     202class NumberOfChannels(Enumeration): 
     203    "Number of channels" 
     204 
     205    class Meta(MetaEnumeration): 
     206        db_table = 'original_channel_number' 
     207        verbose_name = _("number of channels") 
     208 
     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") 
     222 
     223class Subject(Enumeration): 
     224    "Scientific subject" 
     225 
     226    class Meta(MetaEnumeration): 
     227        db_table = 'subject' 
     228        verbose_name = _("subject") 
  • telemeta/models/format.py

    r57305a5 rc1baf24  
    4040from django.core.exceptions import ValidationError 
    4141from telemeta.models.core import * 
    42 from telemeta.models.enum import ContextKeyword 
    4342from telemeta.util.unaccent import unaccent_icmp 
    44 from telemeta.models.location import LocationRelation, Location 
    45 from telemeta.models.system import Revision 
     43from telemeta.models.location import * 
     44from telemeta.models.system import * 
    4645from telemeta.models.query import * 
    4746from telemeta.models.instrument import * 
     
    5554    """ Physical format object as proposed by the LAM""" 
    5655 
    57     original_format = WeakForeignKey(OriginalFormat, related_name="format", 
    58                                      verbose_name = _("original format")) 
    59     original_code = CharField(_('original code'), required=True) 
    60     original_format_number = CharField(_('original format number')) 
    61     status = CharField(_('status')) 
    62     conservation_state = TextField(_('technical properties / conservation state')) 
    63     comments = TextField(_('comments / notes')) 
     56    element_type          = 'format' 
     57 
     58    item                  = ForeignKey('MediaItem', related_name="format", verbose_name = _("item"), 
     59                                       blank=True, null=True, on_delete=models.SET_NULL) 
     60    physical_format       = WeakForeignKey(PhysicalFormat, related_name="format", 
     61                                     verbose_name = _("physical format")) 
     62    original_code         = CharField(_('original code')) 
     63    original_number       = CharField(_('original number')) 
     64    original_status       = CharField(_('original status')) 
     65    original_state        = TextField(_('technical properties / conservation state')) 
     66    original_comments     = TextField(_('comments / notes')) 
     67    original_location     = ForeignKey('Location', related_name="format", 
     68                                       verbose_name = _("original location"), 
     69                                       blank=True, null=True, on_delete=models.SET_NULL) 
     70    original_channels     = WeakForeignKey(NumberOfChannels, related_name="format", 
     71                                        verbose_name = _("number of channels")) 
     72    original_audio_quality = TextField(_('audio quality')) 
     73    recording_system      = CharField(_('recording system')) 
    6474 
    6575    # Tapes 
    66     wheel_diameter = WeakForeignKey(WheelDiameter, related_name="format", 
    67                                     verbose_name = _("tape wheel diameter")) 
    68     tape_width  = WeakForeignKey(TapeWidth, related_name="format", 
    69                                  verbose_name = _("tape width (inch)")) 
    70     tape_thickness = CharField(_('tape thickness (um)')) 
    71     tape_diameter = CharField(_('tape diameter (mm)')) 
    72     tape_speed = WeakForeignKey(TapeSpeed, related_name="format", verbose_name = _("tape speed (m/s)")) 
    73     tape_vendor = WeakForeignKey(TapeVendor, related_name="format", verbose_name = _("tape vendor")) 
    74     tape_reference = CharField(_('tape reference')) 
    75     sticker_presence = BooleanField(_('sticker presence')) 
    76     recording_system = CharField(_('recording system')) 
    77     channels = IntegerField(_("number of channels")) 
    78     audio_quality = TextField(_('audio quality')) 
     76    tape_wheel_diameter = WeakForeignKey(TapeWheelDiameter, related_name="format", 
     77                                        verbose_name = _("tape wheel diameter (cm)")) 
     78    tape_thickness      = CharField(_('tape thickness (um)')) 
     79    tape_speed          = WeakForeignKey(TapeSpeed, related_name="format", 
     80                                        verbose_name = _("tape speed (cm/s)")) 
     81    tape_vendor         = WeakForeignKey(TapeVendor, related_name="format", 
     82                                        verbose_name = _("tape vendor")) 
     83    tape_reference      = CharField(_('tape reference')) 
     84    sticker_presence    = BooleanField(_('sticker presence')) 
    7985 
    8086    class Meta(MetaCore): 
     
    8389 
    8490    def __unicode__(self): 
    85         return self.original_format 
     91        if self.physical_format: 
     92            return ' - '.join([self.physical_format.value, self.original_code, 
     93                               self.item.public_id]) 
     94        else: 
     95            return 'Unknown' 
    8696 
    8797    @property 
  • 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

    r03ca023 r64bc9e8  
    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    subject               = WeakForeignKey('Subject', verbose_name=_('subject')) 
     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')) 
    350     original_format       = ForeignKey(Format, related_name="item", 
    351                                        verbose_name=_('original format'), blank=True, 
    352                                         null=True, on_delete=models.SET_NULL) 
     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')) 
    353364    external_references   = TextField(_('published references')) 
    354365    copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of')) 
    355     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata") 
     366 
     367    # Media 
    356368    file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename") 
    357369 
     
    359371    approx_duration       = DurationField(_('approximative duration')) 
    360372 
    361     # All 
     373    # Manager 
    362374    objects               = MediaItemManager() 
    363375 
     
    522534class PlaylistResource(ModelCore): 
    523535    "Playlist components" 
    524     RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'), ('marker', 'marker'), ('fonds', 'fonds'), ('corpus', 'corpus')) 
     536    RESOURCE_TYPE_CHOICES = (('item', 'item'), ('collection', 'collection'), 
     537                             ('marker', 'marker'), ('fonds', 'fonds'), ('corpus', 'corpus')) 
    525538    element_type = 'playlist_resource' 
    526539    public_id          = CharField(_('public_id'), required=True) 
     
    641654    children_type = 'collections' 
    642655 
    643     children = models.ManyToManyField(MediaCollection, related_name="corpus", verbose_name=_('collections'),  blank=True, null=True) 
     656    children = models.ManyToManyField(MediaCollection, related_name="corpus", 
     657                                      verbose_name=_('collections'),  blank=True, null=True) 
    644658    recorded_from_year    = IntegerField(_('recording year (from)')) 
    645659    recorded_to_year      = IntegerField(_('recording year (until)')) 
     
    663677    children_type = 'corpus' 
    664678 
    665     children = models.ManyToManyField(MediaCorpus, related_name="fonds", verbose_name=_('corpus'), blank=True, null=True) 
     679    children = models.ManyToManyField(MediaCorpus, related_name="fonds", 
     680                                      verbose_name=_('corpus'), blank=True, null=True) 
    666681 
    667682    objects = MediaFondsManager() 
  • telemeta/templates/telemeta/mediaitem_add.html

    r566f17d rc89e8e54  
    2323       <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul> 
    2424       <table> 
     25       {% for form in forms %} 
    2526        {% for field in form %} 
    2627            <tr> 
    27             {% if field.html_name == "copied_from_item" %} 
     28            {% if field.html_name in hidden_fields %} 
    2829                <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td> 
    2930            {% else %} 
     
    3940            {% endif %} 
    4041            </tr> 
    41     {% endfor %} 
     42        {% endfor %} 
     43       {% endfor %} 
    4244       </table> 
    4345       <div align="center" style="margin-top:3ex;"> 
  • telemeta/templates/telemeta/mediaitem_copy.html

    r566f17d r5addd73  
    1919 
    2020{% block content %} 
    21   {% block infos %}     
     21  {% block infos %} 
    2222    <div class="infos"> 
    2323     <form enctype="multipart/form-data" id="_mediaItemCopyForm" method="post" action="">{% csrf_token %} 
    2424     <ul>{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</ul> 
    2525      <table> 
     26      {% for form in forms %} 
    2627       {% for field in form %} 
    2728            <tr> 
    28             {% if field.html_name == "copied_from_item" %} 
     29            {% if field.html_name in hidden_fields %} 
    2930                <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td> 
    3031            {% else %} 
     
    4142            </tr> 
    4243       {% endfor %} 
     44       {% endfor %} 
    4345       </table> 
    4446       <div align="center" style="margin-top:3ex;"> 
     
    4951     </form> 
    5052    </div> 
    51   {% endblock infos %}   
     53  {% endblock infos %} 
    5254{% endblock %} 
    5355 
  • telemeta/templates/telemeta/mediaitem_detail.html

    rffcaa31 ra7f10c1  
    197197 
    198198            <dd>{% if item.recorded_from_date %}{{ item.recorded_from_date }}{% endif %}{% if item.recorded_from_date and item.recorded_to_date%} - {% endif %}{% if item.recorded_to_date %}{{ item.recorded_to_date}}{% endif %}</dd> 
     199 
     200            <dt>{% trans "Remarks" %}</dt> 
     201            <dd>{{ item.comment|html_line_break|safe }}</dd> 
    199202 
    200203            {% if last_revision %} 
     
    271274            <h4><a href="#">{% trans "General informations" %}</a></h4> 
    272275            <dl class="listing"> 
    273                 <dt>{% trans "Remarks" %}</dt> 
    274                 <dd>{{ item.comment|html_line_break|safe }}</dd> 
    275                 {% dl_field item "collector_selection" %} 
     276 
    276277            </dl> 
    277278        </div> 
     
    300301            <div> 
    301302                <dl class="listing"> 
    302                 <dt>{% trans "Media type" %}</dt><dd>{% trans mime_type|mime_to_media_type %}</dd> 
     303                    <dt>{% trans "Media type" %}</dt> 
     304                    <dd>{% trans mime_type|mime_to_media_type %}</dd> 
    303305                    {% dl_field item "approx_duration" %} 
    304306 
    305                     {% if physical_format %} 
    306                      {% dl_field physical_format "original_code" %} 
    307                      {% dl_field physical_format "tape_number" %} 
    308                      {% dl_field physical_format "status" %} 
    309                      {% dl_field physical_format "conservation_state" %} 
    310                      {% dl_field physical_format "tape_length" %} 
    311                      {% dl_field physical_format "tape_width" %} 
    312                      {% dl_field physical_format "tape_speed" %} 
    313                      {% dl_field physical_format "tape_vendor" %} 
    314                      {% dl_field physical_format "tape_thickness" %} 
    315                      {% dl_field physical_format "tape_diameter" %} 
    316                      {% dl_field physical_format "tape_reference" %} 
    317                      <dt>{% trans "Remarks" %}</dt> 
    318                      <dd>{{ physical_format.comments|html_line_break|safe }}</dd> 
     307                    {% if format %} 
     308                     {% dl_field format "physical_format" %} 
     309                     {% dl_field format "original_code" %} 
     310                     {% dl_field format "original_number" %} 
     311                     {% dl_field format "original_status" %} 
     312                     {% dl_field format "original_location" %} 
     313                     {% dl_field format "original_state" %} 
     314                     {% dl_field format "original_audio_quality" %} 
     315                     <dt>{% trans "Comments" %}</dt> 
     316                     <dd>{{ format.original_comments|html_line_break|safe }}</dd> 
     317                     {% dl_field format "tape_wheel_diameter" %} 
     318                     {% dl_field format "tape_thickness" %} 
     319                     {% dl_field format "tape_speed" %} 
     320                     {% dl_field format "tape_vendor" %} 
     321                     {% dl_field format "tape_reference" %} 
     322                     {% dl_field format "sticker_presence" %} 
    319323                    {% endif %} 
    320324                </dl> 
  • telemeta/templates/telemeta/mediaitem_edit.html

    rc02171b rbc866e5  
    1111{% endblock %} 
    1212 
    13 {% block infos %}     
     13{% block infos %} 
    1414<div class="infos"> 
    15     <form enctype="multipart/form-data" id="_editItemForm" method="post" action="">{% csrf_token %}    
     15    <form enctype="multipart/form-data" id="_editItemForm" method="post" action="">{% csrf_token %} 
    1616    <table> 
     17    {% for form in forms %} 
    1718    <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr> 
    1819    {% for field in form %} 
    1920    <tr> 
    20     {% if field.html_name == "copied_from_item" %} 
     21    {% if field.html_name in hidden_fields %} 
    2122        <td>{{ field.label_tag.as_hidden }}{{ field.as_hidden }}</td> 
    2223    {% else %} 
     
    3233    {% endif %} 
    3334    </tr> 
     35    {% endfor %} 
    3436    {% endfor %} 
    3537    </table> 
     
    5254{% endblock infos %} 
    5355 
    54 {% block related %}  
     56{% block related %} 
    5557{% endblock %} 
    5658 
  • telemeta/templates/telemeta/profile_edit.html

    r566f17d r5d9d2cc  
    3131   onclick="document.getElementById('_editUserProfileForm').submit(); return false;">{% trans "Save" %}</a> 
    3232        </div> 
    33        </form>         
     33       </form> 
    3434      </div> 
    3535{% endblock %} 
  • telemeta/views/base.py

    r57305a5 r4e5ae69  
    226226            sound_pub_items = None 
    227227 
    228         revisions = get_revisions(4) 
     228        revisions = get_revisions(25) 
    229229        context = RequestContext(request, { 
    230230                    'page_content': pages.get_page_content(request, 'home', ignore_slash_issue=True), 
     
    660660            last_revision = None 
    661661 
    662         physical_format = item.original_format 
     662        format = '' 
     663        if Format.objects.filter(item=item): 
     664            format = item.format.get() 
    663665 
    664666        return render(request, template, 
     
    669671                    'public_access': public_access, 'width': width, 'height': height, 
    670672                    'related_media': related_media, 'mime_type': mime_type, 'last_revision': last_revision, 
    671                     'physical_format': physical_format, 
     673                    'format': format, 
    672674                    }) 
    673675 
     
    700702            mime_type = 'video/mp4' 
    701703 
    702         if request.method == 'POST': 
    703             form = MediaItemForm(data=request.POST, files=request.FILES, instance=item) 
    704             if form.is_valid(): 
    705                 form.save() 
    706                 code = form.cleaned_data['code'] 
     704        format, created = Format.objects.get_or_create(item=item) 
     705 
     706        if request.method == 'POST': 
     707            item_form = MediaItemForm(data=request.POST, files=request.FILES, instance=item, prefix='item') 
     708            format_form = FormatForm(data=request.POST, instance=format, prefix='format') 
     709            if item_form.is_valid() and format_form.is_valid(): 
     710                item_form.save() 
     711                format_form.save() 
     712                code = item_form.cleaned_data['code'] 
    707713                if not code: 
    708714                    code = str(item.id) 
    709                 if form.files: 
     715                if item_form.files: 
    710716                    self.cache_data.delete_item_data(code) 
    711717                    self.cache_export.delete_item_data(code) 
     
    719725                return HttpResponseRedirect('/archives/items/'+code) 
    720726        else: 
    721             form = MediaItemForm(instance=item) 
     727            item_form = MediaItemForm(instance=item, prefix='item') 
     728            format_form = FormatForm(instance=format, prefix='format') 
     729 
     730        forms = [item_form, format_form] 
     731        hidden_fields = ['item-copied_from_item', 'format-item'] 
    722732 
    723733        return render(request, template, 
    724734                    {'item': item, 'export_formats': formats, 
    725735                    'visualizers': graphers, 'visualizer_id': grapher_id, 
    726                     'audio_export_enabled': getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True), "form": form, 
    727                     'previous' : previous, 'next' : next, 'mime_type': mime_type, 
     736                    'audio_export_enabled': getattr(settings, 'TELEMETA_DOWNLOAD_ENABLED', True), 
     737                    'forms': forms, 'previous' : previous, 'next' : next, 'mime_type': mime_type, 
     738                    'hidden_fields': hidden_fields, 
    728739                    }) 
    729740 
     
    758769            code = auto_code(items, collection.code) 
    759770            item = MediaItem(collection=collection, code=code) 
     771            format, created = Format.objects.get_or_create(item=item) 
    760772        else: 
    761773            item = MediaItem() 
    762         if request.method == 'POST': 
    763             form = MediaItemForm(data=request.POST, files=request.FILES, instance=item) 
    764             if form.is_valid(): 
    765                 form.save() 
     774            format = Format() 
     775 
     776        if request.method == 'POST': 
     777            item_form = MediaItemForm(data=request.POST, files=request.FILES, instance=item, prefix='item') 
     778            format_form = FormatForm(data=request.POST, instance=format, prefix='format') 
     779            if item_form.is_valid() and format_form.is_valid(): 
     780                item_form.save() 
    766781                item.set_revision(request.user) 
    767                 code = form.cleaned_data['code'] 
     782                format.item = item 
     783                format_form.save() 
     784                code = item_form.cleaned_data['code'] 
    768785                if not code: 
    769786                    code = str(item.id) 
    770787                return HttpResponseRedirect('/archives/items/'+code) 
    771788        else: 
    772             form = MediaItemForm(instance=item) 
    773  
    774  
    775         return render(request, template, {'item': item, 'form': form}) 
     789            item_form = MediaItemForm(instance=item, prefix='item') 
     790            format_form = FormatForm(instance=format, prefix='format') 
     791 
     792        forms = [item_form, format_form] 
     793        hidden_fields = ['item-copied_from_item', 'format-item'] 
     794 
     795        return render(request, template, {'item': item, 'forms': forms, 'hidden_fields': hidden_fields,}) 
    776796 
    777797    @method_decorator(permission_required('telemeta.add_mediaitem')) 
     
    781801            source_item = MediaItem.objects.get(public_id=public_id) 
    782802            item = MediaItem() 
    783             form = MediaItemForm(data=request.POST, files=request.FILES, instance=item) 
    784             if form.is_valid(): 
    785                 form.save() 
    786                 code = form.cleaned_data['code'] 
     803            format = Format() 
     804            item_form = MediaItemForm(data=request.POST, files=request.FILES, instance=item, prefix='item') 
     805            format_form = FormatForm(data=request.POST, instance=format, prefix='format') 
     806 
     807            if item_form.is_valid(): 
     808                item_form.save() 
     809                code = item_form.cleaned_data['code'] 
    787810                if not code: 
    788811                    code = str(item.id) 
     812                if format_form.is_valid(): 
     813                    format.item = item 
     814                    format_form.save() 
    789815 
    790816                performances = MediaItemPerformance.objects.filter(media_item=source_item) 
     
    809835            item.code = auto_code(items, item.collection.code) 
    810836            item.approx_duration = '' 
    811             form = MediaItemForm(instance=item) 
    812             form.code = item.code 
    813             form.file = None 
    814  
    815         return render(request, template, {'item': item, "form": form}) 
     837            item_form = MediaItemForm(instance=item, prefix='item') 
     838            format, created = Format.objects.get_or_create(item=item) 
     839            format_form = FormatForm(instance=format, prefix='format') 
     840            item_form.code = item.code 
     841            item_form.file = None 
     842 
     843        forms = [item_form, format_form] 
     844        hidden_fields = ['item-copied_from_item', 'format-item'] 
     845 
     846        return render(request, template, {'item': item, "forms": forms, 'hidden_fields': hidden_fields,}) 
    816847 
    817848    @method_decorator(permission_required('telemeta.delete_mediaitem')) 
  • tools/dev/push.sh

    rcd6363d rd7de29b  
    1010    if [[ $branch == *master* ]]; then 
    1111        echo "Push $branch to github:" 
    12         git push github $branch 
     12        git push hub $branch 
    1313    fi 
    1414 
     
    1616 
    1717git push --tags 
    18 git push --tags github 
     18git push --tags hub 
    1919 
    2020ssh vcs.parisson.com "cd /var/git/telemeta.git; git update-server-info" 
     
    2222#echo "Update jimi.parisson.com:" 
    2323echo "Update angus.parisson.com:" 
    24 ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull origin master; \ 
    25                         cd /home/telemeta/telemeta-develop; git pull origin develop; \ 
     24ssh angus.parisson.com "cd /home/telemeta/telemeta-master; git pull; \ 
     25                        cd /home/telemeta/telemeta-develop; git pull; \ 
    2626                        cd /home/telemeta/demo/; ./manage.py migrate telemeta --delete-ghost-migrations; 
    2727                        cd /home/telemeta/sandbox/; ./manage.py migrate telemeta --delete-ghost-migrations;  
Note: See TracChangeset for help on using the changeset viewer.