From: yomguy Date: Mon, 18 Feb 2013 16:06:47 +0000 (+0100) Subject: reload gender ? X-Git-Tag: 0.9-probarreau~45 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=c0ae46f3c3da1acfed94ebc7adfcb3de3b9f9e3e;p=teleforma.git reload gender ? --- diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 685cd537..280f0402 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 4ffa5fb3..57fcd835 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-02-18 16:44+0100\n" +"POT-Creation-Date: 2013-02-18 17:06+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@ -913,7 +913,6 @@ msgid "Title" msgstr "Titre" #: templates/teleforma/course.html:18 templates/teleforma/course.html.py:34 -#: templates/teleforma/seminar_testimonial.html:41 #: templates/teleforma/inc/media_package_list.html:36 msgid "Description" msgstr "Description" @@ -1182,21 +1181,21 @@ msgstr "" msgid "Training type" msgstr "Type de formation" -#: templates/teleforma/seminar_testimonial.html:43 +#: templates/teleforma/seminar_testimonial.html:40 #: templates/teleforma/inc/media_package_list.html:38 msgid "Duration" msgstr "Durée" -#: templates/teleforma/seminar_testimonial.html:43 +#: templates/teleforma/seminar_testimonial.html:40 #: templates/teleforma/inc/seminar_description.html:12 msgid "hours" msgstr "heures" -#: templates/teleforma/seminar_testimonial.html:44 +#: templates/teleforma/seminar_testimonial.html:41 msgid "Training begin date" msgstr "Date de début de formation" -#: templates/teleforma/seminar_testimonial.html:45 +#: templates/teleforma/seminar_testimonial.html:42 msgid "Training end date" msgstr "Date de fin de formation" @@ -1356,7 +1355,7 @@ msgstr "" "reste à votre disposition pour renseignement complémentaire.\n" #: templates/teleforma/messages/answer_validated.txt:1 -#, fuzzy, python-format +#, python-format msgid "" "%(gender)s %(first_name)s %(last_name)s,\n" "\n" @@ -1373,7 +1372,7 @@ msgid "" "The team of the %(organization)s thank you for your confidence and we remain " "at your disposal for further information.\n" msgstr "" -"%(first_name)s %(last_name)s,\n" +"%(gender)s %(first_name)s %(last_name)s,\n" "\n" "Votre réponse à la consultation n°%(rank)s du séminaire e-learning " "\"%(title)s\" a été validée.\n" @@ -1390,7 +1389,7 @@ msgstr "" "reste à votre disposition pour renseignement complémentaire.\n" #: templates/teleforma/messages/seminar_validated.txt:1 -#, fuzzy, python-format +#, python-format msgid "" "%(gender)s %(first_name)s %(last_name)s,\n" "\n" @@ -1411,7 +1410,7 @@ msgid "" "The team of the %(organization)s thank you for your confidence and we remain " "at your disposal for further information.\n" msgstr "" -"%(first_name)s %(last_name)s,\n" +"%(gender)s %(first_name)s %(last_name)s,\n" "\n" "Votre réponse à la consultation n°%(rank)s du séminaire e-learning " "\"%(title)s\" a été validée.\n" diff --git a/teleforma/templates/teleforma/messages/answer_rejected.txt b/teleforma/templates/teleforma/messages/answer_rejected.txt index 74bb27ee..0895a3e7 100644 --- a/teleforma/templates/teleforma/messages/answer_rejected.txt +++ b/teleforma/templates/teleforma/messages/answer_rejected.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans %}{{ first_name }} {{ last_name }}, +{% load i18n %}{% blocktrans %}{{ gender }} {{ 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 ee4d7ced..13609ac6 100644 --- a/teleforma/templates/teleforma/messages/answer_validated.txt +++ b/teleforma/templates/teleforma/messages/answer_validated.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans %}{{ first_name }} {{ last_name }}, +{% load i18n %}{% blocktrans %}{{ gender }} {{ 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 717786b1..36102965 100644 --- a/teleforma/templates/teleforma/messages/seminar_validated.txt +++ b/teleforma/templates/teleforma/messages/seminar_validated.txt @@ -1,4 +1,4 @@ -{% load i18n %}{% blocktrans %}{{ first_name }} {{ last_name }}, +{% load i18n %}{% blocktrans %}{{ gender }} {{ 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 64ce7236..ceebae46 100644 --- a/teleforma/views/pro.py +++ b/teleforma/views/pro.py @@ -313,12 +313,12 @@ class AnswersView(ListView): else: title = unicode(seminar.course.title) - # auditor = user.auditor.all() - # if auditor: - # gender = unicode(_(auditor[0].gender)) - # else: - # gender = '' - # context['gender'] = gender + auditor = user.auditor.all() + if auditor: + gender = unicode(_(auditor[0].gender)) + else: + gender = '' + context['gender'] = gender context['first_name'] = user.first_name context['last_name'] = user.last_name context['rank'] = answer.question.rank @@ -370,12 +370,12 @@ class AnswersView(ListView): else: title = unicode(seminar.course.title) - # auditor = user.auditor.all() - # if auditor: - # gender = unicode(_(auditor[0].gender)) - # else: - # gender = '' - # context['gender'] = gender + auditor = user.auditor.all() + if auditor: + gender = unicode(_(auditor[0].gender)) + else: + gender = '' + context['gender'] = gender context['first_name'] = user.first_name context['last_name'] = user.last_name context['rank'] = answer.question.rank @@ -408,7 +408,7 @@ class AnswerDetailViewTest(DetailView): user = answer.user sender = self.request.user site = Site.objects.get_current() - path= reverse('teleforma-question-answer', kwargs={'pk':answer.question.id}) + path= reverse('teleforma-question-answer', kwargs={'id': seminar.id, 'pk':answer.question.id}) if answer.question.seminar.sub_title: title = unicode(_('Subtitle')) + ' : ' + seminar.sub_title else: