From: yomguy Date: Mon, 21 Jan 2013 16:47:47 +0000 (+0100) Subject: locales & styles X-Git-Tag: 0.9-probarreau~119 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2c8624fd9579c3ef817fed3aa67a721bb6db4795;p=teleforma.git locales & styles --- diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 3a945420..ecc4ab29 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 45bc4166..4ba4a1a9 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:08+0100\n" +"POT-Creation-Date: 2013-01-21 17:43+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -421,12 +421,12 @@ msgstr "status" msgid "Question" msgstr "Question" -#: models/pro.py:144 views/pro.py:291 +#: models/pro.py:144 views/pro.py:297 msgid "answer" msgstr "réponse" #: models/pro.py:146 templates/teleforma/seminar_detail.html:50 -#: templates/teleforma/seminars.html:98 views/pro.py:292 +#: templates/teleforma/seminars.html:98 views/pro.py:298 msgid "validated" msgstr "validé" @@ -457,7 +457,7 @@ msgstr "Modèle d'attestation" #: models/pro.py:196 templates/teleforma/seminar_testimonial.html:13 #: templates/teleforma/inc/testimonial_list.html:7 -#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:582 +#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:590 msgid "Testimonial" msgstr "Attestation" @@ -938,8 +938,8 @@ msgstr "Audio" #: templates/teleforma/course_conference.html:70 #: templates/teleforma/course_media.html:130 -#: templates/teleforma/seminar_testimonial.html:38 views/pro.py:320 -#: views/pro.py:362 +#: templates/teleforma/seminar_testimonial.html:38 views/pro.py:272 +#: views/pro.py:326 views/pro.py:370 msgid "Course" msgstr "Matière" @@ -1670,20 +1670,25 @@ 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:286 -#, fuzzy -msgid "all your answers has been validated" -msgstr "Votre consultation a été validée" +#: views/pro.py:169 +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:318 views/pro.py:360 +#: views/pro.py:270 views/pro.py:324 views/pro.py:368 msgid "Subtitle" msgstr "Sous-titre" -#: views/pro.py:340 +#: views/pro.py:293 +msgid "all your answers has been validated" +msgstr "Toutes vos consultations ont été validées" + +#: views/pro.py:346 msgid "validation conditions for an answer" msgstr "conditions de validation d'une consultation" -#: views/pro.py:455 +#: views/pro.py:463 msgid "You have successfully submitted your evaluation" msgstr "Vous avez soumis votre évaluation avec succès" diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css index 74b45731..74d75e57 100644 --- a/teleforma/static/teleforma/css/teleforma.css +++ b/teleforma/static/teleforma/css/teleforma.css @@ -1544,7 +1544,7 @@ input,textarea{ -moz-border-radius: 8px 0px 8px 8px; -webkit-border-radius: 8px 0px 8px 8px; border-radius: 8px 0px 8px 8px; - padding: 0em 0em 0em 0em; + padding: 0em 0em 0.5em 0em; margin-top: 0.8em; border: 1px solid #dfdfdf; } @@ -1844,7 +1844,11 @@ form .exceed{ font: 1em Verdana, sans-serif; line-height: 1.3em; color: #333; - width: 100%; + padding: .5em; + -moz-border-radius: 8px 0px 8px 8px; + -webkit-border-radius: 8px 0px 8px 8px; + border-radius: 8px 0px 8px 8px; + width: 97%; } diff --git a/teleforma/views/pro.py b/teleforma/views/pro.py index 61e230f7..6182522f 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -166,7 +166,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 correctly. Please try again.")) return super(AnswerView, self).form_invalid(form) def get_context_data(self, **kwargs): @@ -349,7 +349,9 @@ class AnswersView(ListView): mess.save() notify_user(mess, 'acceptance') + class AnswerDetailViewTest(DetailView): + """For test only""" model = Answer template_name='teleforma/messages/answer_rejected.txt'