From: yomguy Date: Mon, 14 Jan 2013 16:43:04 +0000 (+0100) Subject: fix locale, cleanup X-Git-Tag: 0.9-probarreau~147 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=73b38d8193beb2d2999b8e5dfefa3878b37aa187;p=teleforma.git fix locale, cleanup --- diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 83381a2c..3321df8f 100644 Binary files a/teleforma/locale/fr/LC_MESSAGES/django.mo and b/teleforma/locale/fr/LC_MESSAGES/django.mo differ diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index 16cedc72..fa5dadda 100644 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-10 11:11+0100\n" +"POT-Creation-Date: 2013-01-14 17:38+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -17,7 +17,7 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1)\n" #: models/ae.py:46 models/core.py:200 models/crfpa.py:108 models/crfpa.py:146 -#: models/pro.py:180 models/pro.py:224 models/pro.py:239 +#: models/pro.py:142 models/pro.py:186 models/pro.py:201 msgid "user" msgstr "utilisateur" @@ -26,7 +26,7 @@ msgstr "utilisateur" msgid "period" msgstr "période" -#: models/ae.py:49 models/crfpa.py:114 models/pro.py:247 +#: models/ae.py:49 models/crfpa.py:114 models/pro.py:209 msgid "platform only" msgstr "plateforme seulement" @@ -56,17 +56,17 @@ msgstr "Publié" #: models/core.py:92 models/core.py:104 models/core.py:127 models/core.py:139 #: models/core.py:184 models/core.py:221 models/core.py:325 models/crfpa.py:47 -#: models/crfpa.py:63 models/pro.py:76 +#: models/crfpa.py:63 models/pro.py:49 msgid "name" msgstr "nom" #: models/core.py:93 models/core.py:105 models/core.py:128 models/core.py:140 #: models/core.py:155 models/core.py:222 models/core.py:240 models/core.py:306 -#: models/core.py:326 models/crfpa.py:48 models/pro.py:162 models/pro.py:208 +#: models/core.py:326 models/crfpa.py:48 models/pro.py:124 models/pro.py:170 msgid "description" msgstr "description" -#: models/core.py:100 models/core.py:107 models/core.py:220 models/pro.py:207 +#: models/core.py:100 models/core.py:107 models/core.py:220 models/pro.py:169 msgid "organization" msgstr "organisation" @@ -90,7 +90,7 @@ msgstr "département" msgid "course type" msgstr "type de matière" -#: models/core.py:154 models/core.py:204 models/core.py:305 models/pro.py:161 +#: models/core.py:154 models/core.py:204 models/core.py:305 models/pro.py:123 msgid "title" msgstr "titre" @@ -98,12 +98,12 @@ msgstr "titre" msgid "code" msgstr "cote" -#: models/core.py:157 models/core.py:309 models/pro.py:124 +#: models/core.py:157 models/core.py:309 models/pro.py:97 msgid "date modified" msgstr "date de modification" -#: models/core.py:158 models/core.py:353 models/core.py:413 models/pro.py:61 -#: models/pro.py:97 models/pro.py:164 models/pro.py:229 +#: models/core.py:158 models/core.py:353 models/core.py:413 models/pro.py:70 +#: models/pro.py:126 models/pro.py:191 msgid "rank" msgstr "rang" @@ -115,7 +115,7 @@ msgstr "note de synthèse" msgid "obligations" msgstr "obligations" -#: models/core.py:161 models/crfpa.py:91 models/pro.py:98 +#: models/core.py:161 models/crfpa.py:91 models/pro.py:71 msgid "magistral" msgstr "magistral" @@ -124,7 +124,7 @@ msgid "types" msgstr "types" #: models/core.py:177 models/core.py:342 models/core.py:404 models/core.py:458 -#: models/pro.py:92 templates/teleforma/inc/seminar_description.html:9 +#: models/pro.py:65 templates/teleforma/inc/seminar_description.html:9 msgid "course" msgstr "matière" @@ -132,7 +132,7 @@ msgstr "matière" msgid "domain" msgstr "domaine" -#: models/core.py:215 models/core.py:460 models/pro.py:102 +#: models/core.py:215 models/core.py:460 models/pro.py:75 msgid "professor" msgstr "intervenant" @@ -148,7 +148,7 @@ msgstr "hôte" msgid "port" msgstr "port" -#: models/core.py:239 models/core.py:350 models/core.py:412 models/pro.py:90 +#: models/core.py:239 models/core.py:350 models/core.py:412 models/pro.py:63 msgid "type" msgstr "type" @@ -184,7 +184,7 @@ msgstr "stream en direct" msgid "credits" msgstr "crédits" -#: models/core.py:308 models/pro.py:123 models/pro.py:187 models/pro.py:230 +#: models/core.py:308 models/pro.py:96 models/pro.py:149 models/pro.py:192 msgid "date added" msgstr "date d'ajout" @@ -196,7 +196,7 @@ msgstr "publié" msgid "mime type" msgstr "Type mime" -#: models/core.py:313 models/pro.py:165 +#: models/core.py:313 models/pro.py:127 msgid "weight" msgstr "poids" @@ -212,15 +212,15 @@ msgstr "type de document" msgid "annal" msgstr "annale" -#: models/core.py:354 models/pro.py:227 +#: models/core.py:354 models/pro.py:189 msgid "file" msgstr "fichier" -#: models/core.py:356 models/core.py:414 models/core.py:470 models/pro.py:53 +#: models/core.py:356 models/core.py:414 models/core.py:470 msgid "readers" msgstr "" -#: models/core.py:452 models/pro.py:93 +#: models/core.py:452 models/pro.py:66 #: templates/teleforma/inc/seminar_description.html:7 msgid "sub title" msgstr "sous-titre" @@ -245,11 +245,11 @@ msgstr "date de début" msgid "end date" msgstr "date de fin" -#: models/core.py:469 models/pro.py:96 +#: models/core.py:469 models/pro.py:69 msgid "price" msgstr "prix" -#: models/core.py:473 models/pro.py:104 +#: models/core.py:473 models/pro.py:77 #, fuzzy msgid "description documents" msgstr "description" @@ -301,39 +301,39 @@ msgstr "iej" msgid "student" msgstr "étudiant" -#: models/crfpa.py:147 models/pro.py:249 +#: models/crfpa.py:147 models/pro.py:211 #: templates/teleforma/seminar_testimonial.html:37 #: templates/telemeta/profile_detail.html:80 msgid "Address" msgstr "Adresse" -#: models/crfpa.py:148 models/pro.py:250 +#: models/crfpa.py:148 models/pro.py:212 msgid "Postal code" msgstr "Code postal" -#: models/crfpa.py:149 models/pro.py:251 +#: models/crfpa.py:149 models/pro.py:213 msgid "City" msgstr "Ville" -#: models/crfpa.py:150 models/pro.py:252 +#: models/crfpa.py:150 models/pro.py:214 msgid "Country" msgstr "Pays" -#: models/crfpa.py:151 models/pro.py:253 +#: models/crfpa.py:151 models/pro.py:215 #: templates/telemeta/profile_detail.html:89 msgid "Language" msgstr "Langue" -#: models/crfpa.py:152 models/pro.py:254 templates/postman/base.html:11 +#: models/crfpa.py:152 models/pro.py:216 templates/postman/base.html:11 #: templates/telemeta/profile_detail.html:81 msgid "Telephone" msgstr "Téléphone" -#: models/crfpa.py:153 models/pro.py:256 +#: models/crfpa.py:153 models/pro.py:218 msgid "Expiration_date" msgstr "Date d'expiration" -#: models/crfpa.py:154 models/pro.py:257 +#: models/crfpa.py:154 models/pro.py:219 msgid "Password initialized" msgstr "Mot de passe initialisé" @@ -342,144 +342,136 @@ msgid "profile" msgstr "profil" #: models/pro.py:56 -msgid "audio items" -msgstr "" - -#: models/pro.py:59 -msgid "video items" -msgstr "" - -#: models/pro.py:83 msgid "Seminar type" msgstr "Type de séminaire" -#: models/pro.py:94 +#: models/pro.py:67 msgid "public concerned" msgstr "public concerné" -#: models/pro.py:95 templates/teleforma/inc/seminar_description.html:11 +#: models/pro.py:68 templates/teleforma/inc/seminar_description.html:11 msgid "level" msgstr "niveau" -#: models/pro.py:99 +#: models/pro.py:72 msgid "index" msgstr "index" -#: models/pro.py:100 +#: models/pro.py:73 msgid "approximative duration" msgstr "durée approximative" -#: models/pro.py:107 +#: models/pro.py:80 #, fuzzy msgid "documents 1" msgstr "document 1" -#: models/pro.py:110 +#: models/pro.py:83 msgid "media" msgstr "médias" -#: models/pro.py:113 +#: models/pro.py:86 msgid "media_preview" msgstr "" -#: models/pro.py:116 +#: models/pro.py:89 #, fuzzy msgid "documents 2" msgstr "document 2" -#: models/pro.py:119 +#: models/pro.py:92 #, fuzzy msgid "corrected documents" msgstr "document corrigé" -#: models/pro.py:121 +#: models/pro.py:94 msgid "form" msgstr "formulaire" -#: models/pro.py:152 templates/teleforma/answer_form.html:88 +#: models/pro.py:114 templates/teleforma/answer_form.html:88 #: templates/teleforma/seminar_detail.html:158 #: templates/teleforma/testimonials.html:64 #: templates/teleforma/inc/answer_list.html:21 msgid "Seminar" msgstr "Sémimaire" -#: models/pro.py:160 models/pro.py:223 +#: models/pro.py:122 models/pro.py:185 msgid "seminar" msgstr "séminaire" -#: models/pro.py:163 models/pro.py:181 +#: models/pro.py:125 models/pro.py:143 msgid "question" msgstr "question" -#: models/pro.py:166 +#: models/pro.py:128 msgid "minimum numbers of characters" msgstr "nombre de caractère minimum" -#: models/pro.py:167 models/pro.py:183 +#: models/pro.py:129 models/pro.py:145 msgid "status" msgstr "status" -#: models/pro.py:174 +#: models/pro.py:136 msgid "Question" msgstr "Question" -#: models/pro.py:182 +#: models/pro.py:144 msgid "answer" msgstr "réponse" -#: models/pro.py:184 templates/teleforma/seminar_detail.html:50 +#: models/pro.py:146 templates/teleforma/seminar_detail.html:50 #: templates/teleforma/seminars.html:98 msgid "validated" msgstr "validé" -#: models/pro.py:185 +#: models/pro.py:147 msgid "date submitted" msgstr "date de soumission" -#: models/pro.py:186 +#: models/pro.py:148 #, fuzzy msgid "date validated" msgstr "validé" -#: models/pro.py:200 templates/teleforma/answer_detail.html:28 +#: models/pro.py:162 templates/teleforma/answer_detail.html:28 #: templates/teleforma/answer_form.html:91 msgid "Answer" msgstr "Réponse" -#: models/pro.py:209 +#: models/pro.py:171 msgid "comments" msgstr "commentaires" -#: models/pro.py:211 models/pro.py:226 +#: models/pro.py:173 models/pro.py:188 msgid "template" msgstr "modèle" -#: models/pro.py:218 +#: models/pro.py:180 msgid "Testimonial template" msgstr "Modèle d'attestation" -#: models/pro.py:234 templates/teleforma/inc/testimonial_list.html:7 -#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:486 +#: models/pro.py:196 templates/teleforma/inc/testimonial_list.html:7 +#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:462 msgid "Testimonial" msgstr "Attestation" -#: models/pro.py:241 +#: models/pro.py:203 msgid "seminars" msgstr "séminaires" -#: models/pro.py:244 +#: models/pro.py:206 msgid "conferences" msgstr "conférences" -#: models/pro.py:248 +#: models/pro.py:210 msgid "Company" msgstr "" -#: models/pro.py:255 +#: models/pro.py:217 msgid "Fax" msgstr "" -#: models/pro.py:267 +#: models/pro.py:229 msgid "Auditor" msgstr "Auditeur" @@ -758,7 +750,6 @@ msgstr " rejeter" #: templates/teleforma/answer_form.html:46 #: templates/teleforma/evaluation_form.html:22 -#: templates/teleforma/seminar_media_audio.html:102 #: templates/teleforma/seminar_media_video.html:56 msgid "My steps" msgstr "Mes étapes" @@ -832,7 +823,7 @@ msgstr "validé" #: templates/teleforma/testimonials.html:83 #: templates/teleforma/inc/answer_list.html:41 #: templates/teleforma/inc/media_list.html:52 -#: templates/teleforma/inc/media_package_list.html:47 +#: templates/teleforma/inc/media_package_list.html:46 msgid " rejected" msgstr " rejeté" @@ -855,10 +846,10 @@ msgstr "Supports écrits" #: templates/teleforma/course_conference_audio.html:66 #: templates/teleforma/course_document.html:73 #: templates/teleforma/seminar_media_audio.html:70 -#: templates/teleforma/seminar_media_video.html:113 +#: templates/teleforma/seminar_media_video.html:116 #: templates/teleforma/inc/conference_list.html:25 #: templates/teleforma/inc/media_list.html:36 -#: templates/teleforma/inc/media_package_list.html:29 +#: templates/teleforma/inc/media_package_list.html:28 #: templates/telemeta/lists.html:69 templates/telemeta/search_criteria.html:97 #: templates/telemeta/inc/module_revisions.html:17 msgid "Title" @@ -866,15 +857,15 @@ msgstr "Titre" #: templates/teleforma/course.html:18 templates/teleforma/course.html.py:34 #: templates/teleforma/seminar_testimonial.html:44 -#: templates/teleforma/inc/media_package_list.html:37 +#: templates/teleforma/inc/media_package_list.html:36 msgid "Description" msgstr "Description" #: templates/teleforma/course.html:19 templates/teleforma/course.html.py:35 #: templates/teleforma/course.html:52 #: templates/teleforma/course_media.html:142 -#: templates/teleforma/seminar_media_audio.html:84 -#: templates/teleforma/seminar_media_video.html:126 +#: templates/teleforma/seminar_media_audio.html:80 +#: templates/teleforma/seminar_media_video.html:125 #: templates/telemeta/profile_detail.html:84 msgid "Date added" msgstr "Date d'ajout" @@ -903,10 +894,10 @@ msgstr "Session" #: templates/teleforma/course_conference_audio.html:67 #: templates/teleforma/course_media.html:133 #: templates/teleforma/seminar_media_audio.html:74 -#: templates/teleforma/seminar_media_video.html:117 +#: templates/teleforma/seminar_media_video.html:120 #: templates/teleforma/inc/conference_list.html:27 #: templates/teleforma/inc/media_list.html:39 -#: templates/teleforma/inc/media_package_list.html:32 +#: templates/teleforma/inc/media_package_list.html:31 #: templates/telemeta/inc/user_list.html:48 msgid "Professor" msgstr "Intervenant" @@ -996,7 +987,7 @@ msgstr "Enregistrer et diffuser" #: templates/teleforma/seminar_media_video.html:21 #: templates/teleforma/seminar_media_video.html:82 #: templates/teleforma/inc/media_list.html:50 -#: templates/teleforma/inc/media_package_list.html:45 +#: templates/teleforma/inc/media_package_list.html:44 msgid " published" msgstr " publié" @@ -1007,24 +998,24 @@ msgstr " publié" #: templates/teleforma/inc/document_list.html:22 #: templates/teleforma/inc/document_simple_list.html:9 #: templates/teleforma/inc/media_list.html:56 -#: templates/teleforma/inc/media_package_list.html:51 +#: templates/teleforma/inc/media_package_list.html:50 #: templates/teleforma/inc/testimonial_list.html:8 msgid "Download" msgstr "Télécharger" #: templates/teleforma/course_media.html:141 -#: templates/teleforma/seminar_media_audio.html:80 -#: templates/teleforma/seminar_media_video.html:122 msgid "Mime type" msgstr "Type mime" #: templates/teleforma/course_media.html:143 -#: templates/teleforma/seminar_media_audio.html:85 -#: templates/teleforma/seminar_media_video.html:127 +#: templates/teleforma/seminar_media_audio.html:81 +#: templates/teleforma/seminar_media_video.html:126 msgid "Date modified" msgstr "Date de modification" #: templates/teleforma/course_media.html:144 +#: templates/teleforma/seminar_media_audio.html:82 +#: templates/teleforma/seminar_media_video.html:127 msgid "Media ID" msgstr "ID Média" @@ -1093,23 +1084,22 @@ msgid "download your testimonial" msgstr "obtenez votre attestation" #: templates/teleforma/seminar_detail.html:170 -msgid "Index" -msgstr "Index" +msgid "Plan" +msgstr "Plan" #: templates/teleforma/seminar_media_audio.html:74 -#: templates/teleforma/seminar_media_video.html:117 -#: templates/teleforma/inc/media_package_list.html:32 +#: templates/teleforma/seminar_media_video.html:120 +#: templates/teleforma/inc/media_package_list.html:31 msgid "Professors" msgstr "Professeurs" -#: templates/teleforma/seminar_media_audio.html:86 -#: templates/teleforma/seminar_media_video.html:128 -msgid "Media package ID" -msgstr "ID Media pakage" +#: templates/teleforma/seminar_media_audio.html:98 +msgid "Audio index" +msgstr "Index audio" -#: templates/teleforma/seminar_media_video.html:144 -msgid "Shortcuts" -msgstr "" +#: templates/teleforma/seminar_media_video.html:143 +msgid "Video index" +msgstr "Index vidéo" #: templates/teleforma/seminar_testimonial.html:28 msgid "Training testimonial" @@ -1124,7 +1114,7 @@ msgid "First name" msgstr "Prénom" #: templates/teleforma/seminar_testimonial.html:38 -#: templates/teleforma/inc/media_package_list.html:39 +#: templates/teleforma/inc/media_package_list.html:38 msgid "Duration" msgstr "Durée" @@ -1202,8 +1192,8 @@ msgstr "Voir" #: templates/teleforma/inc/conference_list.html:19 #: templates/teleforma/inc/media_list.html:23 #: templates/teleforma/inc/media_list.html:29 -#: templates/teleforma/inc/media_package_list.html:17 -#: templates/teleforma/inc/media_package_list.html:21 +#: templates/teleforma/inc/media_package_list.html:16 +#: templates/teleforma/inc/media_package_list.html:20 #: templates/teleforma/inc/media_step.html:18 #: templates/teleforma/inc/media_step.html:24 msgid "Click here" @@ -1222,7 +1212,7 @@ msgid "Passed conferences" msgstr "Conférences en différé" #: templates/teleforma/inc/media_list.html:17 -#: templates/teleforma/inc/media_package_list.html:12 +#: templates/teleforma/inc/media_package_list.html:11 #: templates/teleforma/inc/media_step.html:12 msgid "Play" msgstr "Lire" @@ -1506,11 +1496,11 @@ msgstr "moi" msgid "No" msgstr "Non" -#: views/core.py:94 +#: views/core.py:93 msgid "Access not allowed." msgstr "Accès non autorisé." -#: views/core.py:95 +#: views/core.py:94 msgid "" "Please login or contact the website administator to get a private access." msgstr "" @@ -1543,10 +1533,16 @@ msgstr "Vous avez enregistré votre consultation avec succès" msgid "You have successfully submitted your answer" msgstr "Vous avez soumis votre consultation avec succès" -#: views/pro.py:359 +#: views/pro.py:335 msgid "You have successfully sumitted your evaluation" msgstr "Vous avez soumis votre évaluation avec succès" +#~ msgid "Index" +#~ msgstr "Index" + +#~ msgid "Media package ID" +#~ msgstr "ID Media pakage" + #~ msgid "Steps" #~ msgstr "Étapes" diff --git a/teleforma/models/pro.py b/teleforma/models/pro.py index 3cd293ac..b421a645 100755 --- a/teleforma/models/pro.py +++ b/teleforma/models/pro.py @@ -82,7 +82,7 @@ class Seminar(Displayable): medias = models.ManyToManyField(Media, related_name="seminar", verbose_name=_('media'), blank=True, null=True) - media_previews = models.ManyToManyField(Media, related_name="seminar_media_preview", + media_previews = models.ManyToManyField(Media, related_name="seminar_media_previews", verbose_name=_('media_preview'), blank=True, null=True) docs_2 = models.ManyToManyField(Document, related_name="seminar_docs_2", diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index ddb2d5e1..16306fac 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -1913,6 +1913,10 @@ form .exceed{ } +#index .listing a { + font-size: .9em; +} + #_Form p { font-weight: bold; diff --git a/teleforma/templates/teleforma/seminar_detail.html b/teleforma/templates/teleforma/seminar_detail.html index c2a91fdc..e7b8b3f7 100644 --- a/teleforma/templates/teleforma/seminar_detail.html +++ b/teleforma/templates/teleforma/seminar_detail.html @@ -167,7 +167,7 @@ $(function () { {% block index %} {% if seminar.index %}
-

status {% trans "Index" %}

+

status {% trans "Plan" %}

{{ seminar.index|safe }}
diff --git a/teleforma/templates/teleforma/seminar_media_audio.html b/teleforma/templates/teleforma/seminar_media_audio.html index c0b32ff7..9399c0cb 100644 --- a/teleforma/templates/teleforma/seminar_media_audio.html +++ b/teleforma/templates/teleforma/seminar_media_audio.html @@ -95,7 +95,7 @@ {% block index %}
-

status {% trans "Shortcuts" %}

+

status {% trans "Audio index" %}

    {% for marker in media.item.markers.all %} diff --git a/teleforma/templates/teleforma/seminar_media_video.html b/teleforma/templates/teleforma/seminar_media_video.html index 2d35f4c8..3ae9b1e3 100644 --- a/teleforma/templates/teleforma/seminar_media_video.html +++ b/teleforma/templates/teleforma/seminar_media_video.html @@ -140,7 +140,7 @@ $(window).ready(function(){ {% block index %}
    -

    status {% trans "Shortcuts" %}

    +

    status {% trans "Video index" %}

      {% for marker in media.item.markers.all %}