reload gender ?

diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo
index 685cd5370545feb7a92ed83725c6d109e7bf4c79..280f0402fa2421c946f1a01ec11cde5b1e9493b9 100644 (file)
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 4ffa5fb33e0cdd6341a6f22d8be59161b3b931e3..57fcd835483d599909aff3f304ee0c4826a116cc 100644 (file)
--- 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 <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <lists@parisson.com>\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 74bb27ee7075b9b900d375aa25a5d930ec7c5f82..0895a3e712f695007a3532ef34af5a9635a1fe43 100644 (file)
--- 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 ee4d7ced9d7288b9392aad6b937b2a329361a305..13609ac6fdd4145636551a787d817eb0f1f411a1 100644 (file)
--- 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 717786b1db8f0f32f9fb7943bc847fe00b8fc3e5..3610296534bb4165706d4d42a7bf32b4d54d5696 100644 (file)
--- 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 64ce7236aa7cf55ca3c229c8a6ad51bd5a991a90..ceebae46b60c6d3f0733476ef5596ea03c5cac20 100644 (file)
--- 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: