From 2c8624fd9579c3ef817fed3aa67a721bb6db4795 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 21 Jan 2013 17:47:47 +0100 Subject: [PATCH] locales & styles --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 16463 -> 16725 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 31 +++++++++++-------- teleforma/static/teleforma/css/teleforma.css | 8 +++-- teleforma/views/pro.py | 4 ++- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 3a945420b29982a19875c802315322a92f490814..ecc4ab29cf71c8ed5d5388aa873037d69e901c4c 100644 GIT binary patch delta 5226 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 T@t<;=$1^*otbM8bj>P`~7p85_ delta 5001 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 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' -- 2.39.5