From 083251e5e026c5ca10b37138b72a8bc03ad54e27 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 24 Jan 2013 18:35:41 +0100 Subject: [PATCH] fic mess --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 16725 -> 13067 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 172 +++++++++--------- .../teleforma/messages/answer_rejected.txt | 2 +- .../teleforma/messages/answer_validated.txt | 2 +- .../teleforma/messages/seminar_validated.txt | 2 +- teleforma/views/pro.py | 24 +-- 6 files changed, 97 insertions(+), 105 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index ecc4ab29cf71c8ed5d5388aa873037d69e901c4c..73192d817a8bfdd0d931f2f529b8c7bfd5eb7230 100644 GIT binary patch delta 5461 zcmY+|33yFs9>?+bN+dyqh&>^REg>o*>DW@#R$(%hVo(*tGS*mvYN~f?X<|!D6oZzc z4YhQLDjmxhOiOj>5Nf7PwM9E>TG4it>7)Jr?)lI2nD=>pKIeVUIq!Dvxi@X;eBaV> z{<0duFFDFR5<_l=I@jOl+@We}rPOk+GWd{FE*vXiO|zk$PsDWEQ>{J?t5DCw5X{FY zEJXFQ8LK+ycW-bojD`cK3!`d#7u3g!)El8XO0@PgYfnc_tSg3NCI;g$YtKRrG|`-a z4CtOl^;dwE8Q-n43pS!AP>f-?8`a_4sDTclI(Qc&uoTtNRn&F2P&@Mj>i(Zm3ka*@ z)gv&7dL64rV>QNiP3%M(YM^$g4!faN&K#mAp@gP1CB*?JRLQWx#j}Y%9h*twWx`0LhaBl)Wr5-BpycX z@L5zpSM2-^)VSaIInY2qqMoU%@6|(4H%6d3ibV~Sf*PO`Y9}7E_Q9xrvQhm^LQQBo zYM`f3*Uv*uWErX-|7vU4h+6q})Rw)48t^o#!%L_eK0&?5*HII@hq^vI+S}52)I^d| z1Gh!pmyQ~^2dclm$asD?hyz_X3VCDPIPZj;hZ<-x>cjOi{uWdCfX3S!p5kT zCE58j)DCt=O}r24`YhC=7-Q!rq3)j}_5S-g&_Ma9*Kj53S#2`kwDU($1Drx#S8DYy z%x_Tx{TH>M3bEb&W0h??jct8c_~>f2Bc z`d_rTt?(?W!%{o{8ET?8Q1_Rk#&J!( z>#L%!_ea@5ENZ1ms2jSXZs>3I5g1H;3Tgr~%sgvfh`N3;YNuACc4!A`pd+XWoko3z zK13Gacb{{ht-oa#+`}O1zGmKy6;a=bk*M~@s4Y!Ez2M2H`#Yen>yG+(4@O-#4mI(q z);`nP7hn+MyQLgx<}Y9fZU~&U=zE=aMi4)37SzyN-522CBoyQCpUc+R7YjUx=E(D%4JFw)WRik8Hnr61DXgP&@J^ zhT>h+M0|-}dll4ArE9=}R@4^xAiI93Et`Rwz#OYD!;#cipeA@5wUYa&l~!!-wO2P| zQ0Eg-JDiM~NIHgL_vY-sejPGt&_u=}zd+7!7p}*O)VElDJ8FmapawjKy6+6~lj*Lb zR_<%zO{6BO9*5eARMZ4|peB~tg8kRQKx=pcHPg{p33ISA&PAz+mRJ74X3|Cd<9D%8*92GoTIQ3D)Ct>^^m2mPFR z9@WuB)J~M4cBmY+llM_O6`JBbk{B}{wV-C`SH~$FXrM>1I(A3Rco1rUEL4Z%QO|Z7 zYQR}$0qVZ>=1$ZO9mZ;S95vv1)Ocm6es83({~Gu<4I1z+YQ{lryn0>Kjg8EQFp_#Z zR0q9L0}VjkKLjI+Mr9Q$#a;iTsuDR=V@# zW3rumOS+Oc@;n(#^as4kG7tA0>T&Rf1o|N{JTWx|2>t zAJnMhpTW^&HBsIsUC24IgFILUSmgpvwBux)O7>e_FLE}yWA(;nZ&Uw;P=h>c^(*=` zuBP%8sX$&ODo>NEfg}EJ3C<-STKyO{A!|qn5=>NH@NlQF*p6SpS|q~izsF5v1@Q`> z#x@*%P3n=>&Wj&AyFAf>X0eqFJuXcCMQWeQRzdP6*aGwUa~y8e$~*lxRiDsQXekaotWVZ zi<>=a@`N$Rw-+smjwz|pW@V^vaLH@!k5};J7EMS`4bRS*I&;?K+)=p`a;BDSO-~5+ LjV*e=%aUIJldJ!_ literal 16725 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\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 -- 2.39.5