From 4a8899f51eb23378cb04355f853a777ebac18f22 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 18 Feb 2013 22:31:41 +0100 Subject: [PATCH] fix user notif --- teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 18447 -> 17889 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 88 ++++++++++----------- teleforma/templates/postman/email_user.txt | 8 +- 3 files changed, 47 insertions(+), 49 deletions(-) diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index 3759b133519e39c2f7c19fbdb19ad758f637a171..6838c8176c4339c6cfb73af47bc594e44e73fb86 100644 GIT binary patch delta 5710 zcmZ|Td3;T09>?+L=3YVUOAtb12_d$I5<%>Ws!lbXqC#}EmT9$?)>!JAFk`8aRH~)b zL5mrUDI*5e8q`)TqN5a3x=>3ju~tLMe7^Vm?(5Zm=Dc2C@8@~WInQ>^J+xWbzVBc2 z1y5BDEOZ=^KIdYwZz<=}DNn7aR_CrpI~Rr5up|~^X$(~JERQ;01A9d{S06WX|MNAR zdy;y5P3JmrehQuIy3JSycVeV-L6=XV3Jph50~BC6yp99V)ec?g2BOYqUS&C$ zPqy|<)IhVbEaqSUms$HtR6pxN2AL5B4Y(cE;XzafCqfrE_aib>cNy6ncN5j&FR1Gx z>Uj5;!}8Q?q55fpx~>gs$J(Rr?}1uCKh+uErBU!>x?L~~D^MS8?UPXhO+$4!2epFv zsO#P|SD`xIh`R0*)DG;h`a#qx18lPM zJ5Vb;fV%Gls^bf&30=4P9Xs!jbFMP&m9Z+u#|6C`Q)ti(d!ts^&+3D*H}zqt3FV?X z-h`USHgg|pWrtDcPoXAu7PUh+P!qd@mC#?;+u`US1$ERAbwNwiMB1S`N<}@>o>uRR z8Ym6*h=!s%d5Tbflr~XD?q+AuF%>e>w5!LM!j?m@hNPAPhckUNpVN95#GQ=#&@+EIM;%PhjA)S z#9X|IiMTA@xlXtrHPNyS`O0Bc)WnieJD7?w*aNHMP}Bq`q8{0Nb1?>}uaJ!IR#Q;N zAEH*i5p}~h)QUgH&=(SQV*y5DA?o~3sQV*WmW)E(Um5i>*G4_kL^H+C_r{<)NTa}K z-DRL|cm>ry)67N@eDgS}qtmFL<3(#PHX|E*3#o|eCkFYbx;m&G>lmb< zx3WL#%k(1Z!b~iMvrq$MTYZt$m!np=8cX9k)C9JmuK&W?52F@#67>!gp!zLBEhre# z#A_&p8n_bbL^Z3&VrlAiQ5_|s-u`6N+dUYylJTes%|oNQYM@D|mA;Ca;9P5e-RcXm z8tqF^6V5~aIp}tv#yNqSKtWsfUjyExK^CKC7)bUmsDRqK7}P-ZP#re5^KDTbc0sND zanw$xTl+ZF^_i%NXIuLls7JOUnf+HGj|Of1r>Gq{f|}4d)JzMly$JOMEYr?gQ9SY& zp-V;WSO#hW&su#lW>62JCiop{A(v1Ky%9cfj|OdNREl>&byU3$Y9fiKooI#Cu>;0n z8tUyHgSu`m>SbME^+l*1T80{M9co8DM%^FWN1-N#)2JP|hni`n_FjjzQSI@lok_O# zKB$%SHwT&-sELn2?c4;^z|&Cu&M_Baw0{4~Dd>hxI2(7NR`6&CuY)JB7WH(jfs@Py zs0rnwR=yQAz;0{*(%Mg>CVCMy&UMtIx{uNN{RcXFGpvcs$i<^xmi9OlJK;cFip{YI z`4qT>RDSa~1Y2MhY608u4EE~ewKwa`W1^mpn&^6Lid!&}@!dHJn%Na>fOpNfF5b)3 z1ND*)LalHVYKLA%tz?R|Pe=7L&+3b2mtFw0EDypL* z)Y}}{)q4kOnaxq>yPzi25A|pUq52zd?K916)XJBj7PtcSNcMGQ|JA`E8e;JqyRZoL z()hZ06Dy0Fc{S9HvFOM8*51h4o1rGq8nrV$Pz&pWeoRA6WPr72bYuV3Fq#HUU>y1} z3pG#F?qF+{&Xmh(isOfV#gq1~A#$JE8{chFZX5Rv&4nWP<= zPQu5BR=AD(NEs3uUw@kw5FOu=?x7O@FvUMvS=_SncNjzdLjF$v-|;vns*`Qx%C9c^ z7iB(xI)ZL4f2N1Z{MQfuo4il_B!$!=;iIt?KEPBmFnj`=kiU|nWCMvJoyiIE9!VgV zh>o2ePXGVOy-8)ZHS{-QaVlACbupHFPa3Gg(VH|3mAo&YilePA0zU75V17io!mrv@ z{GHYPK`wfgN;Ek`ipc~rpXli6;Z~dNF@vlpNn|?-AI&MWAuo|h?ZX|38LdV zIYQngF~qGQcStAlHu;&jyk^xRqw+H2N(XWV#Fx)YjlUKdNJ>gc%4^m1e7U>{DZ~A~ Q=6T0Dp7rHrbY5HXf7PZqWB>pF delta 6231 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\n" "Language-Team: LANGUAGE \n" @@ -407,7 +407,7 @@ msgstr "formulaire" #: models/pro.py:130 templates/teleforma/answer_form.html:104 #: templates/teleforma/seminar_detail.html:158 #: templates/teleforma/testimonials.html:58 -#: templates/teleforma/inc/answer_list.html:21 +#: templates/teleforma/inc/answer_list.html:14 msgid "Seminar" msgstr "Séminaire" @@ -431,7 +431,7 @@ msgstr "status" msgid "Question" msgstr "Question" -#: models/pro.py:160 views/pro.py:340 +#: models/pro.py:160 views/pro.py:329 msgid "answer" msgstr "consultation" @@ -440,7 +440,7 @@ msgid "treated" msgstr "" #: models/pro.py:163 templates/teleforma/seminar_detail.html:50 -#: templates/teleforma/seminars.html:106 views/pro.py:341 +#: templates/teleforma/seminars.html:106 views/pro.py:330 msgid "validated" msgstr "validée" @@ -471,7 +471,7 @@ msgstr "Modèle d'attestation" #: models/pro.py:233 templates/teleforma/seminar_testimonial.html:13 #: templates/teleforma/inc/testimonial_list.html:7 -#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:625 +#: templates/teleforma/inc/testimonial_step.html:7 views/pro.py:614 msgid "Testimonial" msgstr "Attestation" @@ -515,7 +515,7 @@ msgstr "Page non trouvée" msgid "Server error" msgstr "Erreur du serveur" -#: templates/admin/base.html:21 templates/telemeta/base.html:98 +#: templates/admin/base.html:21 templates/telemeta/base.html:99 msgid "Home" msgstr "Accueil" @@ -622,11 +622,13 @@ msgid "Hello" msgstr "Bonjour" #: templates/postman/email_user.txt:3 -#, python-format +#, fuzzy, python-format msgid "" -"On %(date)s, you asked to send a message to %(recipient.first_name)s " -"%(recipient.last_name)s." +"On %(date)s, you asked to send a message to the user '%(first_name)s " +"%(last_name)s'." msgstr "" +"Le %(date)s, vous avez envoyé un message à %(sender.first_name)s " +"%(sender.last_name)s." #: templates/postman/email_user.txt:5 templates/postman/email_visitor.txt:5 msgid "Your message has been rejected by the moderator" @@ -637,10 +639,9 @@ msgid ", for the following reason:" msgstr "" #: templates/postman/email_user.txt:9 -#, python-format +#, fuzzy, python-format msgid "" -"On %(date)s, you sent a message to %(sender.first_name)s " -"%(sender.last_name)s." +"On %(date)s, you sent a message to the user '%(first_name)s %(last_name)s'." msgstr "" "Le %(date)s, vous avez envoyé un message à %(sender.first_name)s " "%(sender.last_name)s." @@ -650,18 +651,18 @@ msgid "Your correspondent has given you an answer." msgstr "Votre correspondant vous a donné une réponse." #: templates/postman/email_user.txt:11 -#, python-format +#, fuzzy, python-format msgid "" -"You have received a copy of a response from %(sender.first_name)s " -"%(sender.last_name)s." +"You have received a copy of a response from the user '%(first_name)s " +"%(last_name)s'." msgstr "" "Vous avez reçu une copie de la réponse de %(sender.first_name)s " "%(sender.last_name)s." #: templates/postman/email_user.txt:13 -#, python-format +#, fuzzy, python-format msgid "" -"You have received a message from %(sender.first_name)s %(sender.last_name)s." +"You have received a message from the user '%(first_name)s %(last_name)s'." msgstr "" "Vous avez reçu un message de %(sender.first_name)s %(sender.last_name)s." @@ -677,7 +678,7 @@ msgstr "" msgid "Thank you again for your interest in our services." msgstr "" "L’équipe e-learning de Pro-Barreau vous remercie de votre confiance et reste " -"à votre disposition pour renseignement complémentaire" +"à votre disposition pour renseignement complémentaire." #: templates/postman/email_user.txt:20 #: templates/postman/email_user_init.txt:21 @@ -866,12 +867,12 @@ msgid "General" msgstr "Général" #: templates/teleforma/answers.html:6 templates/teleforma/answers.html:62 -#: templates/telemeta/base.html:107 +#: templates/telemeta/base.html:108 msgid "Answers" msgstr "Consultations" #: templates/teleforma/answers.html:19 -#: templates/teleforma/inc/answer_list.html:41 +#: templates/teleforma/inc/answer_list.html:34 msgid " validated" msgstr " validé" @@ -881,7 +882,7 @@ msgstr " validé" #: templates/teleforma/seminar_media_audio.html:21 #: templates/teleforma/seminar_media_video.html:28 #: templates/teleforma/seminar_media_video.html:81 -#: templates/teleforma/inc/answer_list.html:41 +#: templates/teleforma/inc/answer_list.html:34 #: templates/teleforma/inc/media_list.html:52 msgid " rejected" msgstr " rejeté" @@ -973,7 +974,7 @@ msgstr "Audio" #: templates/teleforma/course_conference.html:70 #: templates/teleforma/course_media.html:130 -#: templates/teleforma/seminar_testimonial.html:38 views/pro.py:415 +#: templates/teleforma/seminar_testimonial.html:38 views/pro.py:404 msgid "Course" msgstr "Matière" @@ -1090,6 +1091,7 @@ msgid "New note" msgstr "Nouvelle note" #: templates/teleforma/courses.html:104 templates/teleforma/seminars.html:156 +#: templates/teleforma/inc/answer_list.html:17 msgid "Status" msgstr "Status" @@ -1098,8 +1100,8 @@ msgstr "Status" msgid "evaluate the seminar" msgstr "évaluer la formation suivie" -#: templates/teleforma/help.html:11 templates/telemeta/base.html:109 -#: templates/telemeta/base.html.py:127 +#: templates/teleforma/help.html:11 templates/telemeta/base.html:110 +#: templates/telemeta/base.html.py:128 msgid "Help" msgstr "Aide" @@ -1206,26 +1208,26 @@ msgid "Access" msgstr "Accéder" #: templates/teleforma/testimonials.html:7 -#: templates/teleforma/testimonials.html:45 templates/telemeta/base.html:110 +#: templates/teleforma/testimonials.html:45 templates/telemeta/base.html:111 msgid "Testimonials" msgstr "Attestations" #: templates/teleforma/testimonials.html:56 -#: templates/teleforma/inc/answer_list.html:19 +#: templates/teleforma/inc/answer_list.html:12 #: templates/telemeta/profile_detail.html:58 #: templates/telemeta/inc/user_list.html:19 msgid "Last Name" msgstr "" #: templates/teleforma/testimonials.html:57 -#: templates/teleforma/inc/answer_list.html:20 +#: templates/teleforma/inc/answer_list.html:13 #: templates/telemeta/profile_detail.html:57 #: templates/telemeta/inc/user_list.html:20 msgid "First Name" msgstr "" #: templates/teleforma/testimonials.html:59 -#: templates/teleforma/inc/answer_list.html:22 +#: templates/teleforma/inc/answer_list.html:15 msgid "Date submitted" msgstr "date de soumission" @@ -1233,14 +1235,10 @@ msgstr "date de soumission" msgid "No testimonial" msgstr "Aucune attestation" -#: templates/teleforma/inc/answer_list.html:23 +#: templates/teleforma/inc/answer_list.html:16 msgid "Summary" msgstr "" -#: templates/teleforma/inc/answer_list.html:24 -msgid "Action / status" -msgstr "" - #: templates/teleforma/inc/conference_list.html:8 msgid "Live conferences" msgstr "Conférences en direct" @@ -1431,36 +1429,36 @@ msgstr "" "L’équipe e-learning de %(organization)s vous remercie de votre confiance et " "reste à votre disposition pour renseignement complémentaire.\n" -#: templates/telemeta/base.html:96 +#: templates/telemeta/base.html:97 msgid "Desk" msgstr "Bureau" -#: templates/telemeta/base.html:103 +#: templates/telemeta/base.html:104 msgid "Contact us" msgstr "Nous contacter" -#: templates/telemeta/base.html:106 templates/telemeta/users.html:6 +#: templates/telemeta/base.html:107 templates/telemeta/users.html:6 #: templates/telemeta/users.html.py:43 msgid "Users" msgstr "" -#: templates/telemeta/base.html:115 +#: templates/telemeta/base.html:116 msgid "Admin" msgstr "" -#: templates/telemeta/base.html:125 +#: templates/telemeta/base.html:126 msgid "Profile" msgstr "Profil" -#: templates/telemeta/base.html:129 +#: templates/telemeta/base.html:130 msgid "Sign out" msgstr "" -#: templates/telemeta/base.html:177 +#: templates/telemeta/base.html:178 msgid "Powered by" msgstr "" -#: templates/telemeta/base.html:187 +#: templates/telemeta/base.html:188 msgid "Legal notices" msgstr "" @@ -1734,19 +1732,19 @@ msgstr "" "Votre consultation n'a pas été enregistrée correctement, veuillez réessayer " "SVP." -#: views/pro.py:336 +#: views/pro.py:325 msgid "all your answers has been validated" msgstr "toutes vos consultations ont été validées" -#: views/pro.py:390 +#: views/pro.py:379 msgid "validation conditions for an answer" msgstr "conditions de validation d'une consultation" -#: views/pro.py:413 +#: views/pro.py:402 msgid "Subtitle" msgstr "Sous-titre" -#: views/pro.py:504 +#: views/pro.py:493 msgid "You have successfully submitted your evaluation" msgstr "Vous avez soumis votre évaluation avec succès" diff --git a/teleforma/templates/postman/email_user.txt b/teleforma/templates/postman/email_user.txt index e1df3a11..3ff6c7f1 100644 --- a/teleforma/templates/postman/email_user.txt +++ b/teleforma/templates/postman/email_user.txt @@ -1,16 +1,16 @@ {% load i18n %}{% load telemeta_utils %}{% load teleforma_tags %}{% autoescape off %}{% trans "Hello" %} {{ usr.first_name }} {{ usr.last_name }}, {% if action == 'rejection' %} -{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.recipient as recipient %}On {{ date }}, you asked to send a message to {{ recipient.first_name }} {{ recipient.last_name }}.{% endblocktrans %} +{% blocktrans with object.sent_at|date:"DATETIME_FORMAT" as date and object.recipient.first_name as first_name and object.recipient.last_name as last_name %}On {{ date }}, you asked to send a message to the user '{{ first_name }} {{ last_name }}'.{% endblocktrans %} {% trans "Your message has been rejected by the moderator" %}{% if object.moderation_reason %}{% trans ", for the following reason:" %} {{ object.moderation_reason }}{% else %}.{% endif %} {% else %}{# 'acceptance' #} -{% if object.parent_id %}{% if object.parent.sender_id == object.recipient_id %}{% blocktrans with object.parent.sent_at|date:"DATETIME_FORMAT" as date and object.sender as sender %}On {{ date }}, you sent a message to {{ sender.first_name }} {{ sender.last_name }}.{% endblocktrans %} +{% if object.parent_id %}{% if object.parent.sender_id == object.recipient_id %}{% blocktrans with object.parent.sent_at|date:"DATETIME_FORMAT" as date and object.sender.first_name as first_name and object.recipient.last_name as last_name %}On {{ date }}, you sent a message to the user '{{ first_name }} {{ last_name }}'.{% endblocktrans %} {% trans "Your correspondent has given you an answer." %} -{% else %}{% blocktrans with object.sender as sender %}You have received a copy of a response from {{ sender.first_name }} {{ sender.last_name }}.{% endblocktrans %} +{% else %}{% blocktrans with object.sender.first_name as first_name and object.recipient.last_name as last_name %}You have received a copy of a response from the user '{{ first_name }} {{ last_name }}'.{% endblocktrans %} {% endif %} -{% else %}{% blocktrans with object.sender as sender %}You have received a message from {{ sender.first_name }} {{ sender.last_name }}.{% endblocktrans %} +{% else %}{% blocktrans with object.sender.first_name as first_name and object.recipient.last_name as last_name %}You have received a message from the user '{{ first_name }} {{ last_name }}'.{% endblocktrans %} {% endif %}{% endif %}{% trans "You can read and respond to this message from your e-learning desk following this link:" %} http://{{ site.name }}/messages/inbox/ -- 2.39.5