From 99cf39d9204baa721fa610741b354ff2c820f8d9 Mon Sep 17 00:00:00 2001 From: yomguy Date: Thu, 17 Jan 2013 15:45:36 +0100 Subject: [PATCH] add reject message + trans --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 12344 -> 13528 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 130 ++++++++++-------- teleforma/static/teleforma/css/teleforma.css | 2 +- .../templates/teleforma/answer_form.html | 3 +- .../teleforma/messages/answer_rejected.txt | 9 ++ teleforma/views/pro.py | 16 ++- 6 files changed, 97 insertions(+), 63 deletions(-) create mode 100644 teleforma/templates/teleforma/messages/answer_rejected.txt diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 1951579d8376ea3cd9d8b9a9e10ccb61669eb878..0869b27f3730af29dc0007e6ac6ecb5ac3f92827 100644 GIT binary patch literal 13528 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 jR`J26^U9_*pPXHs*QQh1_BI\n" "Language-Team: LANGUAGE \n" @@ -393,7 +393,7 @@ msgstr "documents corrigés" msgid "form" msgstr "formulaire" -#: models/pro.py:114 templates/teleforma/answer_form.html:88 +#: models/pro.py:114 templates/teleforma/answer_form.html:104 #: templates/teleforma/seminar_detail.html:158 #: templates/teleforma/testimonials.html:64 #: templates/teleforma/inc/answer_list.html:21 @@ -438,7 +438,7 @@ msgid "date validated" msgstr "date de validation" #: models/pro.py:162 templates/teleforma/answer_detail.html:28 -#: templates/teleforma/answer_form.html:91 +#: templates/teleforma/answer_form.html:107 msgid "Answer" msgstr "Réponse" @@ -455,7 +455,7 @@ msgid "Testimonial template" msgstr "Modèle d'attestation" #: models/pro.py:196 templates/teleforma/inc/testimonial_list.html:7 -#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:492 +#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:502 msgid "Testimonial" msgstr "Attestation" @@ -708,20 +708,6 @@ msgstr "" msgid "Reply" msgstr "" -#: templates/postman/seminar_validated.txt:2 -#, fuzzy -msgid "" -"Congratulations!\n" -"\n" -"Your seminar has been validated.\n" -"You can go to the next step of your seminar following this link:\n" -msgstr "" -"Félicitations!\n" -"\n" -"Votre dernière consultation a été validée.\n" -"Vous pouvez accéder à la prochaine étape de votre séminaire en suivant ce " -"lien :\n" - #: templates/postman/sent.html:6 msgid "Sent" msgstr "" @@ -770,12 +756,16 @@ msgid " reject" msgstr " rejeter" #: templates/teleforma/answer_form.html:46 -#: templates/teleforma/evaluation_form.html:22 -#: templates/teleforma/seminar_media_video.html:60 +msgid "You have NOT save your work!" +msgstr "Vous n'avez PAS enregistré votre consultation" + +#: templates/teleforma/answer_form.html:63 +#: templates/teleforma/evaluation_form.html:27 +#: templates/teleforma/seminar_media_video.html:59 msgid "My steps" msgstr "Mes étapes" -#: templates/teleforma/answer_form.html:57 +#: templates/teleforma/answer_form.html:74 #: templates/teleforma/evaluation_form.html:10 #: templates/teleforma/seminar_detail.html:77 #: templates/teleforma/seminar_detail.html:86 @@ -791,34 +781,34 @@ msgstr "Mes étapes" msgid "Step" msgstr "Étape" -#: templates/teleforma/answer_form.html:57 +#: templates/teleforma/answer_form.html:74 #: templates/teleforma/seminar_detail.html:105 msgid "answer to this question" msgstr "réaliser cette consultation fictive" -#: templates/teleforma/answer_form.html:57 +#: templates/teleforma/answer_form.html:74 msgid "characters" msgstr "caractères" -#: templates/teleforma/answer_form.html:57 +#: templates/teleforma/answer_form.html:74 msgid "minimum" msgstr "minimum" -#: templates/teleforma/answer_form.html:72 +#: templates/teleforma/answer_form.html:88 msgid "Save" msgstr "" -#: templates/teleforma/answer_form.html:73 +#: templates/teleforma/answer_form.html:89 msgid "Submit it" msgstr "Soumettre" -#: templates/teleforma/answer_form.html:81 +#: templates/teleforma/answer_form.html:97 #: templates/teleforma/seminar_detail.html:152 #: templates/teleforma/seminars.html:133 msgid "Progressions" msgstr "Progressions" -#: templates/teleforma/answer_form.html:85 +#: templates/teleforma/answer_form.html:101 #: templates/teleforma/seminar_detail.html:155 #: templates/teleforma/seminars.html:136 msgid "General" @@ -840,7 +830,7 @@ msgstr "validé" #: templates/teleforma/course_media.html:79 #: templates/teleforma/seminar_media_audio.html:25 #: templates/teleforma/seminar_media_video.html:28 -#: templates/teleforma/seminar_media_video.html:86 +#: templates/teleforma/seminar_media_video.html:85 #: templates/teleforma/testimonials.html:83 #: templates/teleforma/inc/answer_list.html:41 #: templates/teleforma/inc/media_list.html:52 @@ -867,7 +857,7 @@ 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:120 +#: templates/teleforma/seminar_media_video.html:119 #: templates/teleforma/inc/conference_list.html:25 #: templates/teleforma/inc/media_list.html:36 #: templates/teleforma/inc/media_package_list.html:28 @@ -886,7 +876,7 @@ msgstr "Description" #: templates/teleforma/course.html:52 #: templates/teleforma/course_media.html:142 #: templates/teleforma/seminar_media_audio.html:80 -#: templates/teleforma/seminar_media_video.html:129 +#: templates/teleforma/seminar_media_video.html:128 #: templates/telemeta/profile_detail.html:84 msgid "Date added" msgstr "Date d'ajout" @@ -915,7 +905,7 @@ 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:124 +#: templates/teleforma/seminar_media_video.html:123 #: templates/teleforma/inc/conference_list.html:27 #: templates/teleforma/inc/media_list.html:39 #: templates/teleforma/inc/media_package_list.html:31 @@ -930,7 +920,7 @@ msgstr "S T O P" #: templates/teleforma/course_conference.html:37 #: templates/teleforma/course_media.html:73 -#: templates/teleforma/seminar_media_video.html:83 +#: templates/teleforma/seminar_media_video.html:82 msgid "Audio" msgstr "Audio" @@ -1006,7 +996,7 @@ msgstr "Enregistrer et diffuser" #: templates/teleforma/course_media.html:79 #: templates/teleforma/seminar_media_audio.html:25 #: templates/teleforma/seminar_media_video.html:21 -#: templates/teleforma/seminar_media_video.html:86 +#: templates/teleforma/seminar_media_video.html:85 #: templates/teleforma/inc/media_list.html:50 #: templates/teleforma/inc/media_package_list.html:44 msgid " published" @@ -1014,7 +1004,7 @@ msgstr " publié" #: templates/teleforma/course_media.html:62 #: templates/teleforma/seminar_media_audio.html:10 -#: templates/teleforma/seminar_media_video.html:71 +#: templates/teleforma/seminar_media_video.html:70 #: templates/teleforma/testimonials.html:66 #: templates/teleforma/inc/document_list.html:22 #: templates/teleforma/inc/document_simple_list.html:9 @@ -1030,13 +1020,13 @@ msgstr "Type mime" #: templates/teleforma/course_media.html:143 #: templates/teleforma/seminar_media_audio.html:81 -#: templates/teleforma/seminar_media_video.html:130 +#: templates/teleforma/seminar_media_video.html:129 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:131 +#: templates/teleforma/seminar_media_video.html:130 msgid "Media ID" msgstr "ID Média" @@ -1109,7 +1099,7 @@ msgid "Plan" msgstr "Plan" #: templates/teleforma/seminar_media_audio.html:74 -#: templates/teleforma/seminar_media_video.html:124 +#: templates/teleforma/seminar_media_video.html:123 #: templates/teleforma/inc/media_package_list.html:31 msgid "Professors" msgstr "Professeurs" @@ -1118,7 +1108,7 @@ msgstr "Professeurs" msgid "Audio index" msgstr "Index audio" -#: templates/teleforma/seminar_media_video.html:147 +#: templates/teleforma/seminar_media_video.html:146 msgid "Video index" msgstr "Index vidéo" @@ -1273,13 +1263,24 @@ msgstr "durée" msgid "hours" msgstr "heures" +#: templates/teleforma/messages/answer_rejected.txt:2 +msgid "" +"Sorry!\n" +"\n" +"Your answer has been rejected. \n" +"You can work and try again following this link:\n" +msgstr "" +"Nous sommes désolés!\n" +"\n" +"Votre consultation n'a pas été validée.\n" +"Vous pouvez la re-travailler et la soumettre en suivant ce lien :\n" + #: templates/teleforma/messages/answer_validated.txt:2 -#, fuzzy msgid "" "Congratulations!\n" "\n" -"Your seminar has been completed and validated. \n" -"You can now download the training testimonial following this link:\n" +"Your answer has been validated. \n" +"You can go to the next step of your seminar following this link:\n" msgstr "" "Félicitations!\n" "\n" @@ -1288,21 +1289,16 @@ msgstr "" "lien :\n" #: templates/teleforma/messages/seminar_validated.txt:2 -#, fuzzy, python-format msgid "" "Congratulations!\n" "\n" -"Your answer has been validated.\n" -"You can continue to the next step of your seminar following this link:\n" -" \n" -"http://%(site.name)s%(seminar_url)s\n" -"\n" +"Your seminar has been validated. \n" +"You can now download the training testimonial following this link:\n" msgstr "" "Félicitations!\n" "\n" -"Votre dernière consultation a été validée.\n" -"Vous pouvez accéder à la prochaine étape de votre séminaire en suivant ce " -"lien :\n" +"Votre séminaire a été validé.\n" +"Vous pouvez télecharger votre attestation en cliquant sur ce lien :\n" #: templates/telemeta/base.html:96 msgid "Desk" @@ -1585,16 +1581,38 @@ 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:270 -#, fuzzy +#: views/pro.py:265 +msgid "Seminar validated" +msgstr "Séminaire validé" + +#: views/pro.py:271 msgid "Answer validated" -msgstr "validé" +msgstr "Consultation validée" -#: views/pro.py:365 -#, fuzzy +#: views/pro.py:295 +msgid "Answer rejected" +msgstr "Consultation rejetée" + +#: views/pro.py:377 msgid "You have successfully submitted your evaluation" msgstr "Vous avez soumis votre évaluation avec succès" +#, fuzzy +#~ msgid "" +#~ "Congratulations!\n" +#~ "\n" +#~ "Your answer has been validated.\n" +#~ "You can continue to the next step of your seminar following this link:\n" +#~ " \n" +#~ "http://%(site.name)s%(seminar_url)s\n" +#~ "\n" +#~ msgstr "" +#~ "Félicitations!\n" +#~ "\n" +#~ "Votre dernière consultation a été validée.\n" +#~ "Vous pouvez accéder à la prochaine étape de votre séminaire en suivant ce " +#~ "lien :\n" + #~ msgid "Your answer has been validated" #~ msgstr "Votre consultation a été validée" diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index 16306fac..92577716 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -1880,7 +1880,7 @@ form .exceed{ border-radius: 8px 0px 8px 8px; color: black; padding: 0.5em; - max-height: 300px; + max-height: 250px; overflow-y: auto; } diff --git a/teleforma/templates/teleforma/answer_form.html b/teleforma/templates/teleforma/answer_form.html index 4daacea2..821cf3f5 100644 --- a/teleforma/templates/teleforma/answer_form.html +++ b/teleforma/templates/teleforma/answer_form.html @@ -47,9 +47,10 @@ $(document).ready(function(){ }); {% endif %} + $('#seminars').css({'max-height': '200px'}); }); -$('#seminars').css({'max-height': '200px'}); + {% endblock extra_javascript %} diff --git a/teleforma/templates/teleforma/messages/answer_rejected.txt b/teleforma/templates/teleforma/messages/answer_rejected.txt new file mode 100644 index 00000000..9026db90 --- /dev/null +++ b/teleforma/templates/teleforma/messages/answer_rejected.txt @@ -0,0 +1,9 @@ +{% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %} +{% blocktrans %}Sorry! + +Your answer has been rejected. +You can work and try again following this link: +{% endblocktrans %} +http://{{ site.name }}{{ url }} + +{% organization %} \ No newline at end of file diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 9896942b..d7c1949b 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -163,10 +163,7 @@ class AnswerView(FormView): return super(AnswerView, self).form_valid(form) def form_invalid(self, form): - messages.error( - self.request, - "Your submission has not been saved. Try again." - ) + messages.error(self.request,"Your submission has not been saved. Try again.") return super(AnswerView, self).form_invalid(form) def get_context_data(self, **kwargs): @@ -181,7 +178,6 @@ class AnswerView(FormView): return reverse('teleforma-seminar-detail', kwargs={'pk':self.question.seminar.id}) - class SeminarMediaView(MediaView): template_name = 'teleforma/seminar_media_video.html' @@ -284,6 +280,7 @@ class AnswersView(ListView): answer = Answer.objects.get(id=id) seminar = answer.question.seminar user = answer.user + sender = request.user testimonials = Testimonial.objects.filter(user=user, seminar=seminar) if testimonials: for testimonial in testimonials: @@ -291,6 +288,15 @@ class AnswersView(ListView): answer.validated = False answer.status = 2 answer.save() + site = Site.objects.get_current() + url = reverse('teleforma-question-answer', kwargs={'pk':answer.question.id}) + ctx_dict = {'site': site, 'url': url,} + text = render_to_string('teleforma/messages/answer_rejected.txt', ctx_dict) + subject = _('Answer rejected') + ' : ' + seminar.title + mess = Message(sender=sender, recipient=user, subject=subject, body=text) + mess.moderation_status = 'a' + mess.save() + notify_user(mess, 'acceptance') class AnswerDetailView(DetailView): -- 2.39.5