Changeset 16383f0


Ignore:
Timestamp:
Feb 13, 2012 11:09:02 PM (3 years ago)
Author:
yomguy <yomguy@…>
Branches:
master, crem, crem2, dev, dev2, diadems, dj1.6, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, merge, sabiod
Children:
7334cc3
Parents:
5bdea41 (diff), 5fe48d9 (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@…> (13/02/2012 23:09:02)
git-committer:
yomguy <yomguy@…> (13/02/2012 23:09:02)
Message:

Merge branch 'master' into crem

Files:
16 added
36 edited

Legend:

Unmodified
Added
Removed
  • CHANGELOG

    rd527bc7 rb6cb820  
     1telemeta (1.4-1) unstable; urgency=low 
     2 
     3For users: 
     4     
     5 * add a Desk providing links to home and personal data 
     6 * add Fonds, Corpus and their related media to the models and to the search engine 
     7 * add some fancy drop down menus for main tabs 
     8 * add video media handling (WebM formats only and with the last TimeSide master branch) 
     9 * add playlist metadata editor 
     10 * fix some sad bugs for YouTube related URLs and previews 
     11 * cleanup admin page 
     12 * many bugfixes ! 
     13 
     14For developers and maintainers: 
     15 
     16 * a new setting parameter: TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') or whatever 
     17 * before upgrading, you need to BACKUP and manually delete old wrong MediaCorpus and MediaCorpusRelated tables 
     18 * we now use South for data model migration (./manage.py migrate telemeta). Add it to your apps. See INSTALL.rst. Email me if any pb! 
     19 
     20-- Guillaume Pellerin <yomguy@parisson.com>  Fri, 10 Feb 2012 16:10:22 +0200 
     21 
    122telemeta (1.3-1) unstable; urgency=low 
    223 
  • INSTALL.rst

    rd7a97cc rd8463b0  
    2424 
    2525        sudo aptitude install python python-dev python-django python-xml python-mysqldb mysql-server \ 
    26         python-ctypes python-setuptools python-support python-docutils \ 
    27         python-libxml2 python-django-registration python-lxml python-numpy \ 
    28         python-scipy python-imaging python-mutagen python-gobject python-gst0.10 \ 
    29         gstreamer0.10-plugins-base gobject-introspection python-django-south 
    30  
    31     To get MP3 reading and writing, just add these lines to your /etc/apt/sources-list:: 
    32  
    33         deb http://www.debian-multimedia.org stable main 
    34  
    35     Then:: 
    36  
     26            python-ctypes python-setuptools python-support python-docutils \ 
     27            python-libxml2 python-django-registration python-lxml python-numpy \ 
     28            python-scipy python-imaging python-mutagen python-gobject python-gst0.10 \ 
     29            gstreamer0.10-plugins-base gobject-introspection python-django-south 
     30 
     31    To get MP3 reading and writing:: 
     32 
     33        echo 'deb http://www.debian-multimedia.org stable main' | sudo tee -a /etc/apt/sources-list 
    3734        sudo apt-get update 
    3835        sudo aptitude install gstreamer0.10-fluendo-mp3 gstreamer0.10-lame 
     
    4037* On other linux platforms: 
    4138 
    42     Please install all dependencies thanks to your application manager. 
     39    Please install all the equivalent dependencies thanks to your application manager or manually. 
    4340 
    4441 
     
    4643----------------------------- 
    4744 
    48 Pip style (recommended) 
    49 ++++++++++++++++++++++++ 
     45Pip method (highly recommended!) 
     46+++++++++++++++++++++++++++++++++ 
    5047 
    5148We strongly advise you use the python package tool as it installs some good dependencies automatically:: 
     
    106103~~~~~~~~~~~~~~~~~~~~~~~~~ 
    107104 
     105It is strongly advised to use South and then enable data schema migrations between the models and the database. 
     106It will allow automatic DB updates when your / our models are modified. Because the first one you use is not only the best one... 
     107 
    108108Install it using pip:: 
    109109 
    110110    sudo pip install south 
    111111 
    112 or, from source:: 
     112or:: 
    113113 
    114114    sudo easy_install South 
     
    116116 
    117117------------------------- 
    118 Testing (sandbox) 
    119 ------------------------- 
    120  
    121 If you just want to test Telemeta, a sandbox is available in the example/ directory. 
    122 As Telemeta needs MySQL to work properly and fast, please create a database before editing setting.py 
    123  
    124  
    125 -------------------------- 
    126 Create a Django project 
    127 -------------------------- 
     118Fast testing (sandbox) 
     119------------------------- 
     120 
     121If you just want to test Telemeta just now, a sandbox is available in the example/ directory:: 
     122 
     123    cd example/sandbox_sqlite 
     124    ./manage.py syncdb 
     125    ./manage.py runserver 9000 
     126 
     127Now browse http://localhost:9000 
     128 
     129 
     130------------------------------- 
     131Create a new Telemeta project 
     132------------------------------- 
    128133 
    129134Start the project 
     
    196201    TELEMETA_GMAP_KEY =             your Google Map API key 
    197202    TELEMETA_DOWNLOAD_ENABLED =     True to enable raw audio data download 
    198     TELEMETA_STREAMING_FORMATS =    tuple of authoized streaming formats. Ex : ('mp3', 'ogg') 
     203    TELEMETA_STREAMING_FORMATS =    tuple of authorized streaming formats. Ex: ('mp3', 'ogg') 
     204    TELEMETA_DOWNLOAD_FORMATS =     tuple of authorized download formats. Ex: ('wav', 'mp3', 'webm') 
    199205    TELEMETA_PUBLIC_ACCESS_PERIOD = number of years above which item files are automagically published 
    200206    EMAIL_HOST =                    your default SMTP server 
     
    210216    CACHE_BACKEND = "file://" + TELEMETA_CACHE_DIR + "/data" 
    211217 
    212 If you want some personal templates, for example:: 
     218Optional: if you want some personal templates, for example:: 
    213219 
    214220    TEMPLATE_DIRS = ( 
     
    259265 
    260266    ./manage.py syncdb 
    261     ./manage.py schemamigration telemeta --initial 
    262     ./manage.py migrate telemeta --fake 
     267 
     268If you want tu use the data schema migration system (South needed, see previous paragraph):: 
     269 
    263270    ./manage.py migrate telemeta 
    264271 
  • README.rst

    rf771a66 rb6cb820  
    1111 
    1212    * Secure archiving, editing and publishing of audio files over internet. 
    13     * User friendly web frontend including workflows and high level search methods 
     13    * User friendly and full HTML web frontend including workflows and high level search methods 
    1414    * Smart dynamical and skinnable audio player (thanks to Timeside and SoundManager2) 
    1515    * "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture 
     
    2626================================ 
    2727 
    28 See `INSTALL.rst <http://telemeta.org/browser/INSTALL.rst>`_ and `telemeta.org <http://telemeta.org>`_ for more informations. 
     28See `INSTALL.rst <http://github.com/yomguy/Telemeta/blob/master/INSTALL.rst>`_ and `telemeta.org <http://telemeta.org>`_ for more informations. 
    2929 
    3030 
    31 Changelog 
    32 ========= 
     31Changes 
     32======== 
    3333 
    34 See `CHANGELOG <http://telemeta.org/browser/CHANGELOG>`_ 
     34(from 1.3) 
     35 
     36For users: 
     37 
     38 * add a Desk providing links to home and personal data 
     39 * add Fonds, Corpus and their related media to the models and to the search engine 
     40 * add some fancy drop down menus for main tabs 
     41 * add video media handling (WebM formats only and with the last TimeSide master branch) 
     42 * add playlist metadata editor 
     43 * fix some sad bugs for YouTube related URLs and previews 
     44 * cleanup admin page 
     45 * many bugfixes ! 
     46 
     47For developers and maintainers: 
     48 
     49 * a new setting parameter: TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') or whatever 
     50 * before upgrading, you need to BACKUP and manually delete old wrong MediaCorpus and MediaCorpusRelated tables 
     51 * we now use South for data model migration (./manage.py migrate telemeta). Add it to your apps. See INSTALL.rst. Email me if any pb! 
     52 
     53Full changelog : see `CHANGELOG <http://github.com/yomguy/Telemeta/blob/master/CHANGELOG>`_ 
    3554 
    3655 
  • telemeta/forms/__init__.py

    r44cc478 r396801e  
    22from media import * 
    33from language import * 
     4from system import * 
  • telemeta/htdocs/css/player.css

    r4d0f2d9 r13ef1ae  
    1717    display: block; 
    1818    overflow: hidden; 
    19     float: right; 
     19    float: left; 
    2020    width: 18px; 
    2121    padding: 10px 0 0 0; 
  • telemeta/htdocs/js/locale.js

    r40265bd rb6cb820  
    1111    'Paste HTML to embed player in website': gettext('Paste HTML to embed player in website'), 
    1212    'delete the item permanently?' : gettext('delete the item permanently?'), 
    13     'delete the collection permanently?' : gettext('delete the collection permanently?') 
     13    'delete the collection permanently?' : gettext('delete the collection permanently?'), 
     14    'delete the playlist permanently?' : gettext('delete the playlist permanently?'), 
     15    'delete the resource from the playlist permanently?' : gettext('delete the resource from the playlist permanently?'), 
    1416}; 
    1517 
  • telemeta/htdocs/js/playlist.js

    r3b2a076 r461ebfc  
    4545 
    4646    addPlaylist: function(name, id){ 
    47         //this.playlists[name]=id; 
    4847        this.playlists.push({ 
    4948            'name':name, 
    5049            'id':id 
     50        }); 
     51    }, 
     52 
     53    addEditPlaylist: function(id, title, description){ 
     54        this.playlists.push({ 
     55            'id': id, 
     56            'title': title, 
     57            'description': description, 
    5158        }); 
    5259    }, 
     
    98105            window.location.reload(); 
    99106        }); 
    100  
    101  
    102     }, 
     107    }, 
     108     
    103109    remove: function(id){ 
    104110        json([id],'telemeta.del_playlist',function(){ 
     
    113119    }, 
    114120 
    115  
     121    update : function(dictionary){ 
     122        json([dictionary],'telemeta.update_playlist',function(){ 
     123        window.location.reload(); 
     124        }); 
     125    }, 
     126 
     127    showEdit: function(anchorElement, id){ 
     128 
     129        var t = gettrans('title'); 
     130        var d = gettrans('description'); 
     131        var dd = {}; 
     132        var playlist = this; 
     133         
     134        var playlists = this.playlists; 
     135        for (var i=0; i< playlists.length; i++){ 
     136            if (playlists[i].id == id){ 
     137                dd[t] = playlists[i].title; 
     138                dd[d] = playlists[i].description; 
     139            } 
     140        } 
     141         
     142        new PopupDiv({ 
     143            'content':dd, 
     144                    invoker:anchorElement, 
     145                    showOk:true, 
     146                    onOk:function(data){ 
     147                        if(!data[t] && !data[d]){ 
     148                            return; 
     149                        } 
     150                        //convert language 
     151                        playlist.update({ 
     152                            'public_id': id, 
     153                            'title': data[t], 
     154                            'description': data[d], 
     155                        }); 
     156                    } 
     157        }).show(); 
     158    }, 
     159     
    116160    /*shows the popup for adding a resource to a playlist*/ 
    117     showAddResourceToPlaylist: function(anchorElement,resourceType,objectId, optionalOkMessage){ 
     161    showAddResourceToPlaylist: function(anchorElement, resourceType, objectId, optionalOkMessage){ 
    118162        var ar = []; 
    119163        var playlists = this.playlists; 
     
    121165            ar.push(playlists[i].name); 
    122166        } 
     167        var pl = this; 
     168         
    123169        if(!ar.length){ 
    124             return; 
    125         } 
    126         var pl = this; 
     170            pl.showAdd(anchorElement); 
     171        } 
     172         
    127173        //var addFcn = this.addResourceToPlaylist; 
    128174        new PopupDiv({ 
     
    132178                var val = data.selIndex; 
    133179                var callbackok = undefined; 
     180                     
    134181                if(optionalOkMessage){ 
    135182                    callbackok = function(){ 
  • telemeta/locale/de/LC_MESSAGES/django.po

    r7617a51 r72b372a  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-02-01 14:59+0100\n" 
     11"POT-Creation-Date: 2012-02-13 16:36+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    2828 
    2929#: models/enum.py:41 models/enum.py:139 models/media.py:455 
     30#: models/system.py:103 
    3031msgid "value" 
    3132msgstr "" 
     
    215216 
    216217#: models/media.py:123 models/media.py:522 models/media.py:541 
    217 #: models/media.py:555 
     218#: models/system.py:115 
    218219msgid "date" 
    219220msgstr "" 
     
    243244msgstr "" 
    244245 
    245 #: models/media.py:175 models/media.py:634 
     246#: models/media.py:175 models/media.py:622 
    246247msgid "recording year (from)" 
    247248msgstr "" 
    248249 
    249 #: models/media.py:176 models/media.py:635 
     250#: models/media.py:176 models/media.py:623 
    250251msgid "recording year (until)" 
    251252msgstr "" 
     
    415416msgstr "" 
    416417 
    417 #: models/media.py:362 models/media.py:554 
    418 #: templates/telemeta/mediaitem_detail.html:197 
     418#: models/media.py:362 templates/telemeta/mediaitem_detail.html:224 
    419419#: templates/telemeta/mediaitem_detail_video.html:192 
    420420msgid "keywords" 
     
    483483msgstr "" 
    484484 
    485 #: models/media.py:520 models/system.py:54 
     485#: models/media.py:520 models/system.py:55 
    486486msgid "time" 
    487487msgstr "" 
     
    495495msgstr "" 
    496496 
    497 #: models/media.py:633 
     497#: models/media.py:621 
    498498msgid "collections" 
    499499msgstr "" 
    500500 
    501 #: models/media.py:643 models/media.py:644 models/media.py:654 
    502 #: models/media.py:669 
     501#: models/media.py:633 models/media.py:634 models/media.py:643 
     502#: models/media.py:660 
    503503msgid "corpus" 
    504504msgstr "" 
    505505 
    506 #: models/media.py:662 models/media.py:663 models/media.py:680 
     506#: models/media.py:653 models/media.py:654 models/media.py:671 
    507507msgid "fonds" 
    508508msgstr "" 
    509509 
    510 #: models/media.py:673 models/media.py:674 
     510#: models/media.py:664 models/media.py:665 
    511511msgid "corpus related media" 
    512512msgstr "" 
    513513 
    514 #: models/media.py:684 models/media.py:685 
     514#: models/media.py:675 models/media.py:676 
    515515msgid "fonds related media" 
    516516msgstr "" 
    517517 
    518 #: models/system.py:51 
     518#: models/system.py:52 
    519519msgid "element type" 
    520520msgstr "" 
    521521 
    522 #: models/system.py:52 
     522#: models/system.py:53 
    523523msgid "element identifier" 
    524524msgstr "" 
    525525 
    526 #: models/system.py:53 
     526#: models/system.py:54 
    527527msgid "modification type" 
    528528msgstr "" 
    529529 
    530 #: models/system.py:55 
     530#: models/system.py:56 
    531531msgid "user" 
    532532msgstr "" 
    533533 
    534 #: models/system.py:84 templates/telemeta/profile_detail.html:36 
     534#: models/system.py:85 templates/telemeta/profile_detail.html:36 
    535535msgid "Institution" 
    536536msgstr "" 
    537537 
    538 #: models/system.py:85 templates/telemeta/profile_detail.html:37 
     538#: models/system.py:86 templates/telemeta/profile_detail.html:37 
    539539msgid "Department" 
    540540msgstr "" 
    541541 
    542 #: models/system.py:86 templates/telemeta/profile_detail.html:38 
     542#: models/system.py:87 templates/telemeta/profile_detail.html:38 
    543543msgid "Function" 
    544544msgstr "" 
    545545 
    546 #: models/system.py:87 templates/telemeta/profile_detail.html:39 
     546#: models/system.py:88 templates/telemeta/profile_detail.html:39 
    547547msgid "Attachment" 
    548548msgstr "" 
    549549 
    550 #: models/system.py:88 templates/telemeta/profile_detail.html:40 
     550#: models/system.py:89 templates/telemeta/profile_detail.html:40 
    551551msgid "Address" 
    552552msgstr "" 
    553553 
    554 #: models/system.py:89 templates/telemeta/profile_detail.html:41 
     554#: models/system.py:90 templates/telemeta/profile_detail.html:41 
    555555msgid "Telephone" 
    556556msgstr "" 
    557557 
    558 #: models/system.py:90 
     558#: models/system.py:91 
    559559msgid "Expiration_date" 
    560560msgstr "" 
    561561 
    562 #: templates/admin/base.html:21 templates/telemeta/base.html:83 
    563 #: templates/telemeta/base.html.py:100 templates/telemeta/base.html:106 
     562#: models/system.py:102 
     563msgid "key" 
     564msgstr "" 
     565 
     566#: models/system.py:116 templates/telemeta/mediaitem_detail_video.html:313 
     567#: templates/telemeta/inc/children_list.html:16 
     568#: templates/telemeta/inc/collection_related.html:38 
     569#: templates/telemeta/inc/mediaitem_related.html:38 
     570#: templates/telemeta/inc/resource_list.html:14 
     571#: templates/telemeta/inc/resource_related.html:38 
     572msgid "Description" 
     573msgstr "" 
     574 
     575#: models/system.py:118 
     576msgid "criteria" 
     577msgstr "" 
     578 
     579#: templates/admin/base.html:21 templates/telemeta/base.html:88 
     580#: templates/telemeta/base.html.py:92 
    564581msgid "Home" 
    565582msgstr "" 
     
    582599 
    583600#: templates/telemeta/admin_enumerations.html:6 
    584 #: templates/telemeta/base.html:126 templates/telemeta/enumeration_edit.html:7 
     601#: templates/telemeta/base.html:112 templates/telemeta/enumeration_edit.html:7 
    585602msgid "Enumerations" 
    586603msgstr "" 
    587604 
    588605#: templates/telemeta/admin_enumerations.html:14 
    589 #: templates/telemeta/lists.html:56 templates/telemeta/mediaitem_add.html:33 
     606#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_add.html:33 
    590607#: templates/telemeta/mediaitem_copy.html:34 
    591608#: templates/telemeta/mediaitem_detail_video.html:295 
    592609#: templates/telemeta/mediaitem_edit.html:26 
    593610#: templates/telemeta/search_criteria.html:78 
    594 #: templates/telemeta/search_results.html:40 
     611#: templates/telemeta/search_results.html:41 
    595612#: templates/telemeta/inc/children_list.html:15 
    596613#: templates/telemeta/inc/collection_list.html:13 
     
    598615#: templates/telemeta/inc/mediaitem_list.html:14 
    599616#: templates/telemeta/inc/mediaitem_related.html:20 
    600 #: templates/telemeta/inc/module_revisions.html:13 
     617#: templates/telemeta/inc/module_revisions.html:17 
    601618#: templates/telemeta/inc/resource_list.html:13 
    602619#: templates/telemeta/inc/resource_related.html:20 
     
    608625msgstr "" 
    609626 
    610 #: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:125 
     627#: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:111 
    611628msgid "General" 
    612629msgstr "" 
    613630 
    614631#: templates/telemeta/admin_instruments.html:6 
    615 #: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:89 
    616 #: templates/telemeta/base.html.py:120 templates/telemeta/users.html:5 
    617 #: templates/telemeta/users.html.py:8 
     632#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:106 
     633#: templates/telemeta/users.html:5 templates/telemeta/users.html.py:8 
    618634msgid "Users" 
    619635msgstr "" 
     
    628644msgstr "" 
    629645 
    630 #: templates/telemeta/base.html:59 templates/telemeta/base.html.py:102 
     646#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:87 
    631647msgid "Profile" 
    632648msgstr "" 
     
    648664msgstr "" 
    649665 
    650 #: templates/telemeta/base.html:84 templates/telemeta/base.html.py:112 
     666#: templates/telemeta/base.html:84 
     667msgid "Desk" 
     668msgstr "" 
     669 
     670#: templates/telemeta/base.html:86 views/base.py:269 
     671msgid "Lists" 
     672msgstr "" 
     673 
     674#: templates/telemeta/base.html:94 
     675msgid "Archives" 
     676msgstr "" 
     677 
     678#: templates/telemeta/base.html:96 
     679msgid "Fonds" 
     680msgstr "" 
     681 
     682#: templates/telemeta/base.html:97 
     683msgid "Corpus" 
     684msgstr "" 
     685 
     686#: templates/telemeta/base.html:98 
    651687msgid "Collections" 
    652688msgstr "" 
    653689 
    654 #: templates/telemeta/base.html:85 templates/telemeta/base.html.py:113 
     690#: templates/telemeta/base.html:99 
    655691msgid "Items" 
    656692msgstr "" 
    657693 
    658 #: templates/telemeta/base.html:86 templates/telemeta/base.html.py:117 
    659 #: templates/telemeta/home.html:25 
     694#: templates/telemeta/base.html:103 templates/telemeta/home.html:25 
    660695msgid "Geo Navigator" 
    661696msgstr "" 
    662697 
    663 #: templates/telemeta/base.html:87 templates/telemeta/base.html.py:118 
     698#: templates/telemeta/base.html:104 
    664699msgid "Advanced search" 
    665700msgstr "" 
    666701 
    667 #: templates/telemeta/base.html:92 templates/telemeta/base.html.py:123 
     702#: templates/telemeta/base.html:109 
    668703msgid "Admin" 
    669704msgstr "" 
    670705 
    671 #: templates/telemeta/base.html:98 
    672 msgid "Desk" 
    673 msgstr "" 
    674  
    675 #: templates/telemeta/base.html:101 views/base.py:264 
    676 msgid "Lists" 
    677 msgstr "" 
    678  
    679 #: templates/telemeta/base.html:108 
    680 msgid "Archives" 
    681 msgstr "" 
    682  
    683 #: templates/telemeta/base.html:110 
    684 msgid "Fonds" 
    685 msgstr "" 
    686  
    687 #: templates/telemeta/base.html:111 
    688 msgid "Corpus" 
    689 msgstr "" 
    690  
    691 #: templates/telemeta/base.html:127 templates/telemeta/instrument_edit.html:4 
     706#: templates/telemeta/base.html:113 templates/telemeta/instrument_edit.html:4 
    692707#: templates/telemeta/instrument_edit.html:7 
    693708#: templates/telemeta/instrument_edit_value.html:5 
     
    695710msgstr "" 
    696711 
    697 #: templates/telemeta/base.html:159 
     712#: templates/telemeta/base.html:145 
    698713msgid "Powered by" 
    699714msgstr "" 
    700715 
    701 #: templates/telemeta/base.html:160 
     716#: templates/telemeta/base.html:146 
    702717msgid "By" 
    703718msgstr "" 
    704719 
    705 #: templates/telemeta/base.html:165 
     720#: templates/telemeta/base.html:151 
    706721msgid "" 
    707722"Usage of the archives in the respect of cultural heritage of the original " 
     
    709724msgstr "" 
    710725 
    711 #: templates/telemeta/base.html:171 
    712 #: templates/telemeta/collection_detail.html:117 
     726#: templates/telemeta/base.html:157 
     727#: templates/telemeta/collection_detail.html:121 
    713728msgid "Legal notices" 
    714729msgstr "" 
     
    737752#: templates/telemeta/profile_edit.html:29 
    738753#: templates/telemeta/resource_add.html:10 
    739 #: templates/telemeta/resource_add.html:27 
     754#: templates/telemeta/resource_add.html:31 
    740755#: templates/telemeta/resource_edit.html:9 
    741 #: templates/telemeta/resource_edit.html:25 
     756#: templates/telemeta/resource_edit.html:29 
    742757#: templates/telemeta/resource_related_edit.html:12 
    743758#: templates/telemeta/resource_related_edit.html:39 
     
    757772#: templates/telemeta/mediaitem_related_edit.html:41 
    758773#: templates/telemeta/profile_edit.html:31 
    759 #: templates/telemeta/resource_add.html:29 
    760 #: templates/telemeta/resource_edit.html:27 
     774#: templates/telemeta/resource_add.html:33 
     775#: templates/telemeta/resource_edit.html:31 
    761776#: templates/telemeta/resource_related_edit.html:41 
    762777msgid "Save" 
     
    764779 
    765780#: templates/telemeta/collection_detail.html:5 
    766 #: templates/telemeta/collection_detail_dc.html:5 views/base.py:411 
     781#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459 
    767782msgid "Collection" 
    768783msgstr "" 
    769784 
    770785#: templates/telemeta/collection_detail.html:44 
    771 #: templates/telemeta/mediaitem_detail.html:91 
    772 #: templates/telemeta/mediaitem_detail.html:197 
    773 #: templates/telemeta/mediaitem_detail.html:236 
     786#: templates/telemeta/lists.html:55 
     787#: templates/telemeta/mediaitem_detail.html:97 
     788#: templates/telemeta/mediaitem_detail.html:224 
     789#: templates/telemeta/mediaitem_detail.html:263 
    774790#: templates/telemeta/mediaitem_detail_video.html:90 
    775791#: templates/telemeta/mediaitem_detail_video.html:192 
     
    777793#: templates/telemeta/mediaitem_detail_video.html:352 
    778794#: templates/telemeta/profile_detail.html:65 
    779 #: templates/telemeta/resource_detail.html:21 
     795#: templates/telemeta/resource_detail.html:43 
    780796#: templates/telemeta/inc/collection_related.html:81 
    781797#: templates/telemeta/inc/mediaitem_related.html:81 
     
    785801 
    786802#: templates/telemeta/collection_detail.html:45 
    787 #: templates/telemeta/mediaitem_detail.html:92 
     803#: templates/telemeta/mediaitem_detail.html:98 
    788804#: templates/telemeta/mediaitem_detail_video.html:91 
    789 #: templates/telemeta/resource_detail.html:22 
     805#: templates/telemeta/resource_detail.html:44 
    790806msgid "Copy" 
    791807msgstr "" 
     
    796812 
    797813#: templates/telemeta/collection_detail.html:49 
    798 #: templates/telemeta/mediaitem_detail.html:95 
     814#: templates/telemeta/mediaitem_detail.html:101 
    799815#: templates/telemeta/mediaitem_detail_video.html:94 
    800 #: templates/telemeta/resource_detail.html:25 
     816#: templates/telemeta/resource_detail.html:47 
    801817msgid "Add to playlist" 
    802818msgstr "" 
     
    807823 
    808824#: templates/telemeta/collection_detail.html:95 
    809 #: templates/telemeta/lists.html:60 
     825#: templates/telemeta/lists.html:73 
    810826#: templates/telemeta/inc/collection_list.html:17 
    811827msgid "Recording period" 
    812828msgstr "" 
    813829 
    814 #: templates/telemeta/collection_detail.html:104 
    815 #: templates/telemeta/mediaitem_detail.html:177 
     830#: templates/telemeta/collection_detail.html:108 
     831#: templates/telemeta/mediaitem_detail.html:204 
    816832#: templates/telemeta/mediaitem_detail_video.html:176 
    817833msgid "Geographic and cultural informations" 
    818834msgstr "" 
    819835 
    820 #: templates/telemeta/collection_detail.html:122 
    821 #: templates/telemeta/lists.html:59 
     836#: templates/telemeta/collection_detail.html:126 
     837#: templates/telemeta/lists.html:72 
    822838#: templates/telemeta/inc/collection_list.html:16 
    823839#: templates/telemeta/inc/mediaitem_list.html:16 
     
    825841msgstr "" 
    826842 
    827 #: templates/telemeta/collection_detail.html:131 
     843#: templates/telemeta/collection_detail.html:135 
    828844msgid "Bibliographic references" 
    829845msgstr "" 
    830846 
    831 #: templates/telemeta/collection_detail.html:144 
    832 #: templates/telemeta/mediaitem_detail.html:253 
     847#: templates/telemeta/collection_detail.html:148 
     848#: templates/telemeta/mediaitem_detail.html:280 
    833849#: templates/telemeta/mediaitem_detail_video.html:248 
    834850msgid "Archiving data" 
    835851msgstr "" 
    836852 
    837 #: templates/telemeta/collection_detail.html:150 
     853#: templates/telemeta/collection_detail.html:154 
    838854msgid "Related documentation" 
    839855msgstr "" 
    840856 
    841 #: templates/telemeta/collection_detail.html:154 
     857#: templates/telemeta/collection_detail.html:158 
    842858msgid "Comments" 
    843859msgstr "" 
    844860 
    845 #: templates/telemeta/collection_detail.html:168 
    846 #: templates/telemeta/mediaitem_detail.html:269 
     861#: templates/telemeta/collection_detail.html:172 
     862#: templates/telemeta/mediaitem_detail.html:296 
    847863#: templates/telemeta/mediaitem_detail_video.html:264 
    848864msgid "Technical data" 
    849865msgstr "" 
    850866 
    851 #: templates/telemeta/collection_detail.html:173 
    852 #: templates/telemeta/mediaitem_detail.html:272 
     867#: templates/telemeta/collection_detail.html:177 
     868#: templates/telemeta/mediaitem_detail.html:299 
    853869#: templates/telemeta/mediaitem_detail_video.html:267 
    854870msgid "Media type" 
    855871msgstr "" 
    856872 
    857 #: templates/telemeta/collection_detail.html:173 
    858 #: templates/telemeta/mediaitem_detail.html:272 
     873#: templates/telemeta/collection_detail.html:177 
    859874#: templates/telemeta/mediaitem_detail_video.html:267 
    860875msgid "Audio" 
    861876msgstr "" 
    862877 
    863 #: templates/telemeta/collection_detail.html:178 
     878#: templates/telemeta/collection_detail.html:182 
    864879#: templates/telemeta/geo_countries.html:16 
    865880msgid "Number of items" 
    866881msgstr "" 
    867882 
    868 #: templates/telemeta/collection_detail.html:207 
    869 #: templates/telemeta/lists.html:45 
    870 #: templates/telemeta/mediaitem_detail.html:293 
     883#: templates/telemeta/collection_detail.html:211 
     884#: templates/telemeta/lists.html:58 
     885#: templates/telemeta/mediaitem_detail.html:320 
    871886#: templates/telemeta/mediaitem_detail_video.html:363 
    872 #: templates/telemeta/resource_detail.html:69 
     887#: templates/telemeta/resource_detail.html:95 
    873888msgid "Delete" 
    874889msgstr "" 
     
    892907#: templates/telemeta/mediaitem_list.html:12 
    893908#: templates/telemeta/search_results.html:13 
    894 #: templates/telemeta/search_results.html:16 
     909#: templates/telemeta/search_results.html:17 
    895910msgid "All" 
    896911msgstr "" 
     
    907922#: templates/telemeta/mediaitem_list.html:13 
    908923#: templates/telemeta/search_results.html:14 
    909 #: templates/telemeta/search_results.html:17 
     924#: templates/telemeta/search_results.html:18 
    910925msgid "Sounds" 
    911926msgstr "" 
     
    913928#: templates/telemeta/collection_list.html:17 
    914929#: templates/telemeta/enumeration_edit.html:23 
    915 #: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:37 
     930#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:49 
    916931#: templates/telemeta/mediaitem_list.html:15 
    917932#: templates/telemeta/resource_list.html:13 
     
    949964#: templates/telemeta/enumeration_edit.html:31 
    950965#: templates/telemeta/enumeration_edit_value.html:11 
    951 #: templates/telemeta/mediaitem_detail.html:137 
     966#: templates/telemeta/mediaitem_detail.html:164 
    952967#: templates/telemeta/mediaitem_detail_video.html:136 
    953968msgid "Value" 
     
    10121027msgstr[1] "" 
    10131028 
    1014 #: templates/telemeta/home.html:14 templates/telemeta/home.html.py:57 
     1029#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:60 
    10151030msgid "Musical selection" 
    10161031msgstr "" 
     
    10301045msgstr "" 
    10311046 
    1032 #: templates/telemeta/lists.html:35 templates/telemeta/profile_detail.html:16 
    1033 msgid "Playlists" 
    1034 msgstr "" 
    1035  
    1036 #: templates/telemeta/lists.html:57 
    1037 #: templates/telemeta/inc/module_revisions.html:14 
     1047#: templates/telemeta/lists.html:47 
     1048msgid "My playlists" 
     1049msgstr "" 
     1050 
     1051#: templates/telemeta/lists.html:70 
     1052#: templates/telemeta/inc/module_revisions.html:18 
    10381053msgid "Type" 
    10391054msgstr "" 
    10401055 
    1041 #: templates/telemeta/lists.html:58 templates/telemeta/mediaitem_add.html:34 
     1056#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_add.html:34 
    10421057#: templates/telemeta/mediaitem_copy.html:35 
    10431058#: templates/telemeta/mediaitem_edit.html:27 
     
    10491064msgstr "" 
    10501065 
    1051 #: templates/telemeta/lists.html:61 
     1066#: templates/telemeta/lists.html:74 
    10521067#: templates/telemeta/search_criteria.html:130 
    1053 #: templates/telemeta/search_results.html:57 
     1068#: templates/telemeta/search_results.html:58 
    10541069#: templates/telemeta/inc/collection_list.html:18 
    10551070#: templates/telemeta/inc/mediaitem_list.html:23 
     
    10571072msgstr "" 
    10581073 
    1059 #: templates/telemeta/lists.html:62 
     1074#: templates/telemeta/lists.html:75 
    10601075msgid "Action" 
    10611076msgstr "" 
    10621077 
    1063 #: templates/telemeta/lists.html:76 
    1064 #: templates/telemeta/inc/module_revisions.html:36 
     1078#: templates/telemeta/lists.html:92 
     1079#: templates/telemeta/inc/module_revisions.html:40 
    10651080msgid "deleted" 
    10661081msgstr "" 
     
    10811096#: templates/telemeta/mediaitem_copy.html:5 
    10821097#: templates/telemeta/mediaitem_detail.html:5 
    1083 #: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:573 
     1098#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:622 
    10841099msgid "Item" 
    10851100msgstr "" 
    10861101 
    1087 #: templates/telemeta/mediaitem_detail.html:97 
     1102#: templates/telemeta/mediaitem_detail.html:103 
    10881103#: templates/telemeta/mediaitem_detail_video.html:96 
    10891104#: templates/telemeta/paginator.html:5 
     
    10911106msgstr "" 
    10921107 
    1093 #: templates/telemeta/mediaitem_detail.html:98 
     1108#: templates/telemeta/mediaitem_detail.html:104 
    10941109#: templates/telemeta/mediaitem_detail_video.html:97 
    10951110#: templates/telemeta/paginator.html:23 
     
    10971112msgstr "" 
    10981113 
    1099 #: templates/telemeta/mediaitem_detail.html:126 
     1114#: templates/telemeta/mediaitem_detail.html:153 
    11001115#: templates/telemeta/mediaitem_detail_video.html:125 
    11011116msgid "Analysis" 
    11021117msgstr "" 
    11031118 
    1104 #: templates/telemeta/mediaitem_detail.html:128 
     1119#: templates/telemeta/mediaitem_detail.html:155 
    11051120#: templates/telemeta/mediaitem_detail_video.html:127 
    11061121msgid "Markers" 
    11071122msgstr "" 
    11081123 
    1109 #: templates/telemeta/mediaitem_detail.html:136 
     1124#: templates/telemeta/mediaitem_detail.html:163 
    11101125#: templates/telemeta/mediaitem_detail_video.html:135 
    11111126msgid "Property" 
    11121127msgstr "" 
    11131128 
    1114 #: templates/telemeta/mediaitem_detail.html:138 
     1129#: templates/telemeta/mediaitem_detail.html:165 
    11151130#: templates/telemeta/mediaitem_detail_video.html:137 
    11161131msgid "Unit" 
    11171132msgstr "" 
    11181133 
    1119 #: templates/telemeta/mediaitem_detail.html:146 
     1134#: templates/telemeta/mediaitem_detail.html:173 
    11201135#: templates/telemeta/mediaitem_detail_video.html:145 
    11211136msgid "Download:" 
    11221137msgstr "" 
    11231138 
    1124 #: templates/telemeta/mediaitem_detail.html:167 
     1139#: templates/telemeta/mediaitem_detail.html:194 
    11251140#: templates/telemeta/mediaitem_detail_video.html:166 
    11261141msgid "Recording date" 
    11271142msgstr "" 
    11281143 
    1129 #: templates/telemeta/mediaitem_detail.html:179 
     1144#: templates/telemeta/mediaitem_detail.html:206 
    11301145#: templates/telemeta/mediaitem_detail_video.html:178 
    11311146#: templates/telemeta/inc/mediaitem_list.html:18 
     
    11331148msgstr "" 
    11341149 
    1135 #: templates/telemeta/mediaitem_detail.html:185 
     1150#: templates/telemeta/mediaitem_detail.html:212 
    11361151msgid "Language ISO" 
    11371152msgstr "" 
    11381153 
    1139 #: templates/telemeta/mediaitem_detail.html:189 
     1154#: templates/telemeta/mediaitem_detail.html:216 
    11401155#: templates/telemeta/mediaitem_detail_video.html:184 
    11411156msgid "Ethnographic context" 
    11421157msgstr "" 
    11431158 
    1144 #: templates/telemeta/mediaitem_detail.html:202 
     1159#: templates/telemeta/mediaitem_detail.html:229 
    11451160#: templates/telemeta/mediaitem_detail_video.html:197 
    11461161msgid "Musical informations" 
    11471162msgstr "" 
    11481163 
    1149 #: templates/telemeta/mediaitem_detail.html:236 
     1164#: templates/telemeta/mediaitem_detail.html:263 
    11501165#: templates/telemeta/mediaitem_detail_video.html:231 
    11511166msgid "performance" 
    11521167msgstr "" 
    11531168 
    1154 #: templates/telemeta/mediaitem_detail.html:241 
     1169#: templates/telemeta/mediaitem_detail.html:268 
    11551170#: templates/telemeta/mediaitem_detail_video.html:236 
    11561171msgid "General informations" 
    11571172msgstr "" 
    11581173 
    1159 #: templates/telemeta/mediaitem_detail.html:243 
     1174#: templates/telemeta/mediaitem_detail.html:270 
    11601175#: templates/telemeta/mediaitem_detail_video.html:238 
    11611176msgid "Remarks" 
    11621177msgstr "" 
    11631178 
    1164 #: templates/telemeta/mediaitem_detail.html:259 
     1179#: templates/telemeta/mediaitem_detail.html:286 
    11651180#: templates/telemeta/mediaitem_detail_video.html:254 
    11661181msgid "Published references" 
     
    11851200msgstr "" 
    11861201 
    1187 #: templates/telemeta/mediaitem_detail_video.html:313 
    1188 #: templates/telemeta/inc/children_list.html:16 
    1189 #: templates/telemeta/inc/collection_related.html:38 
    1190 #: templates/telemeta/inc/mediaitem_related.html:38 
    1191 #: templates/telemeta/inc/resource_list.html:14 
    1192 #: templates/telemeta/inc/resource_related.html:38 
    1193 msgid "Description" 
    1194 msgstr "" 
    1195  
    11961202#: templates/telemeta/mediaitem_detail_video.html:316 
    11971203#: templates/telemeta/inc/collection_related.html:43 
     
    12251231msgstr "" 
    12261232 
    1227 #: templates/telemeta/profile_detail.html:8 views/base.py:1341 
     1233#: templates/telemeta/profile_detail.html:8 views/base.py:1392 
    12281234msgid "User profile" 
     1235msgstr "" 
     1236 
     1237#: templates/telemeta/profile_detail.html:16 
     1238msgid "Playlists" 
    12291239msgstr "" 
    12301240 
     
    12831293msgstr "" 
    12841294 
    1285 #: templates/telemeta/resource_detail.html:75 
     1295#: templates/telemeta/resource_detail.html:101 
    12861296#: templates/telemeta/resource_detail_dc.html:16 
    12871297msgid "No such resource" 
     
    12941304 
    12951305#: templates/telemeta/search_criteria.html:94 
    1296 #: templates/telemeta/search_results.html:43 
     1306#: templates/telemeta/search_results.html:44 
    12971307#: templates/telemeta/inc/mediaitem_list.html:22 
    12981308msgid "Year of recording" 
     
    13011311#: templates/telemeta/search_criteria.html:101 
    13021312#: templates/telemeta/search_criteria.html:120 
    1303 #: templates/telemeta/search_results.html:45 
    1304 #: templates/telemeta/search_results.html:52 
     1313#: templates/telemeta/search_results.html:46 
     1314#: templates/telemeta/search_results.html:53 
    13051315msgid "to" 
    13061316msgstr "" 
    13071317 
    13081318#: templates/telemeta/search_criteria.html:113 
    1309 #: templates/telemeta/search_results.html:50 
     1319#: templates/telemeta/search_results.html:51 
    13101320msgid "Year of publication" 
    13111321msgstr "" 
     
    13161326msgstr "" 
    13171327 
    1318 #: templates/telemeta/search_results.html:25 
     1328#: templates/telemeta/search_results.html:26 
    13191329msgid "Search pattern" 
    13201330msgstr "" 
     
    13321342msgstr "" 
    13331343 
    1334 #: templates/telemeta/inc/children_list.html:34 
    1335 msgid "No resources" 
     1344#: templates/telemeta/inc/children_list.html:35 
     1345#: templates/telemeta/inc/resource_list.html:30 
     1346msgid "No resource" 
    13361347msgstr "" 
    13371348 
     
    13681379msgstr "" 
    13691380 
    1370 #: templates/telemeta/inc/module_revisions.html:12 
     1381#: templates/telemeta/inc/module_revisions.html:16 
     1382#: templates/telemeta/inc/module_searches.html:12 
    13711383msgid "Date" 
    13721384msgstr "" 
    13731385 
    1374 #: templates/telemeta/inc/module_revisions.html:15 
     1386#: templates/telemeta/inc/module_revisions.html:19 
    13751387#: templates/telemeta/inc/user_list.html:6 
    13761388msgid "User" 
     1389msgstr "" 
     1390 
     1391#: templates/telemeta/inc/module_searches.html:13 
     1392msgid "Criteria" 
    13771393msgstr "" 
    13781394 
     
    13801396#, python-format 
    13811397msgid " from %(first_on_page)s to %(last_on_page)s on %(hits)s" 
    1382 msgstr "" 
    1383  
    1384 #: templates/telemeta/inc/resource_list.html:30 
    1385 msgid "No resource" 
    13861398msgstr "" 
    13871399 
     
    15441556msgstr "" 
    15451557 
    1546 #: templatetags/telemeta_utils.py:250 
     1558#: templatetags/telemeta_utils.py:257 
    15471559#, python-format 
    15481560msgid "%(count)d item" 
     
    15511563msgstr[1] "" 
    15521564 
    1553 #: templatetags/telemeta_utils.py:253 
     1565#: templatetags/telemeta_utils.py:260 
    15541566#, python-format 
    15551567msgid "%(count)d collection" 
     
    15661578msgstr "" 
    15671579 
    1568 #: views/base.py:263 views/base.py:410 views/base.py:572 views/base.py:866 
    1569 #: views/base.py:1340 
     1580#: util/locale_fix.py:7 
     1581msgid "My searches" 
     1582msgstr "" 
     1583 
     1584#: util/locale_fix.py:8 
     1585msgid "Children" 
     1586msgstr "" 
     1587 
     1588#: util/locale_fix.py:9 
     1589msgid "pattern" 
     1590msgstr "" 
     1591 
     1592#: views/base.py:268 views/base.py:458 views/base.py:621 views/base.py:925 
     1593#: views/base.py:1391 
    15701594msgid "Access not allowed" 
    15711595msgstr "" 
    15721596 
    1573 #: views/base.py:265 views/base.py:412 views/base.py:574 views/base.py:868 
    1574 #: views/base.py:1342 
     1597#: views/base.py:270 views/base.py:460 views/base.py:623 views/base.py:927 
     1598#: views/base.py:1393 
    15751599msgid "" 
    15761600"Please login or contact the website administator to get a private access." 
    15771601msgstr "" 
    15781602 
    1579 #: views/base.py:1371 
     1603#: views/base.py:1422 
    15801604msgid "Last changes" 
    15811605msgstr "" 
  • telemeta/locale/de/LC_MESSAGES/djangojs.po

    r7617a51 r72b372a  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-02-01 14:59+0100\n" 
     11"POT-Creation-Date: 2012-02-13 16:36+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 
     
    6666msgid "delete the collection permanently?" 
    6767msgstr "" 
     68 
     69#: htdocs/js/locale.js:14 
     70msgid "delete the playlist permanently?" 
     71msgstr "" 
     72 
     73#: htdocs/js/locale.js:15 
     74msgid "delete the resource from the playlist permanently?" 
     75msgstr "" 
  • telemeta/locale/fr/LC_MESSAGES/django.po

    r7617a51 r72b372a  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-02-01 14:59+0100\n" 
     11"POT-Creation-Date: 2012-02-13 16:36+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Olivier Guilyardi <olivier samalyse com>\n" 
     
    2727 
    2828#: models/enum.py:41 models/enum.py:139 models/media.py:455 
     29#: models/system.py:103 
    2930msgid "value" 
    3031msgstr "valeur" 
     
    215216 
    216217#: models/media.py:123 models/media.py:522 models/media.py:541 
    217 #: models/media.py:555 
     218#: models/system.py:115 
    218219msgid "date" 
    219220msgstr "" 
     
    243244msgstr "déposant / contributeur" 
    244245 
    245 #: models/media.py:175 models/media.py:634 
     246#: models/media.py:175 models/media.py:622 
    246247msgid "recording year (from)" 
    247248msgstr "année d'enregistrement (depuis)" 
    248249 
    249 #: models/media.py:176 models/media.py:635 
     250#: models/media.py:176 models/media.py:623 
    250251msgid "recording year (until)" 
    251252msgstr "année d'enregistrement (jusqu'à)" 
     
    416417msgstr "copie de" 
    417418 
    418 #: models/media.py:362 models/media.py:554 
    419 #: templates/telemeta/mediaitem_detail.html:197 
     419#: models/media.py:362 templates/telemeta/mediaitem_detail.html:224 
    420420#: templates/telemeta/mediaitem_detail_video.html:192 
    421421msgid "keywords" 
     
    485485msgstr "ressource" 
    486486 
    487 #: models/media.py:520 models/system.py:54 
     487#: models/media.py:520 models/system.py:55 
    488488msgid "time" 
    489489msgstr "heure" 
     
    497497msgstr "" 
    498498 
    499 #: models/media.py:633 
     499#: models/media.py:621 
    500500msgid "collections" 
    501501msgstr "collections" 
    502502 
    503 #: models/media.py:643 models/media.py:644 models/media.py:654 
    504 #: models/media.py:669 
     503#: models/media.py:633 models/media.py:634 models/media.py:643 
     504#: models/media.py:660 
    505505msgid "corpus" 
    506506msgstr "corpus" 
    507507 
    508 #: models/media.py:662 models/media.py:663 models/media.py:680 
     508#: models/media.py:653 models/media.py:654 models/media.py:671 
    509509msgid "fonds" 
    510510msgstr "fonds" 
    511511 
    512 #: models/media.py:673 models/media.py:674 
     512#: models/media.py:664 models/media.py:665 
    513513msgid "corpus related media" 
    514514msgstr "média associés" 
    515515 
    516 #: models/media.py:684 models/media.py:685 
     516#: models/media.py:675 models/media.py:676 
    517517msgid "fonds related media" 
    518518msgstr "média associés" 
    519519 
    520 #: models/system.py:51 
     520#: models/system.py:52 
    521521msgid "element type" 
    522522msgstr "type d'élément" 
    523523 
    524 #: models/system.py:52 
     524#: models/system.py:53 
    525525msgid "element identifier" 
    526526msgstr "identifiant de l'élément" 
    527527 
    528 #: models/system.py:53 
     528#: models/system.py:54 
    529529msgid "modification type" 
    530530msgstr "type de modification" 
    531531 
    532 #: models/system.py:55 
     532#: models/system.py:56 
    533533msgid "user" 
    534534msgstr "utilisateur" 
    535535 
    536 #: models/system.py:84 templates/telemeta/profile_detail.html:36 
     536#: models/system.py:85 templates/telemeta/profile_detail.html:36 
    537537msgid "Institution" 
    538538msgstr "Institution" 
    539539 
    540 #: models/system.py:85 templates/telemeta/profile_detail.html:37 
     540#: models/system.py:86 templates/telemeta/profile_detail.html:37 
    541541msgid "Department" 
    542542msgstr "Département" 
    543543 
    544 #: models/system.py:86 templates/telemeta/profile_detail.html:38 
     544#: models/system.py:87 templates/telemeta/profile_detail.html:38 
    545545msgid "Function" 
    546546msgstr "Fonction" 
    547547 
    548 #: models/system.py:87 templates/telemeta/profile_detail.html:39 
     548#: models/system.py:88 templates/telemeta/profile_detail.html:39 
    549549msgid "Attachment" 
    550550msgstr "Rattachement" 
    551551 
    552 #: models/system.py:88 templates/telemeta/profile_detail.html:40 
     552#: models/system.py:89 templates/telemeta/profile_detail.html:40 
    553553msgid "Address" 
    554554msgstr "Adresse" 
    555555 
    556 #: models/system.py:89 templates/telemeta/profile_detail.html:41 
     556#: models/system.py:90 templates/telemeta/profile_detail.html:41 
    557557msgid "Telephone" 
    558558msgstr "Téléphone" 
    559559 
    560 #: models/system.py:90 
     560#: models/system.py:91 
    561561msgid "Expiration_date" 
    562562msgstr "Date d'expiration" 
    563563 
    564 #: templates/admin/base.html:21 templates/telemeta/base.html:83 
    565 #: templates/telemeta/base.html.py:100 templates/telemeta/base.html:106 
     564#: models/system.py:102 
     565#, fuzzy 
     566msgid "key" 
     567msgstr "Mot-clé" 
     568 
     569#: models/system.py:116 templates/telemeta/mediaitem_detail_video.html:313 
     570#: templates/telemeta/inc/children_list.html:16 
     571#: templates/telemeta/inc/collection_related.html:38 
     572#: templates/telemeta/inc/mediaitem_related.html:38 
     573#: templates/telemeta/inc/resource_list.html:14 
     574#: templates/telemeta/inc/resource_related.html:38 
     575msgid "Description" 
     576msgstr "Description" 
     577 
     578#: models/system.py:118 
     579msgid "criteria" 
     580msgstr "" 
     581 
     582#: templates/admin/base.html:21 templates/telemeta/base.html:88 
     583#: templates/telemeta/base.html.py:92 
    566584msgid "Home" 
    567585msgstr "" 
     
    584602 
    585603#: templates/telemeta/admin_enumerations.html:6 
    586 #: templates/telemeta/base.html:126 templates/telemeta/enumeration_edit.html:7 
     604#: templates/telemeta/base.html:112 templates/telemeta/enumeration_edit.html:7 
    587605msgid "Enumerations" 
    588606msgstr "Énumérations" 
    589607 
    590608#: templates/telemeta/admin_enumerations.html:14 
    591 #: templates/telemeta/lists.html:56 templates/telemeta/mediaitem_add.html:33 
     609#: templates/telemeta/lists.html:69 templates/telemeta/mediaitem_add.html:33 
    592610#: templates/telemeta/mediaitem_copy.html:34 
    593611#: templates/telemeta/mediaitem_detail_video.html:295 
    594612#: templates/telemeta/mediaitem_edit.html:26 
    595613#: templates/telemeta/search_criteria.html:78 
    596 #: templates/telemeta/search_results.html:40 
     614#: templates/telemeta/search_results.html:41 
    597615#: templates/telemeta/inc/children_list.html:15 
    598616#: templates/telemeta/inc/collection_list.html:13 
     
    600618#: templates/telemeta/inc/mediaitem_list.html:14 
    601619#: templates/telemeta/inc/mediaitem_related.html:20 
    602 #: templates/telemeta/inc/module_revisions.html:13 
     620#: templates/telemeta/inc/module_revisions.html:17 
    603621#: templates/telemeta/inc/resource_list.html:13 
    604622#: templates/telemeta/inc/resource_related.html:20 
     
    607625 
    608626#: templates/telemeta/admin_enumerations.html:24 
    609 #, fuzzy 
    610627msgid "No enumerations" 
    611628msgstr "Aucune énumération" 
    612629 
    613 #: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:125 
     630#: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:111 
    614631msgid "General" 
    615632msgstr "Générale" 
    616633 
    617634#: templates/telemeta/admin_instruments.html:6 
    618 #: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:89 
    619 #: templates/telemeta/base.html.py:120 templates/telemeta/users.html:5 
    620 #: templates/telemeta/users.html.py:8 
     635#: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:106 
     636#: templates/telemeta/users.html:5 templates/telemeta/users.html.py:8 
    621637msgid "Users" 
    622638msgstr "Utilisateurs" 
     
    624640#: templates/telemeta/admin_instruments.html:15 
    625641#: templates/telemeta/admin_users.html:11 templates/telemeta/users.html:16 
    626 #, fuzzy 
    627642msgid "No users" 
    628643msgstr "Pas d'utilisateurs" 
     
    632647msgstr "Bienvenue" 
    633648 
    634 #: templates/telemeta/base.html:59 templates/telemeta/base.html.py:102 
     649#: templates/telemeta/base.html:59 templates/telemeta/base.html.py:87 
    635650msgid "Profile" 
    636651msgstr "Profil" 
     
    652667msgstr "Recherche" 
    653668 
    654 #: templates/telemeta/base.html:84 templates/telemeta/base.html.py:112 
     669#: templates/telemeta/base.html:84 
     670msgid "Desk" 
     671msgstr "Bureau" 
     672 
     673#: templates/telemeta/base.html:86 views/base.py:269 
     674msgid "Lists" 
     675msgstr "Listes" 
     676 
     677#: templates/telemeta/base.html:94 
     678msgid "Archives" 
     679msgstr "Archives" 
     680 
     681#: templates/telemeta/base.html:96 
     682msgid "Fonds" 
     683msgstr "" 
     684 
     685#: templates/telemeta/base.html:97 
     686msgid "Corpus" 
     687msgstr "" 
     688 
     689#: templates/telemeta/base.html:98 
    655690msgid "Collections" 
    656691msgstr "Collections" 
    657692 
    658 #: templates/telemeta/base.html:85 templates/telemeta/base.html.py:113 
     693#: templates/telemeta/base.html:99 
    659694msgid "Items" 
    660695msgstr "Items" 
    661696 
    662 #: templates/telemeta/base.html:86 templates/telemeta/base.html.py:117 
    663 #: templates/telemeta/home.html:25 
     697#: templates/telemeta/base.html:103 templates/telemeta/home.html:25 
    664698msgid "Geo Navigator" 
    665699msgstr "Géo-Navigateur" 
    666700 
    667 #: templates/telemeta/base.html:87 templates/telemeta/base.html.py:118 
     701#: templates/telemeta/base.html:104 
    668702msgid "Advanced search" 
    669703msgstr "Recherche avancée" 
    670704 
    671 #: templates/telemeta/base.html:92 templates/telemeta/base.html.py:123 
     705#: templates/telemeta/base.html:109 
    672706msgid "Admin" 
    673707msgstr "Admin" 
    674708 
    675 #: templates/telemeta/base.html:98 
    676 msgid "Desk" 
    677 msgstr "Bureau" 
    678  
    679 #: templates/telemeta/base.html:101 views/base.py:264 
    680 msgid "Lists" 
    681 msgstr "Listes" 
    682  
    683 #: templates/telemeta/base.html:108 
    684 msgid "Archives" 
    685 msgstr "Archives" 
    686  
    687 #: templates/telemeta/base.html:110 
    688 msgid "Fonds" 
    689 msgstr "" 
    690  
    691 #: templates/telemeta/base.html:111 
    692 msgid "Corpus" 
    693 msgstr "" 
    694  
    695 #: templates/telemeta/base.html:127 templates/telemeta/instrument_edit.html:4 
     709#: templates/telemeta/base.html:113 templates/telemeta/instrument_edit.html:4 
    696710#: templates/telemeta/instrument_edit.html:7 
    697711#: templates/telemeta/instrument_edit_value.html:5 
     
    699713msgstr "Instruments" 
    700714 
    701 #: templates/telemeta/base.html:159 
     715#: templates/telemeta/base.html:145 
    702716msgid "Powered by" 
    703717msgstr "Propulsé par" 
    704718 
    705 #: templates/telemeta/base.html:160 
     719#: templates/telemeta/base.html:146 
    706720msgid "By" 
    707721msgstr "Par" 
    708722 
    709 #: templates/telemeta/base.html:165 
     723#: templates/telemeta/base.html:151 
    710724msgid "" 
    711725"Usage of the archives in the respect of cultural heritage of the original " 
     
    715729"communautés d'origine." 
    716730 
    717 #: templates/telemeta/base.html:171 
    718 #: templates/telemeta/collection_detail.html:117 
     731#: templates/telemeta/base.html:157 
     732#: templates/telemeta/collection_detail.html:121 
    719733msgid "Legal notices" 
    720734msgstr "Mentions légales" 
     
    743757#: templates/telemeta/profile_edit.html:29 
    744758#: templates/telemeta/resource_add.html:10 
    745 #: templates/telemeta/resource_add.html:27 
     759#: templates/telemeta/resource_add.html:31 
    746760#: templates/telemeta/resource_edit.html:9 
    747 #: templates/telemeta/resource_edit.html:25 
     761#: templates/telemeta/resource_edit.html:29 
    748762#: templates/telemeta/resource_related_edit.html:12 
    749763#: templates/telemeta/resource_related_edit.html:39 
     
    763777#: templates/telemeta/mediaitem_related_edit.html:41 
    764778#: templates/telemeta/profile_edit.html:31 
    765 #: templates/telemeta/resource_add.html:29 
    766 #: templates/telemeta/resource_edit.html:27 
     779#: templates/telemeta/resource_add.html:33 
     780#: templates/telemeta/resource_edit.html:31 
    767781#: templates/telemeta/resource_related_edit.html:41 
    768782msgid "Save" 
     
    770784 
    771785#: templates/telemeta/collection_detail.html:5 
    772 #: templates/telemeta/collection_detail_dc.html:5 views/base.py:411 
     786#: templates/telemeta/collection_detail_dc.html:5 views/base.py:459 
    773787msgid "Collection" 
    774788msgstr "Collection" 
    775789 
    776790#: templates/telemeta/collection_detail.html:44 
    777 #: templates/telemeta/mediaitem_detail.html:91 
    778 #: templates/telemeta/mediaitem_detail.html:197 
    779 #: templates/telemeta/mediaitem_detail.html:236 
     791#: templates/telemeta/lists.html:55 
     792#: templates/telemeta/mediaitem_detail.html:97 
     793#: templates/telemeta/mediaitem_detail.html:224 
     794#: templates/telemeta/mediaitem_detail.html:263 
    780795#: templates/telemeta/mediaitem_detail_video.html:90 
    781796#: templates/telemeta/mediaitem_detail_video.html:192 
     
    783798#: templates/telemeta/mediaitem_detail_video.html:352 
    784799#: templates/telemeta/profile_detail.html:65 
    785 #: templates/telemeta/resource_detail.html:21 
     800#: templates/telemeta/resource_detail.html:43 
    786801#: templates/telemeta/inc/collection_related.html:81 
    787802#: templates/telemeta/inc/mediaitem_related.html:81 
     
    791806 
    792807#: templates/telemeta/collection_detail.html:45 
    793 #: templates/telemeta/mediaitem_detail.html:92 
     808#: templates/telemeta/mediaitem_detail.html:98 
    794809#: templates/telemeta/mediaitem_detail_video.html:91 
    795 #: templates/telemeta/resource_detail.html:22 
     810#: templates/telemeta/resource_detail.html:44 
    796811msgid "Copy" 
    797812msgstr "Copier" 
     
    802817 
    803818#: templates/telemeta/collection_detail.html:49 
    804 #: templates/telemeta/mediaitem_detail.html:95 
     819#: templates/telemeta/mediaitem_detail.html:101 
    805820#: templates/telemeta/mediaitem_detail_video.html:94 
    806 #: templates/telemeta/resource_detail.html:25 
     821#: templates/telemeta/resource_detail.html:47 
    807822msgid "Add to playlist" 
    808823msgstr "Ajouter à la liste" 
     
    813828 
    814829#: templates/telemeta/collection_detail.html:95 
    815 #: templates/telemeta/lists.html:60 
     830#: templates/telemeta/lists.html:73 
    816831#: templates/telemeta/inc/collection_list.html:17 
    817832msgid "Recording period" 
    818833msgstr "Période d'enregistrement" 
    819834 
    820 #: templates/telemeta/collection_detail.html:104 
    821 #: templates/telemeta/mediaitem_detail.html:177 
     835#: templates/telemeta/collection_detail.html:108 
     836#: templates/telemeta/mediaitem_detail.html:204 
    822837#: templates/telemeta/mediaitem_detail_video.html:176 
    823838msgid "Geographic and cultural informations" 
    824839msgstr "Indications géographiques et culturelles" 
    825840 
    826 #: templates/telemeta/collection_detail.html:122 
    827 #: templates/telemeta/lists.html:59 
     841#: templates/telemeta/collection_detail.html:126 
     842#: templates/telemeta/lists.html:72 
    828843#: templates/telemeta/inc/collection_list.html:16 
    829844#: templates/telemeta/inc/mediaitem_list.html:16 
     
    831846msgstr "Collecteur" 
    832847 
    833 #: templates/telemeta/collection_detail.html:131 
     848#: templates/telemeta/collection_detail.html:135 
    834849msgid "Bibliographic references" 
    835850msgstr "Références bibliographiques" 
    836851 
    837 #: templates/telemeta/collection_detail.html:144 
    838 #: templates/telemeta/mediaitem_detail.html:253 
     852#: templates/telemeta/collection_detail.html:148 
     853#: templates/telemeta/mediaitem_detail.html:280 
    839854#: templates/telemeta/mediaitem_detail_video.html:248 
    840855msgid "Archiving data" 
    841856msgstr "Données d'archivage" 
    842857 
    843 #: templates/telemeta/collection_detail.html:150 
     858#: templates/telemeta/collection_detail.html:154 
    844859msgid "Related documentation" 
    845860msgstr "Documentation associée" 
    846861 
    847 #: templates/telemeta/collection_detail.html:154 
     862#: templates/telemeta/collection_detail.html:158 
    848863msgid "Comments" 
    849864msgstr "Commentaires" 
    850865 
    851 #: templates/telemeta/collection_detail.html:168 
    852 #: templates/telemeta/mediaitem_detail.html:269 
     866#: templates/telemeta/collection_detail.html:172 
     867#: templates/telemeta/mediaitem_detail.html:296 
    853868#: templates/telemeta/mediaitem_detail_video.html:264 
    854869msgid "Technical data" 
    855870msgstr "Données techniques" 
    856871 
    857 #: templates/telemeta/collection_detail.html:173 
    858 #: templates/telemeta/mediaitem_detail.html:272 
     872#: templates/telemeta/collection_detail.html:177 
     873#: templates/telemeta/mediaitem_detail.html:299 
    859874#: templates/telemeta/mediaitem_detail_video.html:267 
    860875msgid "Media type" 
    861876msgstr "Type de media" 
    862877 
    863 #: templates/telemeta/collection_detail.html:173 
    864 #: templates/telemeta/mediaitem_detail.html:272 
     878#: templates/telemeta/collection_detail.html:177 
    865879#: templates/telemeta/mediaitem_detail_video.html:267 
    866880msgid "Audio" 
    867881msgstr "Audio" 
    868882 
    869 #: templates/telemeta/collection_detail.html:178 
     883#: templates/telemeta/collection_detail.html:182 
    870884#: templates/telemeta/geo_countries.html:16 
    871885msgid "Number of items" 
    872886msgstr "Nombre d'items" 
    873887 
    874 #: templates/telemeta/collection_detail.html:207 
    875 #: templates/telemeta/lists.html:45 
    876 #: templates/telemeta/mediaitem_detail.html:293 
     888#: templates/telemeta/collection_detail.html:211 
     889#: templates/telemeta/lists.html:58 
     890#: templates/telemeta/mediaitem_detail.html:320 
    877891#: templates/telemeta/mediaitem_detail_video.html:363 
    878 #: templates/telemeta/resource_detail.html:69 
     892#: templates/telemeta/resource_detail.html:95 
    879893msgid "Delete" 
    880894msgstr "Supprimer" 
     
    898912#: templates/telemeta/mediaitem_list.html:12 
    899913#: templates/telemeta/search_results.html:13 
    900 #: templates/telemeta/search_results.html:16 
     914#: templates/telemeta/search_results.html:17 
    901915msgid "All" 
    902916msgstr "Tous" 
     
    913927#: templates/telemeta/mediaitem_list.html:13 
    914928#: templates/telemeta/search_results.html:14 
    915 #: templates/telemeta/search_results.html:17 
     929#: templates/telemeta/search_results.html:18 
    916930msgid "Sounds" 
    917931msgstr "Sonores" 
     
    919933#: templates/telemeta/collection_list.html:17 
    920934#: templates/telemeta/enumeration_edit.html:23 
    921 #: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:37 
     935#: templates/telemeta/instrument_edit.html:22 templates/telemeta/lists.html:49 
    922936#: templates/telemeta/mediaitem_list.html:15 
    923937#: templates/telemeta/resource_list.html:13 
     
    955969#: templates/telemeta/enumeration_edit.html:31 
    956970#: templates/telemeta/enumeration_edit_value.html:11 
    957 #: templates/telemeta/mediaitem_detail.html:137 
     971#: templates/telemeta/mediaitem_detail.html:164 
    958972#: templates/telemeta/mediaitem_detail_video.html:136 
    959973msgid "Value" 
     
    10181032msgstr[1] "%(counter)s items " 
    10191033 
    1020 #: templates/telemeta/home.html:14 templates/telemeta/home.html.py:57 
     1034#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:60 
    10211035msgid "Musical selection" 
    10221036msgstr "Sélection musicale" 
     
    10361050msgstr "Cette énumération est vide" 
    10371051 
    1038 #: templates/telemeta/lists.html:35 templates/telemeta/profile_detail.html:16 
    1039 msgid "Playlists" 
    1040 msgstr "Listes de lecture" 
    1041  
    1042 #: templates/telemeta/lists.html:57 
    1043 #: templates/telemeta/inc/module_revisions.html:14 
     1052#: templates/telemeta/lists.html:47 
     1053msgid "My playlists" 
     1054msgstr "Mes listes de lecture" 
     1055 
     1056#: templates/telemeta/lists.html:70 
     1057#: templates/telemeta/inc/module_revisions.html:18 
    10441058msgid "Type" 
    1045 msgstr "" 
    1046  
    1047 #: templates/telemeta/lists.html:58 templates/telemeta/mediaitem_add.html:34 
     1059msgstr "Type" 
     1060 
     1061#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_add.html:34 
    10481062#: templates/telemeta/mediaitem_copy.html:35 
    10491063#: templates/telemeta/mediaitem_edit.html:27 
     
    10551069msgstr "Cote" 
    10561070 
    1057 #: templates/telemeta/lists.html:61 
     1071#: templates/telemeta/lists.html:74 
    10581072#: templates/telemeta/search_criteria.html:130 
    1059 #: templates/telemeta/search_results.html:57 
     1073#: templates/telemeta/search_results.html:58 
    10601074#: templates/telemeta/inc/collection_list.html:18 
    10611075#: templates/telemeta/inc/mediaitem_list.html:23 
     
    10631077msgstr "Sonore" 
    10641078 
    1065 #: templates/telemeta/lists.html:62 
     1079#: templates/telemeta/lists.html:75 
    10661080msgid "Action" 
    10671081msgstr "Action" 
    10681082 
    1069 #: templates/telemeta/lists.html:76 
    1070 #: templates/telemeta/inc/module_revisions.html:36 
     1083#: templates/telemeta/lists.html:92 
     1084#: templates/telemeta/inc/module_revisions.html:40 
    10711085msgid "deleted" 
    10721086msgstr "supprimé" 
     
    10881102#: templates/telemeta/mediaitem_copy.html:5 
    10891103#: templates/telemeta/mediaitem_detail.html:5 
    1090 #: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:573 
     1104#: templates/telemeta/mediaitem_detail_video.html:5 views/base.py:622 
    10911105msgid "Item" 
    10921106msgstr "Item" 
    10931107 
    1094 #: templates/telemeta/mediaitem_detail.html:97 
     1108#: templates/telemeta/mediaitem_detail.html:103 
    10951109#: templates/telemeta/mediaitem_detail_video.html:96 
    10961110#: templates/telemeta/paginator.html:5 
     
    10981112msgstr "Précédent" 
    10991113 
    1100 #: templates/telemeta/mediaitem_detail.html:98 
     1114#: templates/telemeta/mediaitem_detail.html:104 
    11011115#: templates/telemeta/mediaitem_detail_video.html:97 
    11021116#: templates/telemeta/paginator.html:23 
     
    11041118msgstr "Suivant" 
    11051119 
    1106 #: templates/telemeta/mediaitem_detail.html:126 
     1120#: templates/telemeta/mediaitem_detail.html:153 
    11071121#: templates/telemeta/mediaitem_detail_video.html:125 
    11081122msgid "Analysis" 
    11091123msgstr "Analyse" 
    11101124 
    1111 #: templates/telemeta/mediaitem_detail.html:128 
     1125#: templates/telemeta/mediaitem_detail.html:155 
    11121126#: templates/telemeta/mediaitem_detail_video.html:127 
    11131127msgid "Markers" 
    11141128msgstr "Marqueurs" 
    11151129 
    1116 #: templates/telemeta/mediaitem_detail.html:136 
     1130#: templates/telemeta/mediaitem_detail.html:163 
    11171131#: templates/telemeta/mediaitem_detail_video.html:135 
    11181132msgid "Property" 
    11191133msgstr "Propriété" 
    11201134 
    1121 #: templates/telemeta/mediaitem_detail.html:138 
     1135#: templates/telemeta/mediaitem_detail.html:165 
    11221136#: templates/telemeta/mediaitem_detail_video.html:137 
    11231137msgid "Unit" 
    11241138msgstr "Unité" 
    11251139 
    1126 #: templates/telemeta/mediaitem_detail.html:146 
     1140#: templates/telemeta/mediaitem_detail.html:173 
    11271141#: templates/telemeta/mediaitem_detail_video.html:145 
    11281142msgid "Download:" 
    11291143msgstr "Téléchargement:" 
    11301144 
    1131 #: templates/telemeta/mediaitem_detail.html:167 
     1145#: templates/telemeta/mediaitem_detail.html:194 
    11321146#: templates/telemeta/mediaitem_detail_video.html:166 
    11331147msgid "Recording date" 
    11341148msgstr "Date d'enregistrement" 
    11351149 
    1136 #: templates/telemeta/mediaitem_detail.html:179 
     1150#: templates/telemeta/mediaitem_detail.html:206 
    11371151#: templates/telemeta/mediaitem_detail_video.html:178 
    11381152#: templates/telemeta/inc/mediaitem_list.html:18 
     
    11401154msgstr "Lieu" 
    11411155 
    1142 #: templates/telemeta/mediaitem_detail.html:185 
     1156#: templates/telemeta/mediaitem_detail.html:212 
    11431157msgid "Language ISO" 
    11441158msgstr "Langue ISO" 
    11451159 
    1146 #: templates/telemeta/mediaitem_detail.html:189 
     1160#: templates/telemeta/mediaitem_detail.html:216 
    11471161#: templates/telemeta/mediaitem_detail_video.html:184 
    11481162msgid "Ethnographic context" 
    11491163msgstr "Contexte ethnographique" 
    11501164 
    1151 #: templates/telemeta/mediaitem_detail.html:202 
     1165#: templates/telemeta/mediaitem_detail.html:229 
    11521166#: templates/telemeta/mediaitem_detail_video.html:197 
    11531167msgid "Musical informations" 
    11541168msgstr "Informations sur la musique" 
    11551169 
    1156 #: templates/telemeta/mediaitem_detail.html:236 
     1170#: templates/telemeta/mediaitem_detail.html:263 
    11571171#: templates/telemeta/mediaitem_detail_video.html:231 
    11581172msgid "performance" 
    11591173msgstr "composition" 
    11601174 
    1161 #: templates/telemeta/mediaitem_detail.html:241 
     1175#: templates/telemeta/mediaitem_detail.html:268 
    11621176#: templates/telemeta/mediaitem_detail_video.html:236 
    11631177msgid "General informations" 
    11641178msgstr "Informations générales" 
    11651179 
    1166 #: templates/telemeta/mediaitem_detail.html:243 
     1180#: templates/telemeta/mediaitem_detail.html:270 
    11671181#: templates/telemeta/mediaitem_detail_video.html:238 
    11681182msgid "Remarks" 
    11691183msgstr "Remarques" 
    11701184 
    1171 #: templates/telemeta/mediaitem_detail.html:259 
     1185#: templates/telemeta/mediaitem_detail.html:286 
    11721186#: templates/telemeta/mediaitem_detail_video.html:254 
    11731187msgid "Published references" 
     
    11921206msgstr "Prévisualisation" 
    11931207 
    1194 #: templates/telemeta/mediaitem_detail_video.html:313 
    1195 #: templates/telemeta/inc/children_list.html:16 
    1196 #: templates/telemeta/inc/collection_related.html:38 
    1197 #: templates/telemeta/inc/mediaitem_related.html:38 
    1198 #: templates/telemeta/inc/resource_list.html:14 
    1199 #: templates/telemeta/inc/resource_related.html:38 
    1200 msgid "Description" 
    1201 msgstr "Description" 
    1202  
    12031208#: templates/telemeta/mediaitem_detail_video.html:316 
    12041209#: templates/telemeta/inc/collection_related.html:43 
     
    12321237msgstr "Profil utilisateur" 
    12331238 
    1234 #: templates/telemeta/profile_detail.html:8 views/base.py:1341 
     1239#: templates/telemeta/profile_detail.html:8 views/base.py:1392 
    12351240msgid "User profile" 
    12361241msgstr "Profil utilisateur" 
     1242 
     1243#: templates/telemeta/profile_detail.html:16 
     1244msgid "Playlists" 
     1245msgstr "Listes de lecture" 
    12371246 
    12381247#: templates/telemeta/profile_detail.html:32 
     
    12901299msgstr "Nouveau" 
    12911300 
    1292 #: templates/telemeta/resource_detail.html:75 
     1301#: templates/telemeta/resource_detail.html:101 
    12931302#: templates/telemeta/resource_detail_dc.html:16 
    12941303msgid "No such resource" 
     
    13011310 
    13021311#: templates/telemeta/search_criteria.html:94 
    1303 #: templates/telemeta/search_results.html:43 
     1312#: templates/telemeta/search_results.html:44 
    13041313#: templates/telemeta/inc/mediaitem_list.html:22 
    13051314msgid "Year of recording" 
     
    13081317#: templates/telemeta/search_criteria.html:101 
    13091318#: templates/telemeta/search_criteria.html:120 
    1310 #: templates/telemeta/search_results.html:45 
    1311 #: templates/telemeta/search_results.html:52 
     1319#: templates/telemeta/search_results.html:46 
     1320#: templates/telemeta/search_results.html:53 
    13121321msgid "to" 
    13131322msgstr "à" 
    13141323 
    13151324#: templates/telemeta/search_criteria.html:113 
    1316 #: templates/telemeta/search_results.html:50 
     1325#: templates/telemeta/search_results.html:51 
    13171326msgid "Year of publication" 
    13181327msgstr "Année de publication" 
     
    13231332msgstr "Résultats de recherche" 
    13241333 
    1325 #: templates/telemeta/search_results.html:25 
     1334#: templates/telemeta/search_results.html:26 
    13261335msgid "Search pattern" 
    1327 msgstr "Recherche" 
     1336msgstr "Mots clés" 
    13281337 
    13291338#: templates/telemeta/inc/children_list.html:8 
     
    13391348msgstr "Référence" 
    13401349 
    1341 #: templates/telemeta/inc/children_list.html:34 
    1342 msgid "No resources" 
     1350#: templates/telemeta/inc/children_list.html:35 
     1351#: templates/telemeta/inc/resource_list.html:30 
     1352msgid "No resource" 
    13431353msgstr "Aucune ressource" 
    13441354 
     
    13751385msgstr "Aucun item" 
    13761386 
    1377 #: templates/telemeta/inc/module_revisions.html:12 
     1387#: templates/telemeta/inc/module_revisions.html:16 
     1388#: templates/telemeta/inc/module_searches.html:12 
    13781389msgid "Date" 
    13791390msgstr "" 
    13801391 
    1381 #: templates/telemeta/inc/module_revisions.html:15 
     1392#: templates/telemeta/inc/module_revisions.html:19 
    13821393#: templates/telemeta/inc/user_list.html:6 
    13831394msgid "User" 
    13841395msgstr "Utilisateur" 
     1396 
     1397#: templates/telemeta/inc/module_searches.html:13 
     1398msgid "Criteria" 
     1399msgstr "" 
    13851400 
    13861401#: templates/telemeta/inc/resource_list.html:7 
     
    13881403msgid " from %(first_on_page)s to %(last_on_page)s on %(hits)s" 
    13891404msgstr " de %(first_on_page)s à %(last_on_page)s sur %(hits)s" 
    1390  
    1391 #: templates/telemeta/inc/resource_list.html:30 
    1392 #, fuzzy 
    1393 msgid "No resource" 
    1394 msgstr "Aucune ressource" 
    13951405 
    13961406#: templates/telemeta/inc/user_list.html:9 
     
    15581568msgstr "" 
    15591569 
    1560 #: templatetags/telemeta_utils.py:250 
     1570#: templatetags/telemeta_utils.py:257 
    15611571#, python-format 
    15621572msgid "%(count)d item" 
     
    15651575msgstr[1] "%(count)d items" 
    15661576 
    1567 #: templatetags/telemeta_utils.py:253 
     1577#: templatetags/telemeta_utils.py:260 
    15681578#, python-format 
    15691579msgid "%(count)d collection" 
     
    15801590msgstr "Toutes les dernières modifications" 
    15811591 
    1582 #: views/base.py:263 views/base.py:410 views/base.py:572 views/base.py:866 
    1583 #: views/base.py:1340 
     1592#: util/locale_fix.py:7 
     1593msgid "My searches" 
     1594msgstr "Mes recherches" 
     1595 
     1596#: util/locale_fix.py:8 
     1597msgid "Children" 
     1598msgstr "Enfants" 
     1599 
     1600#: util/locale_fix.py:9 
     1601msgid "pattern" 
     1602msgstr "mots clés" 
     1603 
     1604#: views/base.py:268 views/base.py:458 views/base.py:621 views/base.py:925 
     1605#: views/base.py:1391 
    15841606msgid "Access not allowed" 
    15851607msgstr "Accès non autorisé" 
    15861608 
    1587 #: views/base.py:265 views/base.py:412 views/base.py:574 views/base.py:868 
    1588 #: views/base.py:1342 
     1609#: views/base.py:270 views/base.py:460 views/base.py:623 views/base.py:927 
     1610#: views/base.py:1393 
    15891611msgid "" 
    15901612"Please login or contact the website administator to get a private access." 
     
    15931615"pour obtenir un accès privé." 
    15941616 
    1595 #: views/base.py:1371 
     1617#: views/base.py:1422 
    15961618msgid "Last changes" 
    15971619msgstr "Dernières modifications" 
  • telemeta/locale/fr/LC_MESSAGES/djangojs.po

    r7617a51 r72b372a  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2012-02-01 14:59+0100\n" 
     11"POT-Creation-Date: 2012-02-13 16:36+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n" 
     
    6666msgid "delete the collection permanently?" 
    6767msgstr "supprimer la collection définitivement ?" 
     68 
     69#: htdocs/js/locale.js:14 
     70msgid "delete the playlist permanently?" 
     71msgstr "supprimer la liste de lecture définitivement ?" 
     72 
     73#: htdocs/js/locale.js:15 
     74msgid "delete the resource from the playlist permanently?" 
     75msgstr "supprimer la ressource de la liste de lecture définitivement ?" 
  • telemeta/models/media.py

    r5bdea41 r16383f0  
    547547    class Meta(MetaCore): 
    548548        db_table = 'media_transcoding' 
    549  
    550  
    551 class Search(ModelCore): 
    552     "Keywork search" 
    553  
    554     element_type = 'search' 
    555  
    556     username = ForeignKey(User, related_name="searches", db_column="username") 
    557     keywords = CharField(_('keywords'), required=True) 
    558     date = DateField(_('date'), auto_now_add=True) 
    559  
    560     class Meta(MetaCore): 
    561         db_table = 'searches' 
    562  
    563     def __unicode__(self): 
    564         return self.keywords 
    565549 
    566550 
     
    642626    recorded_to_year      = IntegerField(_('recording year (until)')) 
    643627 
     628    objects = MediaCorpusManager() 
     629 
    644630    @property 
    645631    def public_id(self): 
     
    660646    children = models.ManyToManyField(MediaCorpus, related_name="fonds", verbose_name=_('corpus'), blank=True, null=True) 
    661647 
     648    objects = MediaFondsManager() 
     649 
    662650    @property 
    663651    def public_id(self): 
  • telemeta/models/query.py

    r908ab06 r2f57f0e  
    417417    flatname_map.__doc__ = LocationQuerySet.flatname_map.__doc__ 
    418418 
     419 
     420class MediaCorpusQuerySet(CoreQuerySet): 
     421    "Base class for all media resource query sets" 
     422 
     423    def quick_search(self, pattern): 
     424        "Perform a quick search on text and char fields" 
     425        from telemeta.models.media import MediaCorpus 
     426        mod = MediaCorpus() 
     427        pattern = pattern.strip() 
     428        q = Q(code__contains=pattern) 
     429        fields = mod.to_dict() 
     430        keys =  fields.keys() 
     431 
     432        for field in keys: 
     433            field_str = str(mod._meta.get_field(field)) 
     434            if 'CharField' in field_str or 'TextField' in field_str: 
     435                q = q | word_search_q(field, pattern) 
     436 
     437        return self.filter(q) 
     438 
     439 
     440class MediaCorpusManager(CoreManager): 
     441    "Manage media resource queries" 
     442 
     443    def get_query_set(self): 
     444        "Return resource query sets" 
     445        return MediaCorpusQuerySet(self.model) 
     446 
     447    def quick_search(self, *args, **kwargs): 
     448        return self.get_query_set().quick_search(*args, **kwargs) 
     449    quick_search.__doc__ = MediaCorpusQuerySet.quick_search.__doc__ 
     450 
     451 
     452class MediaFondsQuerySet(CoreQuerySet): 
     453    "Base class for all media resource query sets" 
     454 
     455    def quick_search(self, pattern): 
     456        "Perform a quick search on text and char fields" 
     457        from telemeta.models.media import MediaFonds 
     458        mod = MediaFonds() 
     459        pattern = pattern.strip() 
     460        q = Q(code__contains=pattern) 
     461        fields = mod.to_dict() 
     462        keys =  fields.keys() 
     463        for field in keys: 
     464            field_str = str(mod._meta.get_field(field)) 
     465            if 'CharField' in field_str or 'TextField' in field_str: 
     466                q = q | word_search_q(field, pattern) 
     467        return self.filter(q) 
     468 
     469 
     470class MediaFondsManager(CoreManager): 
     471    "Manage media resource queries" 
     472 
     473    def get_query_set(self): 
     474        "Return resource query sets" 
     475        return MediaFondsQuerySet(self.model) 
     476 
     477    def quick_search(self, *args, **kwargs): 
     478        return self.get_query_set().quick_search(*args, **kwargs) 
     479    quick_search.__doc__ = MediaFondsQuerySet.quick_search.__doc__ 
  • telemeta/models/system.py

    r975a894 r17a2571  
    4040from django.core.exceptions import ObjectDoesNotExist 
    4141from django.utils.translation import ugettext_lazy as _ 
    42 import django.db.models 
     42import django.db.models as models 
    4343from django.forms import ModelForm 
    4444 
     
    4646class Revision(ModelCore): 
    4747    "Revision made by user" 
     48 
    4849    ELEMENT_TYPE_CHOICES = (('collection', 'collection'), ('item', 'item'), ('part', 'part'), ('marker', 'marker'), ('media', 'media'), ('fonds', 'fonds'), ('corpus', 'corpus')) 
    4950    CHANGE_TYPE_CHOICES  = (('import', 'import'), ('create', 'create'), ('update', 'update'), ('delete','delete')) 
     
    7879 
    7980 
    80 class UserProfile(django.db.models.Model): 
     81class UserProfile(models.Model): 
    8182    "User profile extension" 
    8283 
     
    9394        db_table = 'profiles' 
    9495 
    95 class UserProfileForm(ModelForm): 
    96     class Meta: 
    97         model = UserProfile 
     96 
     97class Criteria(ModelCore): 
     98    "Search criteria" 
     99 
     100    element_type = 'search_criteria' 
     101 
     102    key = CharField(_('key'), required=True) 
     103    value = CharField(_('value'), required=True) 
     104 
     105    class Meta(MetaCore): 
     106        db_table = 'search_criteria' 
     107 
     108 
     109class Search(ModelCore): 
     110    "Keywork search" 
     111 
     112    element_type = 'search' 
     113 
     114    username = ForeignKey(User, related_name="searches", db_column="username") 
     115    date = DateTimeField(_('date'), auto_now_add=True) 
     116    description = CharField(_('Description')) 
     117    criteria = models.ManyToManyField(Criteria, related_name="search", 
     118                                      verbose_name=_('criteria'), blank=True, null=True) 
     119 
     120    class Meta(MetaCore): 
     121        db_table = 'searches' 
     122        ordering = ['-date'] 
     123 
     124    def __unicode__(self): 
     125        return self.keywords 
     126 
     127 
     128 
  • telemeta/templates/telemeta/base.html

    rc4ffd8f rcc86e27  
    8484  <li><a href="#desk#" class="blue">{% trans "Desk" %}</a></span> 
    8585   <ul> 
    86     <li><a href="{% url telemeta-desk-home %}">{% trans "Home" %}</a></li> 
    8786    <li><a href="{% url telemeta-desk-lists %}">{% trans "Lists" %}</a></li> 
    8887    <li><a href="{% url telemeta-desk-profile user.username %}">{% trans "Profile" %}</a></li> 
     88    <li><a href="{% url telemeta-desk-home %}">{% trans "Home" %}</a></li> 
    8989   </ul> 
    9090  </li> 
  • telemeta/templates/telemeta/collection_detail.html

    r566f17d r461ebfc  
    2727        {% endif %} 
    2828    }); 
    29         {% endif %} 
     29    {% endif %} 
    3030</script> 
    3131{% endblock %} 
     
    9696                    <dd>{% if collection.recorded_from_year %}{{ collection.recorded_from_year }}{% endif %}{% if collection.recorded_from_year and collection.recorded_to_year %} - {% endif %}{% if  collection.recorded_to_year %}{{ collection.recorded_to_year}}{% endif %}</dd> 
    9797                {% dl_field collection "year_published" placeholder %} 
     98                {% for parent in parents %} 
     99                <dt>{% trans parent.element_type|capitalize %}</dt> 
     100                <dd><a href="{% url telemeta-resource-detail parent.element_type parent.public_id %}">{{ parent.title }}</a></dd> 
     101                {% endfor %} 
    98102            </dl> 
    99103        {% endblock general_info %} 
  • telemeta/templates/telemeta/inc/children_list.html

    ra851de8 r9325495  
    3333 
    3434{% else %} 
    35     <p>{% trans "No resources" %}</p> 
     35    <p>{% trans "No resource" %}</p> 
    3636 
    3737{% endif %} 
    38  
  • telemeta/templates/telemeta/inc/module_revisions.html

    r7617a51 r396801e  
    33 
    44   <div class="module"> 
    5     <h3><a href="{% url telemeta-rss %}"> 
    6       <img src="{% url telemeta-images "rss.png" %}" alt="rss" style="vertical-align:middle" /></a> 
    7       {% trans title %}</h3> 
    8       <a href="/rss" style="float:right" class="icon_rss">&nbsp;&nbsp;</a> 
     5     
     6    {% block rss_title %} 
     7      <a href="{% url telemeta-rss %}"> 
     8      <img src="{% url telemeta-images "rss.png" %}" alt="rss" style="vertical-align:middle" /> 
     9      <h3>{% trans title %}</h3></a> 
     10      <a href="{% url telemeta-rss %}" style="float:right" class="icon_rss">&nbsp;&nbsp;</a> 
     11    {% endblock rss_title %} 
     12     
    913    <div class="vscroll"> 
    1014    <table class="listing" bgcolor="#FFFFFF" style="width: 100%"> 
  • telemeta/templates/telemeta/lists.html

    r7617a51 r72b372a  
    1111        var a = jQuery('#_new_playlist');  
    1212        a.unbind('click').click(function(){p.showAdd(a);return false;}); 
    13     }); 
    14     
     13        }); 
     14 
     15    {% for playlist in playlists %} 
     16        playlistUtils.addEditPlaylist('{{playlist.playlist.public_id}}','{{ playlist.playlist.title }}','{{playlist.playlist.description}}'); 
     17    {% endfor %} 
     18         
     19 
    1520</script> 
    1621{% endblock %} 
     
    1823{% block content %} 
    1924<div id="module-set" style="width: 33%"> 
     25 
     26    {% block module_searches %} 
     27    {% with searches as searches and "My searches" as title %} 
     28    {% include "telemeta/inc/module_searches.html" %} 
     29    {% endwith %} 
     30    {% endblock %} 
     31     
    2032    {% block module_user_revisions %} 
    2133    {% with user_revisions as revisions and "My last changes" as title %} 
    22     {% include "telemeta/inc/module_revisions.html" %} 
     34    {% include "telemeta/inc/module_user_revisions.html" %} 
    2335    {% endwith %} 
    2436    {% endblock %} 
     
    3345 
    3446<div class="home-description"> 
    35     <h1><img src="{% url telemeta-images "playlist_title.png" %}" alt="playlists" style="vertical-align:middle" /> {% trans "Playlists" %}</h1> 
    36     <a href=# id="_new_playlist" style="float:right" class="component_icon button icon_add"> 
     47    <h1><img src="{% url telemeta-images "playlist_title.png" %}" alt="playlists" style="vertical-align:middle" /> {% trans "My playlists" %}</h1> 
     48    <a href="#" id="_new_playlist" style="float:right" class="component_icon button icon_add"> 
    3749        {% trans "Add" %}</a> 
    3850    {% for playlist in playlists %} 
     
    4052        <tr> 
    4153            <td style="border-bottom:1px solid #6A0307;color:#6A0307;font-size: 100%">{{ playlist.playlist.title }}</td> 
    42             <td style="width:66ex; padding-right: 0; border-bottom:1px solid #6A0307; text-align:right"> 
     54            <td style="width:86ex; padding-right: 0; border-bottom:1px solid #6A0307; text-align:right"> 
     55            <a href="#" id="{{playlist.playlist.public_id}}" onclick="playlistUtils.showEdit(this, this.id); return false;" class="component_icon button icon_edit">{% trans "Edit" %}</a> 
    4356                <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id 'collections' %}" class="component_icon button icon_csv">CSV Collections</a> 
    4457                <a href="{% url telemeta-playlist-csv-export playlist.playlist.public_id 'items' %}" class="component_icon button icon_csv">CSV Items</a> 
    45                 <a href="#" id="{{playlist.playlist.public_id}}" onclick="playlistUtils.remove(this.id);return false;" class="component_icon button icon_cancel">{% trans "Delete" %}</a> 
     58                <a href="#" id="{{playlist.playlist.public_id}}" onclick="if(confirm(gettrans('delete the playlist permanently?'))){playlistUtils.remove(this.id);};return false;" class="component_icon button icon_cancel">{% trans "Delete" %}</a> 
    4659            </td> 
    4760        </tr> 
     
    7487                <a href="{% url telemeta-item-detail-marker resource.element.public_id %}">{{ resource.element }}</a> 
    7588                {% endif %} 
     89                {% if resource.type == "corpus" or resource.type == "fonds" %} 
     90                <a href="{% url telemeta-resource-detail resource.type resource.element.public_id %}">{{ resource.element.title }}</a> 
     91                {% endif %} 
    7692                {% if resource.element == None %}{% trans "deleted" %}{% endif %} 
    7793            </td> 
     
    96112            </td> 
    97113            <td style="vertical-align:middle"> 
    98                 <a href="#" onclick="playlistUtils.removeResource('{{resource.public_id}}');return false;" class="component_icon button icon_cancel" style="padding: 4px 12px;"></a> 
     114            <a href="#" onclick="if(confirm(gettrans('delete the resource from the playlist permanently?'))){playlistUtils.removeResource('{{resource.public_id}}');};return false;" class="component_icon button icon_cancel" style="padding: 4px 12px;"></a> 
    99115            </td> 
    100116        </tr> 
  • telemeta/templates/telemeta/resource_detail.html

    re73a27f r72b372a  
    66 
    77{% block extra_javascript %} 
     8<script src="{% url telemeta-js "popupdiv.js" %}" type="text/javascript"></script> 
     9<script src="{% url telemeta-js "playlist.js" %}" type="text/javascript"></script> 
     10<script> 
     11{% if user.is_authenticated %} 
     12jQuery(document).ready(function(){ 
     13    var p = playlistUtils; 
     14     
     15    {% for playlist in playlists %} 
     16    p.addPlaylist('{{ playlist.playlist.title }}','{{playlist.playlist.public_id}}'); 
     17    {% endfor %} 
     18     
     19    {% if resource %} 
     20    var anchor = jQuery('#_add_to_playlist'); 
     21    if(anchor.length){ 
     22        anchor.click(function(){ 
     23            p.showAddResourceToPlaylist(anchor,'{{type}}','{{resource.id}}',gettrans('resource added to the selected playlist'));return false; 
     24            }); 
     25            } 
     26    {% endif %} 
     27    }); 
     28    {% endif %} 
     29    </script> 
    830{% endblock %} 
    931 
     
    4365                {% dl_field resource field.name %} 
    4466               {% endif %} 
    45               {% endfor %}   
     67              {% endfor %} 
     68              {% for parent in parents %} 
     69              <dt>{% trans parent.element_type|capitalize %}</dt> 
     70              <dd><a href="{% url telemeta-resource-detail parent.element_type parent.public_id %}">{{ parent.title }}</a></dd> 
     71               {% endfor %} 
    4672            </dl> 
    4773        {% endblock general_info %} 
  • telemeta/templates/telemeta/resource_edit.html

    rc42e1aa r461ebfc  
    1919            <tr><td class="error">{{ field.errors }}</td></tr> 
    2020            {% if "children" in field.html_name %} 
    21             <td>{{ field.label_tag }}:</td><td><div class="vscroll"> {{ field }}</div></td> 
     21            <td>{% trans field.label_tag %}:</td><td><div class="vscroll"> {{ field }}</div></td> 
    2222            {% else %} 
    2323             <td>{{ field.label_tag }}:</td><td> {{ field }}</td> 
  • telemeta/templates/telemeta/search_results.html

    r566f17d r7baa3c8  
    1313     <a href="{% url telemeta-search-items %}?{{criteria|with_no_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "All" %}</a> 
    1414     <a href="{% url telemeta-search-items %}?{{criteria|with_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "Sounds" %}</a> 
    15     {% else %} 
     15    {% endifequal %} 
     16    {% ifequal type 'collections' %} 
    1617     <a href="{% url telemeta-search-collections %}?{{criteria|with_no_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "All" %}</a> 
    1718     <a href="{% url telemeta-search-collections %}?{{criteria|with_sound|build_query_string}}" class="component_icon button icon_filter">{% trans "Sounds" %}</a> 
     
    6162 
    6263{% ifequal type 'items' %} 
    63  
    64   <p><a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <b>Items ({{items_num}})</b></p> 
    65  
     64<p><b>Items ({{items_num}}) | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a></b></p> 
    6665  {% with object_list as items %} 
    6766   <div class="fullpage"> 
     
    6968   </div> 
    7069  {% endwith %}     
    71  
    72 {% else %} 
    73  
    74   <p><b>Collections ({{collections_num}})</b> | <a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> 
    75   </p> 
    76  
     70{% endifequal %} 
     71   
     72{% ifequal type 'collections' %} 
     73<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | Collections ({{collections_num}}) | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a> 
     74  </b></p> 
    7775  {% with object_list as collections %} 
    7876   <div class="fullpage"> 
     
    8078   </div> 
    8179  {% endwith %} 
    82  
    8380{% endifequal %} 
    8481 
     82{% if type == 'corpus' %} 
     83<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | Corpus ({{corpus_num}}) | <a href="{% url telemeta-search-fonds %}?{{criteria|build_query_string}}">Fonds ({{fonds_num}})</a> 
     84</b></p> 
     85{% endif %} 
     86 
     87{% if type == 'fonds' %} 
     88<p><b><a href="{% url telemeta-search-items %}?{{criteria|build_query_string}}">Items ({{items_num}})</a> | <a href="{% url telemeta-search-collections %}?{{criteria|build_query_string}}">Collections ({{collections_num}})</a> | <a href="{% url telemeta-search-corpus %}?{{criteria|build_query_string}}">Corpus ({{corpus_num}})</a> | Fonds ({{fonds_num}}) 
     89</b></p> 
     90{% endif %} 
     91 
     92{% if type == 'corpus' or type == 'fonds' %} 
     93{% with object_list as resources and type as type %} 
     94<div class="fullpage"> 
     95{% include "telemeta/inc/resource_list.html" %} 
     96</div> 
     97{% endwith %} 
     98{% endif %} 
     99 
     100 
    85101{% endblock %} 
  • telemeta/templatetags/telemeta_utils.py

    r25d44c7 r396801e  
    7171        value = value.replace(bad, good) 
    7272    return value 
     73 
     74@register.filter 
     75def build_pattern_string(criteria): 
     76    dict = {} 
     77    for c in criteria: 
     78        dict[c.key] = c.value 
     79    return dict 
    7380 
    7481@register.filter 
  • telemeta/urls.py

    r28b728b r396801e  
    4040from telemeta.views.base import GeneralView, AdminView, CollectionView, ItemView, \ 
    4141                                InstrumentView, PlaylistView, ProfileView, GeoView, \ 
    42                                 LastestRevisionsFeed, ResourceView 
     42                                LastestRevisionsFeed, ResourceView, UserRevisionsFeed 
    4343from jsonrpc import jsonrpc_site 
    4444import os.path 
     
    7474 
    7575urlpatterns = patterns('', 
    76     url(r'^$', general_view.index, name="telemeta-home"), 
     76    url(r'^$', general_view.home, name="telemeta-home"), 
    7777 
    7878    # items 
     
    190190        {'format': 'dublin_core_xml'}, 
    191191        name="telemeta-resource-dublincore-xml"), 
     192    url(r'^archives/$', general_view.search, name="telemeta-archives"), 
    192193 
    193194    # search 
     
    197198    url(r'^search/items/$', general_view.search, {'type': 'items'}, 
    198199        name="telemeta-search-items"), 
     200    url(r'^search/corpus/$', general_view.search, {'type': 'corpus'}, 
     201        name="telemeta-search-corpus"), 
     202    url(r'^search/fonds/$', general_view.search, {'type': 'fonds'}, 
     203        name="telemeta-search-fonds"), 
     204 
    199205    url(r'^search/criteria/$', general_view.edit_search, name="telemeta-search-criteria"), 
    200206    url(r'^complete_location/$', general_view.complete_location, name="telemeta-complete-location"), 
     
    296302    url(r'^desk/lists/$', general_view.lists, name="telemeta-desk-lists"), 
    297303    url(r'^desk/profile/(?P<username>[A-Za-z0-9._-]+)/$', profile_view.profile_detail, name="telemeta-desk-profile"), 
    298     url(r'^desk/home/$', general_view.index, name="telemeta-desk-home"), 
     304    url(r'^desk/home/$', general_view.home, name="telemeta-desk-home"), 
    299305 
    300306    # Profiles 
    301307    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/$', profile_view.profile_detail, name="telemeta-profile-detail"), 
    302308    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/edit/$', profile_view.profile_edit, name="telemeta-profile-edit"), 
    303 #    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/profile/rss/$', profile_view.rss, name="telemeta-profile-rss"), 
    304  
     309    url(r'^users/(?P<username>[A-Za-z0-9._-]+)/rss/$', UserRevisionsFeed(),  name="telemeta-user-rss"), 
    305310 
    306311    # Registration 
  • telemeta/util/locale_fix.py

    r47460cc r72b372a  
    55a = _("My last changes") 
    66a = _("All last changes") 
     7a = _("My searches") 
     8a = _("Children") 
     9a = _("pattern") 
  • telemeta/views/base.py

    re189e26 r72b372a  
    5252from django.http import HttpResponse, HttpResponseRedirect 
    5353from django.http import Http404 
    54 from django.shortcuts import render_to_response, redirect 
     54from django.shortcuts import render_to_response, redirect, get_object_or_404 
    5555from django.views.generic import list_detail 
     56from django.views.generic import DetailView 
    5657from django.conf import settings 
    5758from django.contrib import auth 
     
    182183                    if resource.resource_type == 'marker': 
    183184                        element = MediaItemMarker.objects.get(id=resource.resource_id) 
     185                    if resource.resource_type == 'corpus': 
     186                        element = MediaCorpus.objects.get(id=resource.resource_id) 
     187                    if resource.resource_type == 'fonds': 
     188                        element = MediaFonds.objects.get(id=resource.resource_id) 
    184189                except: 
    185190                    element = None 
     
    217222    """Provide general web UI methods""" 
    218223 
    219     def index(self, request): 
     224    def home(self, request): 
    220225        """Render the index page""" 
    221226 
     
    309314        collections = MediaCollection.objects.enriched() 
    310315        items = MediaItem.objects.enriched() 
     316        corpus = MediaCorpus.objects.all() 
     317        fonds  = MediaFonds.objects.all() 
    311318        input = request.REQUEST 
    312319        criteria = {} 
     
    315322            'pattern': lambda value: ( 
    316323                collections.quick_search(value), 
    317                 items.quick_search(value)), 
     324                items.quick_search(value), 
     325                corpus.quick_search(value), 
     326                fonds.quick_search(value), 
     327                ), 
    318328            'title': lambda value: ( 
    319329                collections.word_search('title', value), 
    320                 items.by_title(value)), 
     330                items.by_title(value), 
     331                corpus.word_search('title', value), 
     332                fonds.word_search('title', value)), 
    321333            'location': lambda value: ( 
    322334                collections.by_location(Location.objects.get(name=value)), 
     
    354366                try: 
    355367                    res = func(value) 
    356                     if len(res)  > 2: 
     368                    if len(res)  > 4: 
     369                        collections, items, corpus, fonds, value = res 
     370                    elif len(res) == 4: 
     371                        collections, items, corpus, fonds = res 
     372                    elif len(res) == 3: 
    357373                        collections, items, value = res 
     374                        corpus = corpus.none() 
     375                        fonds = fonds.none() 
    358376                    else: 
    359377                        collections, items = res 
     378                        corpus = corpus.none() 
     379                        fonds = fonds.none() 
     380 
    360381                except ObjectDoesNotExist: 
    361382                    collections = collections.none() 
    362383                    items = items.none() 
     384                    corpus = corpus.none() 
     385                    fonds = fonds.none() 
    363386 
    364387                criteria[key] = value 
    365388 
     389        # Save the search 
     390        user = request.user 
     391        if user: 
     392            if user.is_authenticated(): 
     393                search = Search(username=user) 
     394                search.save() 
     395                if criteria: 
     396                    for key in criteria.keys(): 
     397                        value = criteria[key] 
     398                        if key == 'ethnic_group': 
     399                            try: 
     400                                group = EthnicGroup.objects.get(value=value) 
     401                                value = group.id 
     402                            except: 
     403                                value = '' 
     404                        criter = Criteria(key=key, value=value) 
     405                        criter.save() 
     406                        search.criteria.add(criter) 
     407                    search.save() 
     408 
    366409        if type is None: 
    367             if collections.count(): 
     410            if items.count(): 
     411                type = 'items' 
     412            else: 
    368413                type = 'collections' 
    369             else: 
    370                 type = 'items' 
    371414 
    372415        if type == 'items': 
    373416            objects = items 
    374         else: 
     417        elif type == 'collections': 
    375418            objects = collections 
     419        elif type == 'corpus': 
     420            objects = corpus 
     421        elif type == 'fonds': 
     422            objects = fonds 
    376423 
    377424        return list_detail.object_list(request, objects, 
    378425            template_name='telemeta/search_results.html', paginate_by=20, 
    379426            extra_context={'criteria': criteria, 'collections_num': collections.count(), 
    380                 'items_num': items.count(), 'type' : type}) 
     427                'items_num': items.count(), 'corpus_num': corpus.count(), 'fonds_num': fonds.count(), 
     428                'type' : type,}) 
    381429 
    382430    def complete_location(self, request, with_items=True): 
     
    420468        related_media = MediaCollectionRelated.objects.filter(collection=collection) 
    421469        check_related_media(related_media) 
    422  
    423         return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access, 'items': items, 'related_media': related_media}) 
     470        parents = MediaCorpus.objects.filter(children=collection) 
     471 
     472        return render(request, template, {'collection': collection, 'playlists': playlists, 'public_access': public_access, 'items': items, 'related_media': related_media, 'parents': parents }) 
    424473 
    425474    @method_decorator(permission_required('telemeta.change_mediacollection')) 
     
    665714        media = MediaItemRelated.objects.get(item=item, id=media_id) 
    666715        response = HttpResponse(stream_from_file(media.file.path), mimetype=media.mime_type) 
    667 #        response['Content-Disposition'] = 'attachment' 
     716#        response['Content-Disposition'] = 'attachment; '+'filename='+media.title+'.'+ext 
    668717        return response 
    669718 
     
    12481297        if isinstance(playlist, dict): 
    12491298            m = Playlist.objects.get(public_id=playlist['public_id']) 
    1250             m.title = float(playlist['title']) 
     1299            m.title = playlist['title'] 
    12511300            m.description = playlist['description'] 
    12521301            m.save() 
     
    14081457 
    14091458 
     1459class UserRevisionsFeed(LastestRevisionsFeed): 
     1460 
     1461    def get_object(self, request, username): 
     1462        return get_object_or_404(User, username=username) 
     1463 
     1464    def items(self, obj): 
     1465        return get_revisions(self.n_items, obj) 
     1466 
     1467 
    14101468class ResourceView(object): 
    14111469    """Provide Resource web UI methods""" 
     
    14151473                'form' : MediaCorpusForm, 
    14161474                'related': MediaCorpusRelated, 
    1417                 'related_form': MediaCorpusRelatedForm 
     1475                'related_form': MediaCorpusRelatedForm, 
     1476                'parent': MediaFonds, 
    14181477                }, 
    14191478            'fonds': 
     
    14211480                'form' : MediaFondsForm, 
    14221481                'related': MediaFondsRelated, 
    1423                 'related_form': MediaFondsRelatedForm 
     1482                'related_form': MediaFondsRelatedForm, 
     1483                'parent': None, 
    14241484                } 
    14251485            } 
     
    14301490        self.related = self.types[type]['related'] 
    14311491        self.related_form = self.types[type]['related_form'] 
     1492        self.parent = self.types[type]['parent'] 
    14321493        self.type = type 
    14331494 
     
    14391500        related_media = self.related.objects.filter(resource=resource) 
    14401501        check_related_media(related_media) 
    1441  
    1442         return render(request, template, {'resource': resource, 'type': type, 'children': children, 'related_media': related_media}) 
     1502        playlists = get_playlists(request) 
     1503        if self.parent: 
     1504            parents = self.parent.objects.filter(children=resource) 
     1505        else: 
     1506            parents = [] 
     1507 
     1508        return render(request, template, {'resource': resource, 'type': type, 'children': children, 'related_media': related_media, 'parents': parents, 'playlists': playlists }) 
    14431509 
    14441510    @jsonrpc_method('telemeta.change_fonds') 
  • telemeta/pages/en/home.rst

    rd2f5d12 r5bdea41  
    1 ================================== 
    2 Telemeta : an open web audio CMS 
    3 ================================== 
     1============================================== 
     2Sound archives of the CNRS - Musée de l'Homme 
     3============================================== 
    44 
    5 `Telemeta <http://telemeta.org>`_ is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily organize, backup and publish documented sound collections of audio files, CDs, digitalized vinyls and magnetic tapes over a strong database, in accordance with open web standards. 
     5The establishment of the `CREM <http://www.crem-cnrs.fr>`_’s audio archives is the result of a long history of scientific research on music. Since the birth of ethnomusicology (then "comparative musicology"), which coincided with the invention of the first recorders in the late nineteenth century, recording music materials and their classification and preservation are central in our knowledge of the musical Man. 
    66 
    7 Key features of Telemeta: 
    8      
    9  * Secure archiving, editing and publishing of audio files over internet. 
    10  * User friendly web frontend including workflows and high level search methods 
    11  * Smart dynamical and skinnable audio player (thanks to `TimeSide <http://code.google.com/p/timeside/>`_ and `SoundManager2 <http://www.schillmania.com/projects/soundmanager2/>`_) 
    12  * "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture 
    13  * Collaborative temporal indexing with fast user marker management 
    14  * Multi-format support : FLAC, OGG, MP3, WAV and more 
    15  * User management with individual profiles and rights 
    16  * User playlist management with CSV data export 
    17  * Geo-Navigator for audio geolocalization 
    18  * `DublinCore <http://dublincore.org/>`_ compatibility 
    19  * `OAI-PMH <http://www.openarchives.org/pmh/>`_ data provider 
    20  * Relational database system (MySQL type) 
    21  * RSS feeds generator 
    22  * XML serialized backup 
     7.. image:: home_img.jpg 
     8    :align: left 
    239 
    24 This web audio CMS is exclusively based on open source modules and can be run on any Unix or Linux system. It is mostly written in Python and JavaScript. 
     10With the foundation of the Sound Archive at the Musée d’Ethnographie du Trocadéro by André Schaeffner in 1932 (which became the Sound Archive of the Musée de l’Homme in 1937) and the creation in 1967 of "Laboratoire d’Analyse sonore" on Gilbert Rouget initiative and the creation of a research team from the `CNRS <http://www.cnrs.fr/>`_ (Scientific Research National Center in France) in 1968, both at the `Musée de l’Homme <http://www.museedelhomme.fr/>`_, the conservation of this vast archives collection was more closely related to research : it is powered by the fieldworks of researchers on all continents; collections can serve for research, diachronic and synchronic comparisons, the preparation of new fieldworks and the training of Ph.D students. In 1985, the `CNRS <http://www.cnrs.fr/>`_ and the `Musée National d'Histoire Naturelle <http://www.mnhn.fr/>`_ (National Museum of Natural History) decided to join efforts to preserve this vast archives, therefore called "Sound Archives of CNRS - Musée de l'Homme". A small portion of these archives has been published in 78s (Vox Africa, etc ...), 33 rpm discs and CD (Chant du Monde, Harmonia Mundi). Currently, analogic media are being digitalized with the assistance of the Ministry of Culture and National Library of France. With the installation of the `Center for Research in Ethnomusicology <http://www.crem-cnrs.fr>`_ (CREM, Department of Ethnology and Comparative Sociology, CNRS UMR 7186) at the University of Paris Ouest-Nanterre in 2009, and the opening of the `Telemeta <http://telemeta.org>`_ platform in 2010, this collection sound archives from the era of the Internet. 
     11 
     12The archives of CREM, the most important in Europe, are distinguished by their wealth: 
     13 
     14 * Nearly 3,500 hours of recordings of unpublished field. 
     15 * Approximately 3700 hours of material published (more than 5000 discs, many of which are very rare). 
     16 
     17The collaborative platform `Telemeta <http://telemeta.org>`_ aims to make these archives available to researchers and to the extent possible, the public, in compliance with the intellectual and moral rights of musicians and collectors. Developed with the support of the program `TGE-Adonis <http://www.tge-adonis.fr/>`_ of the `CNRS <http://www.cnrs.fr/>`_, allows researchers to exchange data online with communities producing their music in their home countries, including through collaborative tools like markers , spaces, comments, etc... 
     18 
     19This site is managed by the `CREM <http://www.crem-cnrs.fr>`_. All collaborations are welcome to enrich and enhance this precious musical heritage common to all humanity. Currently, a thousand hours is searchable by code or `access on site and CREM (Université Paris Ouest - Nanterre - La Défense, Building C, Ground Floor, Room 20) <http://goo.gl/maps/ZgHg>`_, and the Central Library Muséum National d'Histoire Naturelle, and the Bibliothèque François Mitterand (garden). 
    2520 
    2621| 
    27  
  • telemeta/pages/en/legal_notices.rst

    rd2f5d12 r5bdea41  
    1 ================== 
    2 Legal notices 
    3 ================== 
     1===================== 
     2Legal Notices 
     3===================== 
    44 
    5 **Telemeta is edited by Parisson SARL** 
     5**Site editor:** 
    66 
    7 | Parisson SARL  
    8 | 16 rue Jacques Louvel-Tessier 75010 Paris, France 
    9 | `http://parisson.com <http://parisson.com>`_ 
    10 | 
    11 | Copyright (C) 2006-2011 Parisson SARL 
    12 | 
    13 | This software is governed by the CeCILL v2 license under French law and 
    14 | abiding by the rules of distribution of free software.  You can  use,  
    15 | modify and/ or redistribute the software under the terms of the CeCILL v2 
    16 | license as circulated by CEA, CNRS and INRIA at the following URL 
    17 | `http://www.cecill.info <http://www.cecill.info>`_.  
    18 | 
    19 | As a counterpart to the access to the source code and  rights to copy, 
    20 | modify and redistribute granted by the license, users are provided only 
    21 | with a limited warranty  and the software's author,  the holder of the 
    22 | economic rights,  and the successive licensors  have only  limited 
    23 | liability.  
    24 | 
    25 | In this respect, the user's attention is drawn to the risks associated 
    26 | with loading,  using,  modifying and/or developing or reproducing the 
    27 | software by the user in light of its specific status of free software, 
    28 | that may mean  that it is complicated to manipulate,  and  that  also 
    29 | therefore means  that it is reserved for developers  and  experienced 
    30 | professionals having in-depth computer knowledge. Users are therefore 
    31 | encouraged to load and test the software's suitability as regards their 
    32 | requirements in conditions enabling the security of their systems and/or  
    33 | data to be ensured and,  more generally, to use and operate it in the  
    34 | same conditions as regards security.  
    35 | 
    36 | The fact that you are presently reading this means that you have had 
    37 | knowledge of the CeCILL v2 license and that you accept its terms. 
     7 | Centre de Recherche en Ethnomusicologie (CREM - LESC UMR 7186 CNRS)  
     8 | MAE - 21, allée de l'Université 
     9 | 92023 Nanterre cedex 
     10 | France 
    3811 
     12**Managing editor:** 
     13 
     14 | Jean Lambert (director du CREM) 
     15 | e-mail : lambert (at) mnhn.fr 
     16 
     17**Design and project manager:** 
     18 
     19 | Joséphine Simonnot (CREM) 
     20 | e-mail : josephine.simonnot (at) mae.u-paris10.fr 
     21  
     22**Head of archives at CREM :** 
     23 
     24 | Aude Da Cruz-Lima (CREM) 
     25 | e-mail : aude.da-cruz-lima (at) mae.u-paris10.fr 
     26  
     27**Design and head of development:** 
     28 
     29 | Guillaume Pellerin (`Parisson <http://parisson.com>`_) 
     30 | e-mail : guillaume.pellerin@parisson.com 
     31 
     32**Telemeta CREM uses GeoEthno:** 
     33 
     34 | © CNRS 
     35 | Responsable de GeoEthno: Isabelle Donze 
     36 | Laboratoire d'ethnologie et de sociologie comparative 
     37 | Bibliothèque Eric-de-Dampierre (Responsable : Marie-Dominique Mouton) 
     38 | Maison de l'Archéologie et de l'Ethnologie 
     39 | Université de Paris Ouest La Défense - 92023 Nanterre cedex - France 
     40 | Contact : bibethno@mae.u-paris10.fr  
     41 
     42| **AUDIO FILE COPYING FORBIDDEN IF NOT EXPLICITLY ALLOWED** 
     43| **COMMERCIAL USING OF THE ARCHIVES FORBIDDEN IF NOT EXPLICITLY ALLOWED** 
     44 
     45 
     46 
  • telemeta/pages/fr/home.rst

    rd2f5d12 r5bdea41  
    1 =================================== 
    2 Telemeta : un CMS audio libre 
    3 =================================== 
     1============================================ 
     2Archives sonores du CNRS - Musée de l'Homme  
     3============================================ 
    44 
    5 `Telemeta <http://telemeta.org>`_ est une solution libre d'archivage et d'indexation audio basée sur une interface de type web. Elle offre des fonctions avancées d'édition, d'indexation, de transcodage, de publication et de sauvegarde d'archives audio et de leurs méta-données. Il donne accès aux ressources distantes publiées ou privatisés issues de collections numérisées (fichiers, CD audio, vinyl ou bandes magnétiques) par l'intermédiaire d'un simple navigateur ou d'une application dédiée en accord avec les standards du web. 
     5La constitution des archives sonores du `CREM <http://www.crem-cnrs.fr>`_ est l’aboutissement d’une longue histoire de la recherche scientifique sur la musique. Depuis la naissance de l’ethnomusicologie (alors « musicologie comparée »), qui coïncida avec l'invention des premiers appareils enregistreurs à la fin du XIXe siècle, l'enregistrement des documents musicaux, ainsi que leur classification et leur conservation occupent une place centrale dans notre connaissance de l’Homme musical. 
    66 
    7 Liste des fonctionnalités principales: 
     7.. image:: home_img.jpg 
     8    :align: left 
    89 
    9  * Edition, archivage pérenne sécurisé, indexation collaborative sur la base d'une application web 
    10  * Interface utilisateur conforme aux standards ouverts du web 
    11  * Moteur de recherche par mots clés ou par critères (géographiques, ethniques, etc...) 
    12  * Lecteur audio avancé dynamique et paramétrable (tous formats audio et video supportés) 
    13  * Moteur d'analyse et de visualisation audio basée sur une structure de modules paramétrables 
    14  * Transcodage vers les formats FLAC, OGG, MP3 et WAV avec encapsulation des métadonnées à la volée 
    15  * Gestion complète des droits et profils utilisateurs 
    16  * Gestion de listes de lecture personnelles avec export CSV 
    17  * Indexation temporelle à la volée (marqueurs textuels sur le lecteur web audio) 
    18  * Base de données relationnelle (type MySQL) 
    19  * Service d'accès aux données par le protocole OAI-PMH (moissonnage) 
    20  * Compatibilité `DublinCore <http://dublincore.org/>`_ 
    21  * Service de moissonnage `OAI-PMH <http://www.openarchives.org/pmh/>`_  
    22  * Geo-navigateur pour la géolocalisation audio (Google Maps) 
    23  * Flux RSS dynamique des dernières modifications 
    24  * Sauvegarde sérialisée des archives et de leurs métadonnées aux formats WAV + XML 
    25  * Traduction complète anglais / français (détection automatique et/ou contrainte manuelle) 
    26   
    27 Ce CMS audio est exclusivement basé sur des modules open source et peut être installé sur tout système Linux ou Unix. 
    28 Il est majoritairement écrit en Python et JavaScript. 
     10Avec l'ouverture de la Phonothèque au Musée d'Ethnographie du Trocadéro par André Schaeffner en 1932 (qui devint la Phonothèque du Musée de l’Homme en 1937) puis la création en 1967 du "Laboratoire d'analyse du son" à l'initiative de Gilbert Rouget, ainsi que la création d'une équipe de recherche du `CNRS <http://www.cnrs.fr/>`_ en 1968, tous deux au `Musée de l’Homme <http://www.museedelhomme.fr/>`_, la conservation de ce vaste fonds d'archives sonores fut plus étroitement liée à la recherche : celui-ci est alimenté par les missions de terrain des chercheurs sur tous les continents ; les collections permettent à la fois des recherches de laboratoire, des comparaisons diachroniques et synchroniques, la préparation de nouveaux terrains et la formation des doctorants. En 1985, le `CNRS <http://www.cnrs.fr/>`_ et le `Musée National d'Histoire Naturelle <http://www.mnhn.fr/>`_ décidèrent de joindre leurs efforts pour conserver ce vaste fonds d'archives, baptisé dès lors "Archives sonores CNRS - Musée de l'Homme". Une petite partie de ces archives a été publiée en disques 78 tours (Africa Vox, etc…), disques 33 tours  et en CD (Chant du Monde, Harmonia Mundi). Actuellement, les supports analogiques sont en cours de numérisation grâce à l'aide du Ministère de la Culture et de la Bibliothèque Nationale de France, Avec l’installation du `Centre de Recherche en Ethnomusicologie <http://www.crem-cnrs.fr>`_ (CREM, `Laboratoire d'Ethnologie et de Sociologie Comparative <http://www.u-paris10.fr/LESC/0/fiche___laboratoire/&RH=rec_lab>`_, UMR 7186) à l’Université de Paris Ouest - Nanterre La Défense en 2009, et l’ouverture de la plate-forme `Telemeta <http://telemeta.org>`_ en 2011, ce fonds d’archives sonores entre dans l’ère de l'internet. 
     11 
     12Les archives du CREM, parmi les plus importantes d’Europe, se distinguent par leur richesse : 
     13 
     14 * près de 3500 heures d'enregistrements de terrain non publiés. 
     15 * environ 3700 heures de documents publiés (plus de 5000 disques dont beaucoup sont très rares). 
     16 
     17La plateforme collaborative `Telemeta <http://telemeta.org>`_ vise à rendre ces archives accessibles aux chercheurs et, dans la mesure du possible, au public, dans le respect des droits intellectuels et moraux des musiciens et des collecteurs. Mise au point grâce au soutien du programme `TGE-Adonis <http://www.tge-adonis.fr/>`_ du `CNRS <http://www.cnrs.fr/>`_, elle permet aux chercheurs d'échanger les données en ligne, avec les communautés productrices de ces musiques dans leur pays d'origine, notamment au moyen d’outils collaboratifs comme des marqueurs temporels, des espaces de commentaires, etc...  
     18 
     19La gestion de la plateforme est assurée par le `CREM <http://www.crem-cnrs.fr>`_. Le site accueille toutes les collaborations visant à enrichir et valoriser ce précieux patrimoine musical commun à toute l'Humanité. Actuellement, un millier d’heures est consultable en ligne avec un code d’accès, mais aussi `sur place au CREM (Université Paris-Ouest Nanterre-La Défense, bâtiment C, rez-de-chaussée, pièce 20) <http://goo.gl/maps/ZgHg>`_, ainsi qu’à la Bibliothèque centrale du Muséum National d’Histoire Naturelle, et à la Bibliothèque François Mitterand (rez de jardin). 
    2920 
    3021| 
  • telemeta/pages/fr/legal_notices.rst

    rd2f5d12 r5bdea41  
    1 ================== 
    2 Mentions légales 
    3 ================== 
     1===================== 
     2Mentions Légales 
     3===================== 
    44 
    5 **Telemeta est édité par la Société Parisson SARL** 
     5**Editeur du site :** 
    66 
    7 | Parisson SARL  
    8 | 16 rue Jacques Louvel-Tessier 75010 Paris, France 
    9 | `http://parisson.com <http://parisson.com>`_ 
    10 | 
    11 | Copyright (C) 2006-2011 Parisson SARL 
    12 | 
    13 | Ce logiciel est régi par la licence CeCILL v2 soumise au droit français et 
    14 | respectant les principes de diffusion des logiciels libres. Vous pouvez 
    15 | utiliser, modifier et/ou redistribuer ce programme sous les conditions 
    16 | de la licence CeCILL v2 telle que diffusée par le CEA, le CNRS et l'INRIA  
    17 | sur le site `http://www.cecill.info <http://www.cecill.info>`_. 
    18 | 
    19 | En contrepartie de l'accessibilité au code source et des droits de copie, 
    20 | de modification et de redistribution accordés par cette licence, il n'est 
    21 | offert aux utilisateurs qu'une garantie limitée.  Pour les mêmes raisons, 
    22 | seule une responsabilité restreinte pèse sur l'auteur du programme,  le 
    23 | titulaire des droits patrimoniaux et les concédants successifs. 
    24 | 
    25 | A cet égard  l'attention de l'utilisateur est attirée sur les risques 
    26 | associés au chargement,  à l'utilisation,  à la modification et/ou au 
    27 | développement et à la reproduction du logiciel par l'utilisateur étant  
    28 | donné sa spécificité de logiciel libre, qui peut le rendre complexe à  
    29 | manipuler et qui le réserve donc à des développeurs et des professionnels 
    30 | avertis possédant  des  connaissances  informatiques approfondies.  Les 
    31 | utilisateurs sont donc invités à charger  et  tester  l'adéquation  du 
    32 | logiciel à leurs besoins dans des conditions permettant d'assurer la 
    33 | sécurité de leurs systèmes et ou de leurs données et, plus généralement,  
    34 | à l'utiliser et l'exploiter dans les mêmes conditions de sécurité.  
    35 | 
    36 | Le fait que vous puissiez accéder à cet en-tête signifie que vous avez  
    37 | pris connaissance de la licence CeCILL v2, et que vous en avez accepté les 
    38 | termes. 
     7 | Centre de Recherche en Ethnomusicologie (CREM - LESC UMR 7186 CNRS)  
     8 | MAE - 21, allée de l'Université 
     9 | 92023 Nanterre cedex 
     10 | France 
     11 
     12**Directeur de publication :** 
     13 
     14 | Jean Lambert (directeur du CREM) 
     15 | e-mail : lambert (at) mnhn.fr 
     16 
     17**Chef de projet et conception :** 
     18 
     19 | Joséphine Simonnot (CREM) 
     20 | e-mail : josephine.simonnot (at) mae.u-paris10.fr 
     21  
     22**Responsable des archives du CREM :** 
     23 
     24 | Aude Da Cruz-Lima (CREM) 
     25 | e-mail : aude.da-cruz-lima (at) mae.u-paris10.fr 
     26  
     27**Chef du développement et conception:** 
     28 
     29 | Guillaume Pellerin (`Parisson <http://parisson.com>`_) 
     30 | e-mail : guillaume.pellerin@parisson.com 
     31 
     32**Telemeta CREM utilise GeoEthno:** 
     33 
     34 | © CNRS 
     35 | Responsable de GeoEthno: Isabelle Donze 
     36 | Laboratoire d'ethnologie et de sociologie comparative 
     37 | Bibliothèque Eric-de-Dampierre (Responsable : Marie-Dominique Mouton) 
     38 | Maison de l'Archéologie et de l'Ethnologie 
     39 | Université de Paris Ouest La Défense - 92023 Nanterre cedex - France 
     40 | Contact : bibethno@mae.u-paris10.fr  
     41 
     42| **COPIE DES ARCHIVES SONORES INTERDITE SI PAS EXPLICITEMENT AUTORISÉ** 
     43| **UTILISATION COMMERCIALE DES ARCHIVES SONORES INTERDITE SI PAS EXPLICITEMENT AUTORISÉ** 
     44 
     45 
     46 
Note: See TracChangeset for help on using the changeset viewer.