From c0ae46f3c3da1acfed94ebc7adfcb3de3b9f9e3e Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 18 Feb 2013 17:06:47 +0100 Subject: [PATCH] reload gender ? --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 15494 -> 17787 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 19 ++++++------- .../teleforma/messages/answer_rejected.txt | 2 +- .../teleforma/messages/answer_validated.txt | 2 +- .../teleforma/messages/seminar_validated.txt | 2 +- teleforma/views/pro.py | 26 +++++++++--------- 6 files changed, 25 insertions(+), 26 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 685cd5370545feb7a92ed83725c6d109e7bf4c79..280f0402fa2421c946f1a01ec11cde5b1e9493b9 100644 GIT binary patch delta 6346 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 delta 5567 zcmYk=30PKD9>?*cyr?N+ifDqE252g|5UwyPI-{0rVkwGiLz4?*sb1&ihC5dmGqE-d{WZS~w8Ha2PV4=N_d}pN?txG-jesyy2hVZecL(Kr?@!x~PRTLG`ylEieW{ zupcX%9i z-dWTRT|iy`8ET=ItzC{mv~Q}-{H~Hp1FRL{A83M_C;~NLEb0#0q0Wmp`=SOOfjVzA zY6r$ydn#(88P-1&wV>xv3tWbtE?iATk2?pe?hJKefwd1=`+d~TTtF?T1T|2ZS&o|U zN7T5tQ8yA4>5mtR+Nq}2j*eviwS{qZAkhvCKt4-uIBJ3vJ3bC|hf`43%|R`6F=|08 zti8^TZ^B0OzlDwQu=SruE%0I_`>#8`Y#l$~1GFnqD;>Zqp@CCS3mI#sqwZ{m9iN9< z*aFlJtwb$s9X7;Gs2$#e8s~@|Kjl%;NQb zMP@c?qBW>3-Gq9EyUap6eiAjodDMBO)-E@1q2{T>U3$8s22`}dwq`u)*(IVDHr#v| zb>SFmPeSd`V;F?ft^I^K2epv-s7JgMYvL+9zBZcu*MVF*bf>Q)pCh*mHStN*glA9# zT|f=+x%HQ!uKODG&3FU#Aq|f4uWN+bfo7=j+MpI3hnhD&hW%G1i4G0aAN86IwG$?o zQ&2lJ69YIO`MkL-)J|L| zVEtWDch(2>%!i-`PQzeKxArs)(4J-enby`k8h;ULoE6AsIWL!rKE*|-J2{Wq@++u2 zxrPgCFiC5F!ewoISDCq}g}!F(oj56ooxmjeo3{5K-AL5L6HyD#K>k$l+#D(zARBdO zYw!T(A>YC-EzW<2b1|6q60C>WsDW}&3*LgdejA2h0qXptsPo@5&!cX*6hrm?-=q>k zN1glp0m4yR7=xOitr>6qiKz4YpmuBsYNsZnCYp^}P!{S@F2(w|9`y*eqK@yuAie(w zsOZ8%)OY(kI)KHfohd=R_hqO7uAt8_a$VSw{cB2-0!1|A%zUV$g-OxA4 zx3;U@iT&4>we93DpaZJi4=3V4)B?Ao?qnb8P7AI71Zqpq+3`=U{UvH4*HJrh3-voA zxU;{IDAb3$n@2?_rl3BpW34?28_=GDnlKZ!Ba2XXvI_a@%I!q$zzNhsi>+OT4Qby* zjbAU`zkx6_!t`2E(H-22+OjUF345ake9(LZd0*XR)cJGqd0dQIc>VkR>%&lY7KPgC z9_9$tf~KJs^b9h-=N8+6m+U|uYO8mkCfbX7Bt@tN97Qd#*xDCSpOFfjfInd>PDtR} z6W_)zcnNt5t_2MqzZ-^!_5OQQzMvzyt8*i)Ykj|IF&G*joQj(s1MCbyc2U!k7m2|=c5KHL{0oI zHo_9~svQsX@E6h$HBOYZJD5Gu)3fMLMRzn5b*D4!gn6jnYD-Y(<)OBI2Wmn4Q42nV zy6!mYQJl8^53K(JY5^sv>%K*uce4lkuYoJ=KyXigq6Vmmo1#ukKuypcwY9xbe+LXQ zhoZ)L2(=Tbs2!S)+R04RPAxz^l9$a_db0nzqb+o3;GL+64xm`I^L#EhLvLCzFVFN9FHirr!VR@;#OQ0XaThO7d$Gtp+8YoF(Dp8)C(C$Ef8HzJ;sGNBsO7>Fqb&K)gyO zl7Ewqq>`u<5`C(_B6?k`%U`JI?NQm_Q}r{8pAV5p>l>@*|EM*@3bKy;i?k#vGkn}h z+(}MZ`?vT7Sz_&KUZs*?jYNEa1V{rihYTVo$W&7G`Fjzw$tUWt@-n7WH%$G5<6**g zjay3ElH+7CQCUmgBixg_k4z^okn3aw=}V@Od&vi+7SXwG6X{CUka2^RYBFo5SH7J+Jm8u%w zikN5hbNIQ{t9gP-DA`5Ek(Wqyxk+Uo*+^=WKaoGQ\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: -- 2.39.5