From: yomguy Date: Thu, 24 Jan 2013 17:35:41 +0000 (+0100) Subject: fic mess X-Git-Tag: 0.9-probarreau~111 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=083251e5e026c5ca10b37138b72a8bc03ad54e27;p=teleforma.git fic mess --- diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index ecc4ab29..73192d81 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 edf257e0..150dc2e5 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-21 17:43+0100\n" +"POT-Creation-Date: 2013-01-24 18:35+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:202 models/crfpa.py:108 models/crfpa.py:146 -#: models/pro.py:142 models/pro.py:186 models/pro.py:201 models/pro.py:238 +#: models/pro.py:142 models/pro.py:187 models/pro.py:216 models/pro.py:253 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:209 +#: models/ae.py:49 models/crfpa.py:114 models/pro.py:224 msgid "platform only" msgstr "plateforme seulement" @@ -99,6 +99,7 @@ msgid "course type" msgstr "type de matière" #: models/core.py:156 models/core.py:206 models/core.py:307 models/pro.py:123 +#: models/pro.py:194 msgid "title" msgstr "titre" @@ -111,7 +112,7 @@ msgid "date modified" msgstr "date de modification" #: models/core.py:160 models/core.py:355 models/core.py:415 models/pro.py:70 -#: models/pro.py:126 models/pro.py:191 +#: models/pro.py:126 msgid "rank" msgstr "rang" @@ -192,8 +193,8 @@ msgstr "stream en direct" msgid "credits" msgstr "crédits" -#: models/core.py:310 models/pro.py:96 models/pro.py:149 models/pro.py:192 -#: models/pro.py:239 +#: models/core.py:310 models/pro.py:96 models/pro.py:149 models/pro.py:193 +#: models/pro.py:254 msgid "date added" msgstr "date d'ajout" @@ -221,7 +222,7 @@ msgstr "type de document" msgid "annal" msgstr "annale" -#: models/core.py:356 models/pro.py:189 +#: models/core.py:356 models/pro.py:191 msgid "file" msgstr "fichier" @@ -310,39 +311,39 @@ msgstr "iej" msgid "student" msgstr "étudiant" -#: models/crfpa.py:147 models/pro.py:213 +#: models/crfpa.py:147 models/pro.py:228 #: templates/teleforma/seminar_testimonial.html:36 #: templates/telemeta/profile_detail.html:80 msgid "Address" msgstr "Adresse" -#: models/crfpa.py:148 models/pro.py:214 +#: models/crfpa.py:148 models/pro.py:229 msgid "Postal code" msgstr "Code postal" -#: models/crfpa.py:149 models/pro.py:215 +#: models/crfpa.py:149 models/pro.py:230 msgid "City" msgstr "Ville" -#: models/crfpa.py:150 models/pro.py:216 +#: models/crfpa.py:150 models/pro.py:231 msgid "Country" msgstr "Pays" -#: models/crfpa.py:151 models/pro.py:217 +#: models/crfpa.py:151 models/pro.py:232 #: templates/telemeta/profile_detail.html:89 msgid "Language" msgstr "Langue" -#: models/crfpa.py:152 models/pro.py:218 templates/postman/base.html:11 +#: models/crfpa.py:152 models/pro.py:233 templates/postman/base.html:11 #: templates/telemeta/profile_detail.html:81 msgid "Telephone" msgstr "Téléphone" -#: models/crfpa.py:153 models/pro.py:220 +#: models/crfpa.py:153 models/pro.py:235 msgid "Expiration_date" msgstr "Date d'expiration" -#: models/crfpa.py:154 models/pro.py:221 +#: models/crfpa.py:154 models/pro.py:236 msgid "Password initialized" msgstr "Mot de passe initialisé" @@ -396,12 +397,12 @@ msgstr "formulaire" #: models/pro.py:114 templates/teleforma/answer_form.html:102 #: templates/teleforma/seminar_detail.html:158 -#: templates/teleforma/testimonials.html:64 +#: templates/teleforma/testimonials.html:58 #: templates/teleforma/inc/answer_list.html:21 msgid "Seminar" msgstr "Sémimaire" -#: models/pro.py:122 models/pro.py:185 models/pro.py:237 +#: models/pro.py:122 models/pro.py:185 models/pro.py:252 msgid "seminar" msgstr "séminaire" @@ -413,7 +414,7 @@ msgstr "question" msgid "minimum numbers of characters" msgstr "nombre de caractère minimum" -#: models/pro.py:129 models/pro.py:145 models/pro.py:210 +#: models/pro.py:129 models/pro.py:145 models/pro.py:225 msgid "status" msgstr "status" @@ -421,12 +422,12 @@ msgstr "status" msgid "Question" msgstr "Question" -#: models/pro.py:144 views/pro.py:297 +#: models/pro.py:144 views/pro.py:294 msgid "answer" -msgstr "réponse" +msgstr "consultation" #: models/pro.py:146 templates/teleforma/seminar_detail.html:50 -#: templates/teleforma/seminars.html:98 views/pro.py:298 +#: templates/teleforma/seminars.html:98 views/pro.py:295 msgid "validated" msgstr "validée" @@ -447,7 +448,7 @@ msgstr "Réponse" msgid "comments" msgstr "commentaires" -#: models/pro.py:173 models/pro.py:188 +#: models/pro.py:173 models/pro.py:190 msgid "template" msgstr "modèle" @@ -455,41 +456,41 @@ msgstr "modèle" msgid "Testimonial template" msgstr "Modèle d'attestation" -#: models/pro.py:196 templates/teleforma/seminar_testimonial.html:13 +#: models/pro.py:210 templates/teleforma/seminar_testimonial.html:13 #: templates/teleforma/inc/testimonial_list.html:7 -#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:590 +#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:584 msgid "Testimonial" msgstr "Attestation" -#: models/pro.py:203 +#: models/pro.py:218 msgid "seminars" msgstr "séminaires" -#: models/pro.py:206 +#: models/pro.py:221 msgid "conferences" msgstr "conférences" -#: models/pro.py:211 +#: models/pro.py:226 msgid "gender" msgstr "civilité" -#: models/pro.py:212 +#: models/pro.py:227 msgid "Company" msgstr "Entreprise / Organisme" -#: models/pro.py:219 +#: models/pro.py:234 msgid "Fax" msgstr "Fax" -#: models/pro.py:231 +#: models/pro.py:246 msgid "Auditor" msgstr "Auditeur" -#: models/pro.py:246 +#: models/pro.py:261 msgid "Seminar revision" msgstr "Révision des sémimaires" -#: models/pro.py:247 +#: models/pro.py:262 msgid "Seminar revisions" msgstr "Révisions des sémimaires" @@ -501,7 +502,7 @@ msgstr "Page non trouvée" msgid "Server error" msgstr "Erreur du serveur" -#: templates/admin/base.html:21 templates/telemeta/base.html:99 +#: templates/admin/base.html:21 templates/telemeta/base.html:98 msgid "Home" msgstr "Accueil" @@ -750,7 +751,7 @@ msgid ":" msgstr "" #: templates/postman/view.html:36 -#: templates/teleforma/seminar_media_audio.html:21 +#: templates/teleforma/seminar_media_audio.html:22 #: templates/teleforma/seminar_media_video.html:74 msgid "Back" msgstr "" @@ -827,12 +828,11 @@ msgid "General" msgstr "Général" #: templates/teleforma/answers.html:6 templates/teleforma/answers.html:62 -#: templates/telemeta/base.html:112 +#: templates/telemeta/base.html:107 msgid "Answers" msgstr "Consultations" #: templates/teleforma/answers.html:19 -#: templates/teleforma/testimonials.html:83 #: templates/teleforma/inc/answer_list.html:41 msgid " validated" msgstr " validé" @@ -840,10 +840,9 @@ msgstr " validé" #: templates/teleforma/answers.html:25 #: templates/teleforma/course_media.html:34 #: templates/teleforma/course_media.html:79 -#: templates/teleforma/seminar_media_audio.html:26 +#: templates/teleforma/seminar_media_audio.html:29 #: templates/teleforma/seminar_media_video.html:28 -#: templates/teleforma/seminar_media_video.html:79 -#: templates/teleforma/testimonials.html:83 +#: templates/teleforma/seminar_media_video.html:81 #: templates/teleforma/inc/answer_list.html:41 #: templates/teleforma/inc/media_list.html:52 #: templates/teleforma/inc/media_package_list.html:46 @@ -868,8 +867,8 @@ msgstr "Supports écrits" #: templates/teleforma/course.html:17 templates/teleforma/course.html.py:33 #: templates/teleforma/course_conference_audio.html:66 #: templates/teleforma/course_document.html:73 -#: templates/teleforma/seminar_media_audio.html:71 -#: templates/teleforma/seminar_media_video.html:113 +#: templates/teleforma/seminar_media_audio.html:76 +#: templates/teleforma/seminar_media_video.html:117 #: templates/teleforma/inc/conference_list.html:25 #: templates/teleforma/inc/media_list.html:36 #: templates/teleforma/inc/media_package_list.html:28 @@ -887,8 +886,8 @@ 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:81 -#: templates/teleforma/seminar_media_video.html:122 +#: templates/teleforma/seminar_media_audio.html:86 +#: templates/teleforma/seminar_media_video.html:126 #: templates/telemeta/profile_detail.html:84 msgid "Date added" msgstr "Date d'ajout" @@ -916,8 +915,8 @@ msgstr "Session" #: templates/teleforma/course_conference.html:72 #: templates/teleforma/course_conference_audio.html:67 #: templates/teleforma/course_media.html:133 -#: templates/teleforma/seminar_media_audio.html:75 -#: templates/teleforma/seminar_media_video.html:117 +#: templates/teleforma/seminar_media_audio.html:80 +#: templates/teleforma/seminar_media_video.html:121 #: templates/teleforma/inc/conference_list.html:27 #: templates/teleforma/inc/media_list.html:39 #: templates/teleforma/inc/media_package_list.html:31 @@ -932,14 +931,14 @@ msgstr "S T O P" #: templates/teleforma/course_conference.html:37 #: templates/teleforma/course_media.html:73 -#: templates/teleforma/seminar_media_video.html:76 +#: templates/teleforma/seminar_media_video.html:78 msgid "Audio" msgstr "Audio" #: templates/teleforma/course_conference.html:70 #: templates/teleforma/course_media.html:130 -#: templates/teleforma/seminar_testimonial.html:38 views/pro.py:272 -#: views/pro.py:326 views/pro.py:370 +#: templates/teleforma/seminar_testimonial.html:38 views/pro.py:273 +#: views/pro.py:324 views/pro.py:364 msgid "Course" msgstr "Matière" @@ -982,7 +981,7 @@ msgstr "ID Conférence" #: templates/teleforma/course_conference_audio.html:36 #: templates/teleforma/course_media.html:76 -#: templates/teleforma/seminar_media_audio.html:23 +#: templates/teleforma/seminar_media_audio.html:26 msgid "Video" msgstr "Vidéo" @@ -1007,9 +1006,9 @@ msgstr "Enregistrer et diffuser" #: templates/teleforma/course_media.html:27 #: templates/teleforma/course_media.html:79 -#: templates/teleforma/seminar_media_audio.html:26 +#: templates/teleforma/seminar_media_audio.html:29 #: templates/teleforma/seminar_media_video.html:21 -#: templates/teleforma/seminar_media_video.html:79 +#: templates/teleforma/seminar_media_video.html:81 #: templates/teleforma/inc/media_list.html:50 #: templates/teleforma/inc/media_package_list.html:44 msgid " published" @@ -1017,9 +1016,10 @@ msgstr " publié" #: templates/teleforma/course_media.html:62 #: templates/teleforma/seminar_media_audio.html:10 -#: templates/teleforma/seminar_media_audio.html:130 -#: templates/teleforma/seminar_media_video.html:171 -#: templates/teleforma/testimonials.html:66 +#: templates/teleforma/seminar_media_audio.html:133 +#: templates/teleforma/seminar_media_video.html:175 +#: templates/teleforma/testimonials.html:60 +#: templates/teleforma/testimonials.html:70 #: templates/teleforma/inc/document_list.html:22 #: templates/teleforma/inc/document_simple_list.html:9 #: templates/teleforma/inc/media_list.html:56 @@ -1033,14 +1033,14 @@ msgid "Mime type" msgstr "Type mime" #: templates/teleforma/course_media.html:143 -#: templates/teleforma/seminar_media_audio.html:82 -#: templates/teleforma/seminar_media_video.html:123 +#: templates/teleforma/seminar_media_audio.html:87 +#: templates/teleforma/seminar_media_video.html:127 msgid "Date modified" msgstr "Date de modification" #: templates/teleforma/course_media.html:144 -#: templates/teleforma/seminar_media_audio.html:83 -#: templates/teleforma/seminar_media_video.html:124 +#: templates/teleforma/seminar_media_audio.html:88 +#: templates/teleforma/seminar_media_video.html:128 msgid "Media ID" msgstr "ID Média" @@ -1065,7 +1065,7 @@ msgstr "Status" msgid "evaluate the seminar" msgstr "évaluer ce séminaire" -#: templates/teleforma/help.html:11 templates/telemeta/base.html:115 +#: templates/teleforma/help.html:11 templates/telemeta/base.html:109 #: templates/telemeta/base.html.py:127 msgid "Help" msgstr "Aide" @@ -1112,17 +1112,17 @@ msgstr "obtenez votre attestation" msgid "Plan" msgstr "Plan" -#: templates/teleforma/seminar_media_audio.html:75 -#: templates/teleforma/seminar_media_video.html:117 +#: templates/teleforma/seminar_media_audio.html:80 +#: templates/teleforma/seminar_media_video.html:121 #: templates/teleforma/inc/media_package_list.html:31 msgid "Professors" msgstr "Professeurs" -#: templates/teleforma/seminar_media_audio.html:99 +#: templates/teleforma/seminar_media_audio.html:104 msgid "Audio index" msgstr "Index audio" -#: templates/teleforma/seminar_media_video.html:140 +#: templates/teleforma/seminar_media_video.html:144 msgid "Video index" msgstr "Index vidéo" @@ -1169,30 +1169,30 @@ msgid "Access" msgstr "Accéder" #: templates/teleforma/testimonials.html:7 -#: templates/teleforma/testimonials.html:45 +#: templates/teleforma/testimonials.html:45 templates/telemeta/base.html:110 msgid "Testimonials" msgstr "Attestations" -#: templates/teleforma/testimonials.html:62 +#: templates/teleforma/testimonials.html:56 #: templates/teleforma/inc/answer_list.html:19 #: templates/telemeta/profile_detail.html:58 #: templates/telemeta/inc/user_list.html:19 msgid "Last Name" msgstr "" -#: templates/teleforma/testimonials.html:63 +#: templates/teleforma/testimonials.html:57 #: templates/teleforma/inc/answer_list.html:20 #: templates/telemeta/profile_detail.html:57 #: templates/telemeta/inc/user_list.html:20 msgid "First Name" msgstr "" -#: templates/teleforma/testimonials.html:65 +#: templates/teleforma/testimonials.html:59 #: templates/teleforma/inc/answer_list.html:22 msgid "Date submitted" msgstr "date de soumission" -#: templates/teleforma/testimonials.html:92 +#: templates/teleforma/testimonials.html:77 msgid "No testimonial" msgstr "Aucune attestation" @@ -1275,9 +1275,9 @@ msgid "duration" msgstr "durée" #: templates/teleforma/messages/answer_rejected.txt:1 -#, python-format +#, fuzzy, python-format msgid "" -"%(gender)s %(lastname)s,\n" +"%(first_name)s %(last_name)s,\n" "\n" "We are sorry we cannot validate your answer n°%(rank)s of the e-learning " "seminar \"%(title)s\".\n" @@ -1294,7 +1294,7 @@ msgid "" "The team of the %(organization)s thank you for your confidence and we remain " "at your disposal for further information.\n" msgstr "" -"%(gender)s %(lastname)s,\n" +"%(first_name)s %(last_name)s,\n" "\n" "Nous sommes au regret de ne pouvoir valider votre réponse à la consultation n" "°%(rank)s du séminaire e-learning \"%(title)s\".\n" @@ -1315,9 +1315,9 @@ msgstr "" "reste à votre disposition pour renseignement complémentaire.\n" #: templates/teleforma/messages/answer_validated.txt:1 -#, python-format +#, fuzzy, python-format msgid "" -"%(gender)s %(lastname)s,\n" +"%(first_name)s %(last_name)s,\n" "\n" "Your answer to the question n°%(rank)s of the e-learning seminar \"%(title)s" "\" has been validated.\n" @@ -1349,9 +1349,9 @@ msgstr "" "reste à votre disposition pour renseignement complémentaire.\n" #: templates/teleforma/messages/seminar_validated.txt:1 -#, python-format +#, fuzzy, python-format msgid "" -"%(gender)s %(lastname)s,\n" +"%(first_name)s %(last_name)s,\n" "\n" "Your answer to the question n°%(rank)s of the e-learning seminar \"%(title)s" "\" has been validated.\n" @@ -1393,16 +1393,16 @@ msgstr "" msgid "Desk" msgstr "Bureau" -#: templates/telemeta/base.html:104 +#: templates/telemeta/base.html:103 msgid "Contact us" msgstr "Nous contacter" -#: templates/telemeta/base.html:107 templates/telemeta/users.html:6 +#: templates/telemeta/base.html:106 templates/telemeta/users.html:6 #: templates/telemeta/users.html.py:43 msgid "Users" msgstr "" -#: templates/telemeta/base.html:113 +#: templates/telemeta/base.html:115 msgid "Admin" msgstr "" @@ -1662,33 +1662,33 @@ msgstr "" "Toutes vos consultations fictives ont été validées ! Vous pouvez désormais " "télécharger l'attestation de formation ci-dessous." -#: views/pro.py:163 +#: views/pro.py:164 msgid "You have successfully saved your answer" msgstr "Vous avez enregistré votre consultation avec succès" -#: views/pro.py:165 +#: views/pro.py:166 msgid "You have successfully submitted your answer" msgstr "Vous avez soumis votre consultation avec succès" -#: views/pro.py:169 +#: views/pro.py:170 msgid "Your submission has not been saved correctly. Please try again." msgstr "" "Votre consultation n'a pas été enregistrée correctement, veuillez réessayer " "SVP." -#: views/pro.py:270 views/pro.py:324 views/pro.py:368 +#: views/pro.py:271 views/pro.py:322 views/pro.py:362 msgid "Subtitle" msgstr "Sous-titre" -#: views/pro.py:293 +#: views/pro.py:290 msgid "all your answers has been validated" -msgstr "Toutes vos consultations ont été validées" +msgstr "toutes vos consultations ont été validées" -#: views/pro.py:346 +#: views/pro.py:340 msgid "validation conditions for an answer" msgstr "conditions de validation d'une consultation" -#: views/pro.py:463 +#: views/pro.py:457 msgid "You have successfully submitted your evaluation" msgstr "Vous avez soumis votre évaluation avec succès" diff --git a/teleforma/templates/teleforma/messages/answer_rejected.txt b/teleforma/templates/teleforma/messages/answer_rejected.txt index c2f90266..74bb27ee 100644 --- a/teleforma/templates/teleforma/messages/answer_rejected.txt +++ b/teleforma/templates/teleforma/messages/answer_rejected.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans %}{{ gender }} {{ lastname }}, +{% load i18n %}{% blocktrans %}{{ first_name }} {{ last_name }}, We are sorry we cannot validate your answer n°{{ rank }} of the e-learning seminar "{{ title }}". diff --git a/teleforma/templates/teleforma/messages/answer_validated.txt b/teleforma/templates/teleforma/messages/answer_validated.txt index 5d3315b7..ee4d7ced 100644 --- a/teleforma/templates/teleforma/messages/answer_validated.txt +++ b/teleforma/templates/teleforma/messages/answer_validated.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans %}{{ gender }} {{ lastname }}, +{% load i18n %}{% blocktrans %}{{ first_name }} {{ last_name }}, Your answer to the question n°{{ rank }} of the e-learning seminar "{{ title }}" has been validated. diff --git a/teleforma/templates/teleforma/messages/seminar_validated.txt b/teleforma/templates/teleforma/messages/seminar_validated.txt index bebc9429..717786b1 100644 --- a/teleforma/templates/teleforma/messages/seminar_validated.txt +++ b/teleforma/templates/teleforma/messages/seminar_validated.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans %}{{ gender }} {{ lastname }}, +{% load i18n %}{% blocktrans %}{{ first_name }} {{ last_name }}, Your answer to the question n°{{ rank }} of the e-learning seminar "{{ title }}" has been validated. diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 486573f1..e7c07eec 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -273,12 +273,8 @@ class AnswersView(ListView): title = unicode(_('Course')) + ' : ' + seminar.course.title organization = seminar.course.department.name - auditor = user.auditor.all() - if auditor: - context['gender'] = unicode(_(auditor[0].gender)) - else: - context['gender'] = user.first_name - context['lastname'] = user.last_name + context['first_name'] = user.first_name + context['last_name'] = user.last_name context['rank'] = answer.question.rank context['domain'] = site.name context['path'] = path @@ -289,15 +285,15 @@ class AnswersView(ListView): if seminar_validated(user, seminar): testimonial = Testimonial(user=user, seminar=seminar) testimonial.save() - url = reverse('teleforma-seminar-testimonial-download', kwargs={'pk':seminar.id}) + '?format=pdf' + # url = reverse('teleforma-seminar-testimonial-download', kwargs={'pk':seminar.id}) + '?format=pdf' text = render_to_string('teleforma/messages/seminar_validated.txt', context) subject = seminar.title + ' : ' + unicode(_('all your answers has been validated')) else: text = render_to_string('teleforma/messages/answer_validated.txt', context) - a = _('answer').decode('utf8') - v = _('validated').decode('utf8') - subject = '%s : %s n° %s %s' % (seminar.title, a, str(context['rank']), v) + a = _('answer') + v = _('validated') + subject = '%s : %s - %s %s' % (seminar.title, a, str(context['rank']), v) mess = Message(sender=sender, recipient=user, subject=subject, body=text) mess.moderation_status = 'a' @@ -327,12 +323,8 @@ class AnswersView(ListView): else: title = unicode(_('Course')) + ' : ' + seminar.course.title organization = seminar.course.department.name - auditor = user.auditor.all() - if auditor: - context['gender'] = auditor[0].gender - else: - context['gender'] = user.first_name - context['lastname'] = user.last_name + context['first_name'] = user.first_name + context['last_name'] = user.last_name context['rank'] = answer.question.rank context['domain'] = site.name context['path'] = path