From: yomguy Date: Sun, 29 May 2011 19:27:14 +0000 (+0200) Subject: get more field sorting and size, cleanup, fix fr locale X-Git-Tag: 1.1~154 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=772187364664eb25ecee52ebc3cd764f3888f92c;p=telemeta.git get more field sorting and size, cleanup, fix fr locale --- diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css index c60e47bb..e11917fb 100644 --- a/telemeta/htdocs/css/telemeta.css +++ b/telemeta/htdocs/css/telemeta.css @@ -1118,6 +1118,9 @@ a.image-link { #id_collector { width: 500px; } +#id_creator { + width: 500px; +} #id_cultural_area { width: 500px; } @@ -1125,16 +1128,31 @@ a.image-link { width: 500px; } #id_old_code { - width: 300px; + width: 500px; } #id_code { - width: 300px; + width: 500px; } #id_author { - width: 300px; + width: 500px; } #id_collector_selection { - width: 300px; + width: 500px; +} +#id_booklet_author { + width: 500px; +} +#id_alt_ids { + width: 500px; +} +#id_travail { + width: 500px; +} +#id_value_add { + width: 200px; +} +#id_value_edit { + width: 500px; } /*focus on elements*/ diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo index f5782e63..3bdb7f26 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 97d6d01e..eb765fc3 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-05-25 11:36+0200\n" +"POT-Creation-Date: 2011-05-29 21:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -164,8 +164,8 @@ msgstr "" msgid "reference" msgstr "" -#: models/media.py:93 models/media.py:227 models/media.py:366 -#: models/media.py:381 models/media.py:415 +#: models/media.py:93 models/media.py:227 models/media.py:371 +#: models/media.py:386 models/media.py:420 msgid "title" msgstr "" @@ -349,13 +349,13 @@ msgstr "" msgid "file" msgstr "" -#: models/media.py:275 models/media.py:435 -#: templates/telemeta_default/mediaitem_detail.html:208 +#: models/media.py:275 models/media.py:440 +#: templates/telemeta_default/mediaitem_detail.html:207 msgid "keywords" msgstr "" -#: models/media.py:333 models/media.py:347 models/media.py:365 -#: models/media.py:412 +#: models/media.py:333 models/media.py:347 models/media.py:370 +#: models/media.py:417 msgid "item" msgstr "" @@ -375,43 +375,43 @@ msgstr "" msgid "interprets" msgstr "" -#: models/media.py:367 +#: models/media.py:372 msgid "start" msgstr "" -#: models/media.py:368 +#: models/media.py:373 msgid "end" msgstr "" -#: models/media.py:379 models/media.py:398 models/media.py:413 +#: models/media.py:384 models/media.py:403 models/media.py:418 msgid "public_id" msgstr "" -#: models/media.py:382 models/media.py:417 +#: models/media.py:387 models/media.py:422 msgid "description" msgstr "" -#: models/media.py:399 +#: models/media.py:404 msgid "playlist" msgstr "" -#: models/media.py:400 +#: models/media.py:405 msgid "resource_type" msgstr "" -#: models/media.py:401 +#: models/media.py:406 msgid "resource_id" msgstr "" -#: models/media.py:414 models/system.py:54 +#: models/media.py:419 models/system.py:54 msgid "time" msgstr "" -#: models/media.py:416 models/media.py:436 +#: models/media.py:421 models/media.py:441 msgid "date" msgstr "" -#: models/media.py:418 +#: models/media.py:423 msgid "author" msgstr "" @@ -684,15 +684,15 @@ msgid "Collection" msgstr "" #: templates/telemeta_default/collection_detail.html:44 -#: templates/telemeta_default/mediaitem_detail.html:109 -#: templates/telemeta_default/mediaitem_detail.html:208 -#: templates/telemeta_default/mediaitem_detail.html:247 +#: templates/telemeta_default/mediaitem_detail.html:108 +#: templates/telemeta_default/mediaitem_detail.html:207 +#: templates/telemeta_default/mediaitem_detail.html:246 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "" #: templates/telemeta_default/collection_detail.html:45 -#: templates/telemeta_default/mediaitem_detail.html:110 +#: templates/telemeta_default/mediaitem_detail.html:109 msgid "Copy" msgstr "" @@ -701,7 +701,7 @@ msgid "Add item" msgstr "" #: templates/telemeta_default/collection_detail.html:49 -#: templates/telemeta_default/mediaitem_detail.html:113 +#: templates/telemeta_default/mediaitem_detail.html:112 msgid "Add to playlist" msgstr "" @@ -714,7 +714,7 @@ msgid "Recording year" msgstr "" #: templates/telemeta_default/collection_detail.html:102 -#: templates/telemeta_default/mediaitem_detail.html:193 +#: templates/telemeta_default/mediaitem_detail.html:192 msgid "Geographic and cultural informations" msgstr "" @@ -726,22 +726,22 @@ msgid "Recordist" msgstr "" #: templates/telemeta_default/collection_detail.html:141 -#: templates/telemeta_default/mediaitem_detail.html:263 +#: templates/telemeta_default/mediaitem_detail.html:262 msgid "Archiving data" msgstr "" #: templates/telemeta_default/collection_detail.html:162 -#: templates/telemeta_default/mediaitem_detail.html:278 +#: templates/telemeta_default/mediaitem_detail.html:277 msgid "Technical data" msgstr "" #: templates/telemeta_default/collection_detail.html:167 -#: templates/telemeta_default/mediaitem_detail.html:281 +#: templates/telemeta_default/mediaitem_detail.html:280 msgid "Media type" msgstr "" #: templates/telemeta_default/collection_detail.html:167 -#: templates/telemeta_default/mediaitem_detail.html:281 +#: templates/telemeta_default/mediaitem_detail.html:280 msgid "Audio" msgstr "" @@ -807,7 +807,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:153 +#: templates/telemeta_default/mediaitem_detail.html:152 msgid "Value" msgstr "" @@ -950,54 +950,54 @@ msgstr "" msgid "Item" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:115 +#: templates/telemeta_default/mediaitem_detail.html:114 #: templates/telemeta_default/paginator.html:5 msgid "Previous" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:116 +#: templates/telemeta_default/mediaitem_detail.html:115 #: templates/telemeta_default/paginator.html:23 msgid "Next" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:142 +#: templates/telemeta_default/mediaitem_detail.html:141 msgid "Analysis" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:144 +#: templates/telemeta_default/mediaitem_detail.html:143 msgid "Markers" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:152 +#: templates/telemeta_default/mediaitem_detail.html:151 msgid "Property" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:154 +#: templates/telemeta_default/mediaitem_detail.html:153 msgid "Unit" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:162 +#: templates/telemeta_default/mediaitem_detail.html:161 msgid "Download:" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:183 +#: templates/telemeta_default/mediaitem_detail.html:182 msgid "Recording date" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:195 +#: templates/telemeta_default/mediaitem_detail.html:194 #: templates/telemeta_default/inc/mediaitem_list.html:18 msgid "Location" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:213 +#: templates/telemeta_default/mediaitem_detail.html:212 msgid "Musical informations" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:247 +#: templates/telemeta_default/mediaitem_detail.html:246 msgid "performance" msgstr "" -#: templates/telemeta_default/mediaitem_detail.html:252 +#: templates/telemeta_default/mediaitem_detail.html:251 msgid "General informations" msgstr "" @@ -1118,7 +1118,7 @@ msgstr "" msgid "No item" msgstr "" -#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1086 +#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1081 msgid "Last changes" msgstr "" @@ -1292,11 +1292,11 @@ msgid_plural "%(count)d collections" msgstr[0] "" msgstr[1] "" -#: web/base.py:1097 +#: web/base.py:1092 msgid "Access not allowed" msgstr "" -#: web/base.py:1099 +#: web/base.py:1094 msgid "" "Please login or contact the website administator to get admin or private " "access." diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo index ca434a4d..3bdb7f26 100644 Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po index aebb574d..2b168120 100644 --- a/telemeta/locale/de/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-12 00:02+0200\n" +"POT-Creation-Date: 2011-05-29 21:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,38 +18,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" -#: htdocs/js/locale.js:13 +#: htdocs/js/locale.js:28 msgid "title" msgstr "" -#: htdocs/js/locale.js:14 +#: htdocs/js/locale.js:29 msgid "description" msgstr "" -#: htdocs/js/locale.js:15 +#: htdocs/js/locale.js:30 msgid "delete the marker permanently?" msgstr "" -#: htdocs/js/locale.js:16 +#: htdocs/js/locale.js:31 msgid "marker added to the selected playlist" msgstr "" -#: htdocs/js/locale.js:17 +#: htdocs/js/locale.js:32 msgid "item added to the selected playlist" msgstr "" -#: htdocs/js/locale.js:18 +#: htdocs/js/locale.js:33 msgid "collection added to the selected playlist" msgstr "" -#: htdocs/js/locale.js:19 +#: htdocs/js/locale.js:34 msgid "there is at least one unsaved marker" msgstr "" -#: htdocs/js/locale.js:20 +#: htdocs/js/locale.js:35 msgid "If you exit the page you will loose your changes" msgstr "" -#: htdocs/js/locale.js:21 +#: htdocs/js/locale.js:36 msgid "author" msgstr "" diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo index a4f67c65..1799e71d 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 c45201a7..4494f606 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-05-25 11:36+0200\n" +"POT-Creation-Date: 2011-05-29 21:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Olivier Guilyardi \n" "Language-Team: LANGUAGE \n" @@ -31,7 +31,7 @@ msgstr "valeur" #: models/enum.py:57 models/media.py:144 msgid "archive format" -msgstr "format d'archivage" +msgstr "format du support" #: models/enum.py:64 models/media.py:128 msgid "secondary edition" @@ -164,8 +164,8 @@ msgstr "accès public" msgid "reference" msgstr "référence" -#: models/media.py:93 models/media.py:227 models/media.py:366 -#: models/media.py:381 models/media.py:415 +#: models/media.py:93 models/media.py:227 models/media.py:371 +#: models/media.py:386 models/media.py:420 msgid "title" msgstr "titre" @@ -349,19 +349,19 @@ msgstr "copie de" msgid "file" msgstr "fichier" -#: models/media.py:275 models/media.py:435 -#: templates/telemeta_default/mediaitem_detail.html:208 +#: models/media.py:275 models/media.py:440 +#: templates/telemeta_default/mediaitem_detail.html:207 msgid "keywords" msgstr "mots-clés" -#: models/media.py:333 models/media.py:347 models/media.py:365 -#: models/media.py:412 +#: models/media.py:333 models/media.py:347 models/media.py:370 +#: models/media.py:417 msgid "item" msgstr "item" #: models/media.py:349 msgid "composition" -msgstr "formation" +msgstr "Voix / Instruments" #: models/media.py:351 msgid "vernacular name" @@ -375,46 +375,46 @@ msgstr "nombre" msgid "interprets" msgstr "interprètes" -#: models/media.py:367 +#: models/media.py:372 msgid "start" msgstr "début" -#: models/media.py:368 +#: models/media.py:373 msgid "end" msgstr "fin" -#: models/media.py:379 models/media.py:398 models/media.py:413 +#: models/media.py:384 models/media.py:403 models/media.py:418 #, fuzzy msgid "public_id" msgstr "édité" -#: models/media.py:382 models/media.py:417 +#: models/media.py:387 models/media.py:422 msgid "description" msgstr "" -#: models/media.py:399 +#: models/media.py:404 msgid "playlist" msgstr "liste de lecture" -#: models/media.py:400 +#: models/media.py:405 #, fuzzy msgid "resource_type" msgstr "type de ressource" -#: models/media.py:401 +#: models/media.py:406 #, fuzzy msgid "resource_id" msgstr "ressource" -#: models/media.py:414 models/system.py:54 +#: models/media.py:419 models/system.py:54 msgid "time" msgstr "heure" -#: models/media.py:416 models/media.py:436 +#: models/media.py:421 models/media.py:441 msgid "date" msgstr "" -#: models/media.py:418 +#: models/media.py:423 #, fuzzy msgid "author" msgstr "rédacteur fiche" @@ -692,15 +692,15 @@ msgid "Collection" msgstr "Collection" #: templates/telemeta_default/collection_detail.html:44 -#: templates/telemeta_default/mediaitem_detail.html:109 -#: templates/telemeta_default/mediaitem_detail.html:208 -#: templates/telemeta_default/mediaitem_detail.html:247 +#: templates/telemeta_default/mediaitem_detail.html:108 +#: templates/telemeta_default/mediaitem_detail.html:207 +#: templates/telemeta_default/mediaitem_detail.html:246 #: templates/telemeta_default/profile_detail.html:63 msgid "Edit" msgstr "Editer" #: templates/telemeta_default/collection_detail.html:45 -#: templates/telemeta_default/mediaitem_detail.html:110 +#: templates/telemeta_default/mediaitem_detail.html:109 msgid "Copy" msgstr "Copier" @@ -709,7 +709,7 @@ msgid "Add item" msgstr "Ajouter item" #: templates/telemeta_default/collection_detail.html:49 -#: templates/telemeta_default/mediaitem_detail.html:113 +#: templates/telemeta_default/mediaitem_detail.html:112 msgid "Add to playlist" msgstr "Ajouter à la liste" @@ -722,7 +722,7 @@ msgid "Recording year" msgstr "Année d'enregistrement" #: templates/telemeta_default/collection_detail.html:102 -#: templates/telemeta_default/mediaitem_detail.html:193 +#: templates/telemeta_default/mediaitem_detail.html:192 msgid "Geographic and cultural informations" msgstr "Indications géographiques et culturelles" @@ -734,22 +734,22 @@ msgid "Recordist" msgstr "Collecteur" #: templates/telemeta_default/collection_detail.html:141 -#: templates/telemeta_default/mediaitem_detail.html:263 +#: templates/telemeta_default/mediaitem_detail.html:262 msgid "Archiving data" msgstr "Données d'archivage" #: templates/telemeta_default/collection_detail.html:162 -#: templates/telemeta_default/mediaitem_detail.html:278 +#: templates/telemeta_default/mediaitem_detail.html:277 msgid "Technical data" msgstr "Données techniques" #: templates/telemeta_default/collection_detail.html:167 -#: templates/telemeta_default/mediaitem_detail.html:281 +#: templates/telemeta_default/mediaitem_detail.html:280 msgid "Media type" msgstr "Type de media" #: templates/telemeta_default/collection_detail.html:167 -#: templates/telemeta_default/mediaitem_detail.html:281 +#: templates/telemeta_default/mediaitem_detail.html:280 msgid "Audio" msgstr "Audio" @@ -815,7 +815,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:153 +#: templates/telemeta_default/mediaitem_detail.html:152 msgid "Value" msgstr "Valeur" @@ -959,54 +959,54 @@ msgstr "Mot de passe oublié" msgid "Item" msgstr "Item" -#: templates/telemeta_default/mediaitem_detail.html:115 +#: templates/telemeta_default/mediaitem_detail.html:114 #: templates/telemeta_default/paginator.html:5 msgid "Previous" msgstr "Précédent" -#: templates/telemeta_default/mediaitem_detail.html:116 +#: templates/telemeta_default/mediaitem_detail.html:115 #: templates/telemeta_default/paginator.html:23 msgid "Next" msgstr "Suivant" -#: templates/telemeta_default/mediaitem_detail.html:142 +#: templates/telemeta_default/mediaitem_detail.html:141 msgid "Analysis" msgstr "Analyse" -#: templates/telemeta_default/mediaitem_detail.html:144 +#: templates/telemeta_default/mediaitem_detail.html:143 msgid "Markers" msgstr "Marqueurs" -#: templates/telemeta_default/mediaitem_detail.html:152 +#: templates/telemeta_default/mediaitem_detail.html:151 msgid "Property" msgstr "Propriété" -#: templates/telemeta_default/mediaitem_detail.html:154 +#: templates/telemeta_default/mediaitem_detail.html:153 msgid "Unit" msgstr "Unité" -#: templates/telemeta_default/mediaitem_detail.html:162 +#: templates/telemeta_default/mediaitem_detail.html:161 msgid "Download:" msgstr "Téléchargement:" -#: templates/telemeta_default/mediaitem_detail.html:183 +#: templates/telemeta_default/mediaitem_detail.html:182 msgid "Recording date" msgstr "Date d'enregistrement" -#: templates/telemeta_default/mediaitem_detail.html:195 +#: templates/telemeta_default/mediaitem_detail.html:194 #: templates/telemeta_default/inc/mediaitem_list.html:18 msgid "Location" msgstr "Lieu" -#: templates/telemeta_default/mediaitem_detail.html:213 +#: templates/telemeta_default/mediaitem_detail.html:212 msgid "Musical informations" msgstr "Informations sur la musique" -#: templates/telemeta_default/mediaitem_detail.html:247 +#: templates/telemeta_default/mediaitem_detail.html:246 msgid "performance" msgstr "composition" -#: templates/telemeta_default/mediaitem_detail.html:252 +#: templates/telemeta_default/mediaitem_detail.html:251 msgid "General informations" msgstr "Informations générales" @@ -1025,7 +1025,7 @@ msgstr "Items" #: templates/telemeta_default/mediaitem_performances_edit.html:23 msgid "Performance" -msgstr "" +msgstr "Formation" #: templates/telemeta_default/profile_detail.html:5 msgid "User Profile" @@ -1127,7 +1127,7 @@ msgstr "Etat/Continent" msgid "No item" msgstr "Aucun item" -#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1086 +#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1081 msgid "Last changes" msgstr "Dernières modifications" @@ -1307,11 +1307,11 @@ msgid_plural "%(count)d collections" msgstr[0] "%(count)d collection" msgstr[1] "%(count)d collections" -#: web/base.py:1097 +#: web/base.py:1092 msgid "Access not allowed" msgstr "Accès non autorisé" -#: web/base.py:1099 +#: web/base.py:1094 msgid "" "Please login or contact the website administator to get admin or private " "access." diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo index 87974353..8fbb8155 100644 Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po index f28fe879..052fb472 100644 --- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-05-12 00:02+0200\n" +"POT-Creation-Date: 2011-05-29 21:26+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -18,38 +18,38 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1\n" -#: htdocs/js/locale.js:13 +#: htdocs/js/locale.js:28 msgid "title" msgstr "titre" -#: htdocs/js/locale.js:14 +#: htdocs/js/locale.js:29 msgid "description" msgstr "description" -#: htdocs/js/locale.js:15 +#: htdocs/js/locale.js:30 msgid "delete the marker permanently?" msgstr "supprimer le marqueur définitivement ?" -#: htdocs/js/locale.js:16 +#: htdocs/js/locale.js:31 msgid "marker added to the selected playlist" msgstr "marqueur ajouté à la liste de lecture" -#: htdocs/js/locale.js:17 +#: htdocs/js/locale.js:32 msgid "item added to the selected playlist" msgstr "item ajouté à la liste de lecture" -#: htdocs/js/locale.js:18 +#: htdocs/js/locale.js:33 msgid "collection added to the selected playlist" msgstr "collection ajoutée à la liste de lecture" -#: htdocs/js/locale.js:19 +#: htdocs/js/locale.js:34 msgid "there is at least one unsaved marker" msgstr "il y a au moins un marqueur non sauvegardé" -#: htdocs/js/locale.js:20 +#: htdocs/js/locale.js:35 msgid "If you exit the page you will loose your changes" msgstr "Si vous sortez de la page, vous perdrez vos modifications" -#: htdocs/js/locale.js:21 +#: htdocs/js/locale.js:36 msgid "author" msgstr "auteur" diff --git a/telemeta/models/media.py b/telemeta/models/media.py index f46024ad..69b23483 100644 --- a/telemeta/models/media.py +++ b/telemeta/models/media.py @@ -359,6 +359,11 @@ class MediaItemPerformanceForm(ModelForm): class Meta: model = MediaItemPerformance + def __init__(self, *args, **kwds): + super(MediaItemPerformanceForm, self).__init__(*args, **kwds) + self.fields['instrument'].queryset = Instrument.objects.order_by('name') + self.fields['alias'].queryset = InstrumentAlias.objects.order_by('name') + class MediaPart(MediaResource): "Describe an item part" element_type = 'part' diff --git a/telemeta/templates/telemeta_default/enumeration_edit.html b/telemeta/templates/telemeta_default/enumeration_edit.html index de1a2385..56f17dde 100644 --- a/telemeta/templates/telemeta_default/enumeration_edit.html +++ b/telemeta/templates/telemeta_default/enumeration_edit.html @@ -11,7 +11,7 @@
{% trans "Add entry" %}
- +
diff --git a/telemeta/templates/telemeta_default/enumeration_edit_value.html b/telemeta/templates/telemeta_default/enumeration_edit_value.html index bdaefc09..103f9ffe 100644 --- a/telemeta/templates/telemeta_default/enumeration_edit_value.html +++ b/telemeta/templates/telemeta_default/enumeration_edit_value.html @@ -11,7 +11,7 @@
{% trans "Modify an entry" %}
- +

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py index f429aa44..6e038bf5 100644 --- a/telemeta/templatetags/telemeta_utils.py +++ b/telemeta/templatetags/telemeta_utils.py @@ -296,3 +296,6 @@ def set_var(parser, token): def current_year(): return datetime.datetime.now().strftime("%Y") +@register.filter +def sort_by_code(items): + return items.order_by('code') diff --git a/telemeta/web/base.py b/telemeta/web/base.py index d97abbe1..9e00a6c2 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -155,12 +155,7 @@ class WebView(object): if collection.public_access == 'none' and not request.user.is_staff: return HttpResponseRedirect('not_allowed/') playlists = self.get_playlists(request) - translation_list = ['OK', 'Cancel', 'Collection', 'added to playlist'] - translations = {} - for term in translation_list: - translations[term] = ugettext(term) - - return render(request, template, {'collection': collection, 'playlists' : playlists, 'translations': translations}) + return render(request, template, {'collection': collection, 'playlists' : playlists}) @method_decorator(permission_required('telemeta.change_mediacollection')) def collection_edit(self, request, public_id, template='telemeta/collection_edit.html'): @@ -1143,7 +1138,7 @@ class WebView(object): @method_decorator(permission_required('telemeta.change_mediaitem')) def item_performances_edit(self, request, public_id, template): item = MediaItem.objects.get(public_id=public_id) - PerformanceFormSet = inlineformset_factory(MediaItem, MediaItemPerformance) + PerformanceFormSet = inlineformset_factory(MediaItem, MediaItemPerformance, form=MediaItemPerformanceForm) if request.method == 'POST': formset = PerformanceFormSet(data=request.POST, instance=item) if formset.is_valid():