From: yomguy Date: Thu, 23 Jun 2011 14:23:01 +0000 (+0200) Subject: add samplerate and resolution to audio analyses, fix item edit locale, go to 1.0 X-Git-Tag: 1.1~70 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=3842ea4b72a71b069fa60504f6aaf7a67396f2b7;p=telemeta.git add samplerate and resolution to audio analyses, fix item edit locale, go to 1.0 --- diff --git a/INSTALL.rst b/INSTALL.rst index 1dc02f33..8e423c6f 100644 --- a/INSTALL.rst +++ b/INSTALL.rst @@ -85,6 +85,8 @@ Install Telemeta sudo python setup.py install +--------------------- +Fast testing -------------------------- Create a Django project @@ -108,6 +110,11 @@ We need 2 directories for media and caching:: You might want to place these data directories somewhere else, no pb. +------------------------ +Create the database +------------------------ + +Telemeta needs MySQL to work well and fast. So you need to create a MySQL database before trying it. ---------------------------------- Configure the telemeta project diff --git a/telemeta/__init__.py b/telemeta/__init__.py index 323b0cad..32b46462 100644 --- a/telemeta/__init__.py +++ b/telemeta/__init__.py @@ -12,7 +12,7 @@ U{http://telemeta.org} """ __docformat__ = 'epytext en' -__version__ = '0.9.9' +__version__ = '1.0' __url__ = 'http://telemeta.org' __copyright__ = '(C) 2007-2011 Parisson' __license__ = 'CeCILL-2' diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index b3bc812b..13a030f6 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po index 19a696e8..93976d6f 100644 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-22 17:42+0200\n" +"POT-Creation-Date: 2011-06-23 15:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -326,7 +326,7 @@ msgid "language" msgstr "" #: models/media.py:245 -msgid "comments" +msgid "comments / ethnographic context" msgstr "" #: models/media.py:246 @@ -366,7 +366,7 @@ msgid "file" msgstr "" #: models/media.py:278 models/media.py:471 -#: templates/telemeta_default/mediaitem_detail.html:178 +#: templates/telemeta_default/mediaitem_detail.html:181 msgid "keywords" msgstr "" @@ -614,22 +614,22 @@ msgstr "" msgid "Admin" msgstr "" -#: templates/telemeta_default/base.html:116 +#: templates/telemeta_default/base.html:117 msgid "Powered by" msgstr "" -#: templates/telemeta_default/base.html:117 +#: templates/telemeta_default/base.html:118 msgid "By" msgstr "" -#: templates/telemeta_default/base.html:122 +#: templates/telemeta_default/base.html:123 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." msgstr "" -#: templates/telemeta_default/base.html:128 -#: templates/telemeta_default/collection_detail.html:137 +#: templates/telemeta_default/base.html:129 +#: templates/telemeta_default/collection_detail.html:118 msgid "Legal notices" msgstr "" @@ -672,85 +672,93 @@ msgstr "" msgid "Collection" msgstr "" -#: templates/telemeta_default/collection_detail.html:64 -#: templates/telemeta_default/mediaitem_detail.html:78 -#: templates/telemeta_default/mediaitem_detail.html:178 -#: templates/telemeta_default/mediaitem_detail.html:217 +#: templates/telemeta_default/collection_detail.html:45 +#: templates/telemeta_default/mediaitem_detail.html:79 +#: templates/telemeta_default/mediaitem_detail.html:181 +#: templates/telemeta_default/mediaitem_detail.html:220 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "" -#: templates/telemeta_default/collection_detail.html:65 -#: templates/telemeta_default/mediaitem_detail.html:79 +#: templates/telemeta_default/collection_detail.html:46 +#: templates/telemeta_default/mediaitem_detail.html:80 msgid "Copy" msgstr "" -#: templates/telemeta_default/collection_detail.html:66 +#: templates/telemeta_default/collection_detail.html:47 msgid "Add item" msgstr "" -#: templates/telemeta_default/collection_detail.html:69 -#: templates/telemeta_default/mediaitem_detail.html:82 +#: templates/telemeta_default/collection_detail.html:50 +#: templates/telemeta_default/mediaitem_detail.html:83 msgid "Add to playlist" msgstr "" -#: templates/telemeta_default/collection_detail.html:82 +#: templates/telemeta_default/collection_detail.html:63 msgid "Listen to this collection" msgstr "" -#: templates/telemeta_default/collection_detail.html:115 +#: templates/telemeta_default/collection_detail.html:96 +#: templates/telemeta_default/home.html:50 +#: templates/telemeta_default/inc/collection_list.html:17 msgid "Recording period" msgstr "" -#: templates/telemeta_default/collection_detail.html:124 -#: templates/telemeta_default/mediaitem_detail.html:162 +#: templates/telemeta_default/collection_detail.html:105 +#: templates/telemeta_default/mediaitem_detail.html:165 msgid "Geographic and cultural informations" msgstr "" -#: templates/telemeta_default/collection_detail.html:142 +#: templates/telemeta_default/collection_detail.html:123 #: templates/telemeta_default/home.html:49 #: templates/telemeta_default/inc/collection_list.html:16 #: templates/telemeta_default/inc/mediaitem_list.html:16 msgid "Recordist" msgstr "" -#: templates/telemeta_default/collection_detail.html:151 +#: templates/telemeta_default/collection_detail.html:132 msgid "Bibliographic references" msgstr "" -#: templates/telemeta_default/collection_detail.html:164 -#: templates/telemeta_default/mediaitem_detail.html:234 +#: templates/telemeta_default/collection_detail.html:145 +#: templates/telemeta_default/mediaitem_detail.html:237 msgid "Archiving data" msgstr "" -#: templates/telemeta_default/collection_detail.html:170 +#: templates/telemeta_default/collection_detail.html:151 msgid "Related documentation" msgstr "" -#: templates/telemeta_default/collection_detail.html:174 +#: templates/telemeta_default/collection_detail.html:155 msgid "Comments" msgstr "" -#: templates/telemeta_default/collection_detail.html:188 -#: templates/telemeta_default/mediaitem_detail.html:250 +#: templates/telemeta_default/collection_detail.html:169 +#: templates/telemeta_default/mediaitem_detail.html:253 msgid "Technical data" msgstr "" -#: templates/telemeta_default/collection_detail.html:193 -#: templates/telemeta_default/mediaitem_detail.html:253 +#: templates/telemeta_default/collection_detail.html:174 +#: templates/telemeta_default/mediaitem_detail.html:256 msgid "Media type" msgstr "" -#: templates/telemeta_default/collection_detail.html:193 -#: templates/telemeta_default/mediaitem_detail.html:253 +#: templates/telemeta_default/collection_detail.html:174 +#: templates/telemeta_default/mediaitem_detail.html:256 msgid "Audio" msgstr "" -#: templates/telemeta_default/collection_detail.html:198 +#: templates/telemeta_default/collection_detail.html:179 #: templates/telemeta_default/geo_countries.html:16 msgid "Number of items" msgstr "" +#: templates/telemeta_default/collection_detail.html:206 +#: templates/telemeta_default/home.html:35 +#: templates/telemeta_default/mediaitem_detail.html:271 +msgid "Delete" +msgstr "" + #: templates/telemeta_default/collection_detail_dc.html:12 #: templates/telemeta_default/mediaitem_detail_dc.html:7 msgid "Normal View" @@ -808,7 +816,7 @@ msgstr "" #: templates/telemeta_default/enumeration_edit.html:14 #: templates/telemeta_default/enumeration_edit.html:28 #: templates/telemeta_default/enumeration_edit_value.html:14 -#: templates/telemeta_default/mediaitem_detail.html:122 +#: templates/telemeta_default/mediaitem_detail.html:125 msgid "Value" msgstr "" @@ -875,11 +883,6 @@ msgstr[1] "" msgid "Playlists" msgstr "" -#: templates/telemeta_default/home.html:35 -#: templates/telemeta_default/mediaitem_detail.html:264 -msgid "Delete" -msgstr "" - #: templates/telemeta_default/home.html:47 #: templates/telemeta_default/inc/module_revisions.html:13 msgid "Type" @@ -893,14 +896,6 @@ msgstr "" msgid "Code" msgstr "" -#: templates/telemeta_default/home.html:50 -#: templates/telemeta_default/search_criteria.html:94 -#: templates/telemeta_default/search_results.html:33 -#: templates/telemeta_default/inc/collection_list.html:17 -#: templates/telemeta_default/inc/mediaitem_list.html:22 -msgid "Year of recording" -msgstr "" - #: templates/telemeta_default/home.html:51 #: templates/telemeta_default/inc/collection_list.html:18 #: templates/telemeta_default/inc/mediaitem_list.html:23 @@ -948,70 +943,70 @@ msgstr "" #: templates/telemeta_default/mediaitem_add.html:5 #: templates/telemeta_default/mediaitem_copy.html:5 -#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:457 +#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:464 msgid "Item" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:84 +#: templates/telemeta_default/mediaitem_detail.html:85 #: templates/telemeta_default/paginator.html:5 msgid "Previous" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:85 +#: templates/telemeta_default/mediaitem_detail.html:86 #: templates/telemeta_default/paginator.html:23 msgid "Next" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:111 +#: templates/telemeta_default/mediaitem_detail.html:114 msgid "Analysis" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:113 +#: templates/telemeta_default/mediaitem_detail.html:116 msgid "Markers" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:121 +#: templates/telemeta_default/mediaitem_detail.html:124 msgid "Property" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:123 +#: templates/telemeta_default/mediaitem_detail.html:126 msgid "Unit" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:131 +#: templates/telemeta_default/mediaitem_detail.html:134 msgid "Download:" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:152 +#: templates/telemeta_default/mediaitem_detail.html:155 msgid "Recording date" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:164 +#: templates/telemeta_default/mediaitem_detail.html:167 #: templates/telemeta_default/inc/mediaitem_list.html:18 msgid "Location" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:170 +#: templates/telemeta_default/mediaitem_detail.html:173 msgid "Comments / ethnographic context" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:183 +#: templates/telemeta_default/mediaitem_detail.html:186 msgid "Musical informations" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:217 +#: templates/telemeta_default/mediaitem_detail.html:220 msgid "performance" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:222 +#: templates/telemeta_default/mediaitem_detail.html:225 msgid "General informations" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:224 +#: templates/telemeta_default/mediaitem_detail.html:227 msgid "Remarks" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:240 +#: templates/telemeta_default/mediaitem_detail.html:243 msgid "Published references" msgstr "" @@ -1036,7 +1031,7 @@ msgstr "" msgid "User Profile" msgstr "" -#: templates/telemeta_default/profile_detail.html:8 web/base.py:1158 +#: templates/telemeta_default/profile_detail.html:8 web/base.py:1165 msgid "User profile" msgstr "" @@ -1095,6 +1090,12 @@ msgstr "" msgid "Advanced Search" msgstr "" +#: templates/telemeta_default/search_criteria.html:94 +#: templates/telemeta_default/search_results.html:33 +#: templates/telemeta_default/inc/mediaitem_list.html:22 +msgid "Year of recording" +msgstr "" + #: templates/telemeta_default/search_criteria.html:101 #: templates/telemeta_default/search_criteria.html:120 #: templates/telemeta_default/search_results.html:35 @@ -1142,7 +1143,7 @@ msgstr "" msgid "No item" msgstr "" -#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1189 +#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1196 msgid "Last changes" msgstr "" @@ -1329,11 +1330,11 @@ msgid_plural "%(count)d collections" msgstr[0] "" msgstr[1] "" -#: web/base.py:327 web/base.py:456 web/base.py:687 web/base.py:1157 +#: web/base.py:327 web/base.py:463 web/base.py:694 web/base.py:1164 msgid "Access not allowed" msgstr "" -#: web/base.py:329 web/base.py:458 web/base.py:689 web/base.py:1159 +#: web/base.py:329 web/base.py:465 web/base.py:696 web/base.py:1166 msgid "" "Please login or contact the website administator to get a private access." msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index e062ccc6..e4613baf 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po index 4c7efbc5..785d882a 100644 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-22 17:41+0200\n" +"POT-Creation-Date: 2011-06-23 15:55+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -326,8 +326,8 @@ msgid "language" msgstr "langue" #: models/media.py:245 -msgid "comments" -msgstr "commentaires" +msgid "comments / ethnographic context" +msgstr "commentaires / contexte ethnographique" #: models/media.py:246 msgid "moda_execut" @@ -366,7 +366,7 @@ msgid "file" msgstr "fichier" #: models/media.py:278 models/media.py:471 -#: templates/telemeta_default/mediaitem_detail.html:178 +#: templates/telemeta_default/mediaitem_detail.html:181 msgid "keywords" msgstr "mots-clés" @@ -620,15 +620,15 @@ msgstr "Recherche avancée" msgid "Admin" msgstr "Admin" -#: templates/telemeta_default/base.html:116 +#: templates/telemeta_default/base.html:117 msgid "Powered by" msgstr "Propulsé par" -#: templates/telemeta_default/base.html:117 +#: templates/telemeta_default/base.html:118 msgid "By" msgstr "Par" -#: templates/telemeta_default/base.html:122 +#: templates/telemeta_default/base.html:123 msgid "" "Usage of the archives in the respect of cultural heritage of the original " "communities." @@ -636,8 +636,8 @@ msgstr "" "Usage des archives réservé dans le respect du patrimoine culturel des " "communautés d'origine." -#: templates/telemeta_default/base.html:128 -#: templates/telemeta_default/collection_detail.html:137 +#: templates/telemeta_default/base.html:129 +#: templates/telemeta_default/collection_detail.html:118 msgid "Legal notices" msgstr "Mentions légales" @@ -680,85 +680,93 @@ msgstr "Enregistrer" msgid "Collection" msgstr "Collection" -#: templates/telemeta_default/collection_detail.html:64 -#: templates/telemeta_default/mediaitem_detail.html:78 -#: templates/telemeta_default/mediaitem_detail.html:178 -#: templates/telemeta_default/mediaitem_detail.html:217 +#: templates/telemeta_default/collection_detail.html:45 +#: templates/telemeta_default/mediaitem_detail.html:79 +#: templates/telemeta_default/mediaitem_detail.html:181 +#: templates/telemeta_default/mediaitem_detail.html:220 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "Editer" -#: templates/telemeta_default/collection_detail.html:65 -#: templates/telemeta_default/mediaitem_detail.html:79 +#: templates/telemeta_default/collection_detail.html:46 +#: templates/telemeta_default/mediaitem_detail.html:80 msgid "Copy" msgstr "Copier" -#: templates/telemeta_default/collection_detail.html:66 +#: templates/telemeta_default/collection_detail.html:47 msgid "Add item" msgstr "Ajouter item" -#: templates/telemeta_default/collection_detail.html:69 -#: templates/telemeta_default/mediaitem_detail.html:82 +#: templates/telemeta_default/collection_detail.html:50 +#: templates/telemeta_default/mediaitem_detail.html:83 msgid "Add to playlist" msgstr "Ajouter à la liste" -#: templates/telemeta_default/collection_detail.html:82 +#: templates/telemeta_default/collection_detail.html:63 msgid "Listen to this collection" msgstr "Écouter la collection" -#: templates/telemeta_default/collection_detail.html:115 +#: templates/telemeta_default/collection_detail.html:96 +#: templates/telemeta_default/home.html:50 +#: templates/telemeta_default/inc/collection_list.html:17 msgid "Recording period" msgstr "Période d'enregistrement" -#: templates/telemeta_default/collection_detail.html:124 -#: templates/telemeta_default/mediaitem_detail.html:162 +#: templates/telemeta_default/collection_detail.html:105 +#: templates/telemeta_default/mediaitem_detail.html:165 msgid "Geographic and cultural informations" msgstr "Indications géographiques et culturelles" -#: templates/telemeta_default/collection_detail.html:142 +#: templates/telemeta_default/collection_detail.html:123 #: templates/telemeta_default/home.html:49 #: templates/telemeta_default/inc/collection_list.html:16 #: templates/telemeta_default/inc/mediaitem_list.html:16 msgid "Recordist" msgstr "Collecteur" -#: templates/telemeta_default/collection_detail.html:151 +#: templates/telemeta_default/collection_detail.html:132 msgid "Bibliographic references" msgstr "Références bibliographiques" -#: templates/telemeta_default/collection_detail.html:164 -#: templates/telemeta_default/mediaitem_detail.html:234 +#: templates/telemeta_default/collection_detail.html:145 +#: templates/telemeta_default/mediaitem_detail.html:237 msgid "Archiving data" msgstr "Données d'archivage" -#: templates/telemeta_default/collection_detail.html:170 +#: templates/telemeta_default/collection_detail.html:151 msgid "Related documentation" msgstr "Documentation associée" -#: templates/telemeta_default/collection_detail.html:174 +#: templates/telemeta_default/collection_detail.html:155 msgid "Comments" msgstr "Commentaires" -#: templates/telemeta_default/collection_detail.html:188 -#: templates/telemeta_default/mediaitem_detail.html:250 +#: templates/telemeta_default/collection_detail.html:169 +#: templates/telemeta_default/mediaitem_detail.html:253 msgid "Technical data" msgstr "Données techniques" -#: templates/telemeta_default/collection_detail.html:193 -#: templates/telemeta_default/mediaitem_detail.html:253 +#: templates/telemeta_default/collection_detail.html:174 +#: templates/telemeta_default/mediaitem_detail.html:256 msgid "Media type" msgstr "Type de media" -#: templates/telemeta_default/collection_detail.html:193 -#: templates/telemeta_default/mediaitem_detail.html:253 +#: templates/telemeta_default/collection_detail.html:174 +#: templates/telemeta_default/mediaitem_detail.html:256 msgid "Audio" msgstr "Audio" -#: templates/telemeta_default/collection_detail.html:198 +#: templates/telemeta_default/collection_detail.html:179 #: templates/telemeta_default/geo_countries.html:16 msgid "Number of items" msgstr "Nombre d'items" +#: templates/telemeta_default/collection_detail.html:206 +#: templates/telemeta_default/home.html:35 +#: templates/telemeta_default/mediaitem_detail.html:271 +msgid "Delete" +msgstr "Supprimer" + #: templates/telemeta_default/collection_detail_dc.html:12 #: templates/telemeta_default/mediaitem_detail_dc.html:7 msgid "Normal View" @@ -816,7 +824,7 @@ msgstr "Ajouter une entrée" #: templates/telemeta_default/enumeration_edit.html:14 #: templates/telemeta_default/enumeration_edit.html:28 #: templates/telemeta_default/enumeration_edit_value.html:14 -#: templates/telemeta_default/mediaitem_detail.html:122 +#: templates/telemeta_default/mediaitem_detail.html:125 msgid "Value" msgstr "Valeur" @@ -883,11 +891,6 @@ msgstr[1] "%(counter)s items " msgid "Playlists" msgstr "Listes de lecture" -#: templates/telemeta_default/home.html:35 -#: templates/telemeta_default/mediaitem_detail.html:264 -msgid "Delete" -msgstr "Supprimer" - #: templates/telemeta_default/home.html:47 #: templates/telemeta_default/inc/module_revisions.html:13 msgid "Type" @@ -901,14 +904,6 @@ msgstr "" msgid "Code" msgstr "Cote" -#: templates/telemeta_default/home.html:50 -#: templates/telemeta_default/search_criteria.html:94 -#: templates/telemeta_default/search_results.html:33 -#: templates/telemeta_default/inc/collection_list.html:17 -#: templates/telemeta_default/inc/mediaitem_list.html:22 -msgid "Year of recording" -msgstr "Année d'enregistrement" - #: templates/telemeta_default/home.html:51 #: templates/telemeta_default/inc/collection_list.html:18 #: templates/telemeta_default/inc/mediaitem_list.html:23 @@ -957,70 +952,70 @@ msgstr "Mot de passe oublié" #: templates/telemeta_default/mediaitem_add.html:5 #: templates/telemeta_default/mediaitem_copy.html:5 -#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:457 +#: templates/telemeta_default/mediaitem_detail.html:5 web/base.py:464 msgid "Item" msgstr "Item" -#: templates/telemeta_default/mediaitem_detail.html:84 +#: templates/telemeta_default/mediaitem_detail.html:85 #: templates/telemeta_default/paginator.html:5 msgid "Previous" msgstr "Précédent" -#: templates/telemeta_default/mediaitem_detail.html:85 +#: templates/telemeta_default/mediaitem_detail.html:86 #: templates/telemeta_default/paginator.html:23 msgid "Next" msgstr "Suivant" -#: templates/telemeta_default/mediaitem_detail.html:111 +#: templates/telemeta_default/mediaitem_detail.html:114 msgid "Analysis" msgstr "Analyse" -#: templates/telemeta_default/mediaitem_detail.html:113 +#: templates/telemeta_default/mediaitem_detail.html:116 msgid "Markers" msgstr "Marqueurs" -#: templates/telemeta_default/mediaitem_detail.html:121 +#: templates/telemeta_default/mediaitem_detail.html:124 msgid "Property" msgstr "Propriété" -#: templates/telemeta_default/mediaitem_detail.html:123 +#: templates/telemeta_default/mediaitem_detail.html:126 msgid "Unit" msgstr "Unité" -#: templates/telemeta_default/mediaitem_detail.html:131 +#: templates/telemeta_default/mediaitem_detail.html:134 msgid "Download:" msgstr "Téléchargement:" -#: templates/telemeta_default/mediaitem_detail.html:152 +#: templates/telemeta_default/mediaitem_detail.html:155 msgid "Recording date" msgstr "Date d'enregistrement" -#: templates/telemeta_default/mediaitem_detail.html:164 +#: templates/telemeta_default/mediaitem_detail.html:167 #: templates/telemeta_default/inc/mediaitem_list.html:18 msgid "Location" msgstr "Lieu" -#: templates/telemeta_default/mediaitem_detail.html:170 +#: templates/telemeta_default/mediaitem_detail.html:173 msgid "Comments / ethnographic context" msgstr "Commentaires / contexte ethnographique" -#: templates/telemeta_default/mediaitem_detail.html:183 +#: templates/telemeta_default/mediaitem_detail.html:186 msgid "Musical informations" msgstr "Informations sur la musique" -#: templates/telemeta_default/mediaitem_detail.html:217 +#: templates/telemeta_default/mediaitem_detail.html:220 msgid "performance" msgstr "composition" -#: templates/telemeta_default/mediaitem_detail.html:222 +#: templates/telemeta_default/mediaitem_detail.html:225 msgid "General informations" msgstr "Informations générales" -#: templates/telemeta_default/mediaitem_detail.html:224 +#: templates/telemeta_default/mediaitem_detail.html:227 msgid "Remarks" msgstr "Remarques" -#: templates/telemeta_default/mediaitem_detail.html:240 +#: templates/telemeta_default/mediaitem_detail.html:243 msgid "Published references" msgstr "Références éditées" @@ -1045,7 +1040,7 @@ msgstr "Formation" msgid "User Profile" msgstr "Profil utilisateur" -#: templates/telemeta_default/profile_detail.html:8 web/base.py:1158 +#: templates/telemeta_default/profile_detail.html:8 web/base.py:1165 msgid "User profile" msgstr "Profil utilisateur" @@ -1104,6 +1099,12 @@ msgstr "" msgid "Advanced Search" msgstr "Recherche avancée" +#: templates/telemeta_default/search_criteria.html:94 +#: templates/telemeta_default/search_results.html:33 +#: templates/telemeta_default/inc/mediaitem_list.html:22 +msgid "Year of recording" +msgstr "Année d'enregistrement" + #: templates/telemeta_default/search_criteria.html:101 #: templates/telemeta_default/search_criteria.html:120 #: templates/telemeta_default/search_results.html:35 @@ -1151,7 +1152,7 @@ msgstr "Etat/Continent" msgid "No item" msgstr "Aucun item" -#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1189 +#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1196 msgid "Last changes" msgstr "Dernières modifications" @@ -1344,17 +1345,20 @@ msgid_plural "%(count)d collections" msgstr[0] "%(count)d collection" msgstr[1] "%(count)d collections" -#: web/base.py:327 web/base.py:456 web/base.py:687 web/base.py:1157 +#: web/base.py:327 web/base.py:463 web/base.py:694 web/base.py:1164 msgid "Access not allowed" msgstr "Accès non autorisé" -#: web/base.py:329 web/base.py:458 web/base.py:689 web/base.py:1159 +#: web/base.py:329 web/base.py:465 web/base.py:696 web/base.py:1166 msgid "" "Please login or contact the website administator to get a private access." msgstr "" "Connectez-vous s'il vous plaît ou bien contactez l'administrateur du site " "pour obtenir un accès privé." +#~ msgid "comments" +#~ msgstr "commentaires" + #~ msgid "Account" #~ msgstr "Compte" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index 822ff8dc..31164937 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -242,7 +242,7 @@ class MediaItem(MediaResource): ethnic_group = WeakForeignKey('EthnicGroup', related_name="items", verbose_name=_('population / social group')) language = CharField(_('language')) - context_comment = TextField(_('comments')) + context_comment = TextField(_('comments / ethnographic context')) moda_execut = CharField(_('moda_execut')) # Musical informations @@ -285,7 +285,6 @@ class MediaItem(MediaResource): class Meta(MetaCore): db_table = 'media_items' -# ordering = ['code', 'old_code'] def is_valid_code(self, code): "Check if the item code is well formed" diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 8dcdb77e..ee5a7a9a 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -524,8 +524,11 @@ class ItemView(object): self.cache_data.delete_item_data(code) self.cache_export.delete_item_data(code) flags = MediaItemTranscodingFlag.objects.filter(item=item) + analyses = MediaItemAnalysis.objects.filter(item=item) for flag in flags: flag.delete() + for analysis in analyses: + analysis.delete() item.set_revision(request.user) return HttpResponseRedirect('/items/'+code) else: @@ -614,11 +617,19 @@ class ItemView(object): pipe.run() mime_type = decoder.format() - analysis = MediaItemAnalysis(item=item, name='MIME type', analyzer_id='mime_type', unit='', value=mime_type) + analysis = MediaItemAnalysis(item=item, name='MIME type', + analyzer_id='mime_type', unit='', value=mime_type) analysis.save() - analysis = MediaItemAnalysis(item=item, name='Channels', analyzer_id='channels', unit='', value=decoder.channels()) + analysis = MediaItemAnalysis(item=item, name='Channels', + analyzer_id='channels', unit='', value=decoder.channels()) analysis.save() - + analysis = MediaItemAnalysis(item=item, name='Samplerate', + analyzer_id='samplerate', unit='Hz', value=unicode(decoder.audiorate)) + analysis.save() + analysis = MediaItemAnalysis(item=item, name='Resolution', + analyzer_id='resolution', unit='bits', value=unicode(decoder.audiowidth)) + analysis.save() + for analyzer in analyzers_sub: value = analyzer.result() if analyzer.id() == 'duration': @@ -789,7 +800,6 @@ class ItemView(object): return render(request, template, {'item': item, 'formset': formset,}) - class AdminView(object): """Provide Admin web UI methods"""