From 688b027cdce7980d186ce1c817817d630911ec7f Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 18 Feb 2013 16:45:09 +0100 Subject: [PATCH] messages and locales --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 17560 -> 15494 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 58 +++++++++++----------- teleforma/views/pro.py | 5 +- 3 files changed, 32 insertions(+), 31 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 8127603d72ca35978fca52afedf52d49e6373bce..685cd5370545feb7a92ed83725c6d109e7bf4c79 100644 GIT binary patch delta 5895 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 Hn~?G=(a(z$ delta 6575 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\n" "Language-Team: LANGUAGE \n" @@ -433,7 +433,7 @@ msgstr "status" msgid "Question" msgstr "Question" -#: models/pro.py:160 views/pro.py:335 +#: models/pro.py:160 views/pro.py:340 msgid "answer" msgstr "consultation" @@ -442,7 +442,7 @@ msgid "treated" msgstr "" #: models/pro.py:163 templates/teleforma/seminar_detail.html:50 -#: templates/teleforma/seminars.html:106 views/pro.py:336 +#: templates/teleforma/seminars.html:106 views/pro.py:341 msgid "validated" msgstr "validée" @@ -473,7 +473,7 @@ msgstr "Modèle d'attestation" #: models/pro.py:233 templates/teleforma/seminar_testimonial.html:13 #: templates/teleforma/inc/testimonial_list.html:7 -#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:620 +#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:625 msgid "Testimonial" msgstr "Attestation" @@ -972,8 +972,7 @@ msgstr "Audio" #: templates/teleforma/course_conference.html:70 #: templates/teleforma/course_media.html:130 -#: templates/teleforma/seminar_testimonial.html:38 views/pro.py:315 -#: views/pro.py:410 +#: templates/teleforma/seminar_testimonial.html:38 views/pro.py:415 msgid "Course" msgstr "Matière" @@ -1357,9 +1356,9 @@ msgstr "" "reste à votre disposition pour renseignement complémentaire.\n" #: templates/teleforma/messages/answer_validated.txt:1 -#, python-format +#, fuzzy, python-format msgid "" -"%(first_name)s %(last_name)s,\n" +"%(gender)s %(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" @@ -1391,9 +1390,9 @@ msgstr "" "reste à votre disposition pour renseignement complémentaire.\n" #: templates/teleforma/messages/seminar_validated.txt:1 -#, python-format +#, fuzzy, python-format msgid "" -"%(first_name)s %(last_name)s,\n" +"%(gender)s %(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" @@ -1706,47 +1705,50 @@ msgstr "" #: views/pro.py:138 msgid "" -"You have terminated all the steps of your training. You can now download the " -"training testimonial below." +"All your answers have been validated but you did not viewed all the " +"contents. Please do so to get access to the next steps." msgstr "" -"Vous avez achevé toutes les étapes de votre formation. Vous pouvez désormais " -"télécharger votre attestation de formation ci-dessous" +"Toutes vos consultations fictives ont été validées mais vous n'avez pas lu " +"tous les documents du séminaire. Veuillez le faire s'il vous plaît pour " +"accéder aux prochaines étapes." #: views/pro.py:140 msgid "" -"All your answers have been validated. Auto-evaluate yourself with the " -"corrected documents." +"You have successfully terminated your e-learning seminar and all your " +"answers have been validated. You can now download your training testimonial " +"below." msgstr "" -"Toutes vos consultations fictives ont été validées. Auto évaluez-vous à " -"l’aide du corrigé type des consultations fictives (étape 5)" +"Vous avez achevé toutes les étapes de votre formation et toutes vos " +"consultations fictives ont été validées. Vous pouvez désormais télécharger " +"votre attestation de formation ci-dessous." -#: views/pro.py:185 +#: views/pro.py:184 msgid "You have successfully saved your answer" msgstr "Vous avez enregistré votre consultation avec succès" -#: views/pro.py:187 +#: views/pro.py:186 msgid "You have successfully submitted your answer" msgstr "Vous avez soumis votre consultation avec succès" -#: views/pro.py:191 +#: views/pro.py:190 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:313 views/pro.py:408 -msgid "Subtitle" -msgstr "Sous-titre" - -#: views/pro.py:331 +#: views/pro.py:336 msgid "all your answers has been validated" msgstr "toutes vos consultations ont été validées" -#: views/pro.py:385 +#: views/pro.py:390 msgid "validation conditions for an answer" msgstr "conditions de validation d'une consultation" -#: views/pro.py:499 +#: views/pro.py:413 +msgid "Subtitle" +msgstr "Sous-titre" + +#: views/pro.py:504 msgid "You have successfully submitted your evaluation" msgstr "Vous avez soumis votre évaluation avec succès" diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 94f8ff8e..cde104dd 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -135,10 +135,9 @@ class SeminarView(SeminarAccessMixin, DetailView): if progress == 100 and not validated: messages.info(self.request, _("You have successfully terminated your e-learning seminar. A training testimonial will be available as soon as the pedagogical team validate all your answers (48h maximum).")) elif progress < 100 and validated: - messages.info(self.request, _("You have terminated all the steps of your training. You can now download the training testimonial below.")) + messages.info(self.request, _("All your answers have been validated but you did not viewed all the contents. Please do so to get access to the next steps.")) elif progress == 100 and validated: - messages.info(self.request, _("All your answers have been validated. Auto-evaluate yourself with the corrected documents.")) - + messages.info(self.request, _("You have successfully terminated your e-learning seminar and all your answers have been validated. You can now download your training testimonial below.")) set_revision(user, seminar) return context -- 2.39.5