From 0e0f29cba6354b914c4fdd4525f688b8b3d07584 Mon Sep 17 00:00:00 2001 From: Tom Hubrecht Date: Mon, 20 Dec 2021 20:11:27 +0100 Subject: [PATCH] Ajoute un message pour indiquer que la connexion avec identifiants se fait sur la page du vote --- shared/locale/en/LC_MESSAGES/django.mo | Bin 18189 -> 18487 bytes shared/locale/en/LC_MESSAGES/django.po | 21 +++++++++++++++------ shared/templates/authens/login_switch.html | 13 +++++++++++++ shared/templates/authens/pwd_login.html | 15 ++++++++++++++- shared/templates/forms/form.html | 11 +++++------ 5 files changed, 47 insertions(+), 13 deletions(-) diff --git a/shared/locale/en/LC_MESSAGES/django.mo b/shared/locale/en/LC_MESSAGES/django.mo index 230a608d492de6058d70d927cb2d2a40d2a9ca03..12a83926c4b2cec550924d71208398cfb6a5007b 100644 GIT binary patch delta 4787 zcmZA33vg7`9mnw#mL!lT!2k*2ad{;I33>2nK!pIxqY~5xq(Up^aTB&~vLTxV5pf~f zNO`{zZFw16Q>q0+p$H{Vu!snVICMHA87*U}9mR2+Q7N_4?{Dv6hUuOB_jAtKd+#~t zf6l#|wd-OIZ-|L>bnm>?a9kq#5G`@WWX2eio2*u2Hl!I7j~lH!FopUaOvL?|i^uHu zpIN`cF0|i7o!6ACW|gh)!cp{ZS}Ewl4(m;1&?dcycY|!yz)DaZSE4fT z405VjjT-Q79EOK63IC4#nJ@X!fMPjG6HP-6d<34Ne>0XsEPijl@b&U8NI|8(H)jFR7bvSuigviQ_n+fzO|?UyohnwhGqDcZBNPZ z1~L>K+8;zsB!HUW5?rDFS5naCOSsz`X*#l;W)vzTWvG<9s1!ek8o+K_--izMcQ6+} z!(rHSsMp~{RH|oUH*`^(dJ)Fz`CmtYL7Oe87s*j%^5$dIjpFziiG`?5G?O`U{_G)VgeY7vf zF8DmEgSDv4wV>V;r|kEaQ8WJt`7>Yep@C+Su83xkOFHemd&L^H4KsKniadQ&A1)e24*K}DbCpTi?)8n);sdae?2FBN`q$pXaVbo zHK;ZE4z(1?h2B7NP&d2>wFHw1n z#-_*{c^6db3o!+!VKUA^4a`Li>}gxyg6g0ZyW=6$^=DBj{}^?D-$-v0CZaMJ8AL$? z7>Y{aBs__ws8pto@>1N>nq_rRGarH);3U+H98KfHqn?Uf)b*n=L3;+-pJpn*Od3EV zuGRD3LSZHiMf_BeC9?vb!-L2^G{s~2t;cGdg4d8gGi;nU@G8ut9>H?lfdzDU3pY{E zy_f$PupRHgLHBt}G9Q!l{5MfZ#r3F7vf(E6o1}iXx+B{dVFJ49M_FJd{ zWUy0pgKX4H#-au=6Sb6&p_ast1F;DQ;H#+nogZ+cj4h~4w4yR_5FI>^TCy9c^S?*-RK&#bOl8y13pIf8s2e?u zu{ayG`R1W!5#bXSQ68 z7l=O*w~yaas3bJ%A%y;kc$`o+bo`Rg)1$ZB`@}1Ro&v4!qlAtiv5?>$6n)wK0d=T< zGgluR4pB(#BD7Xd5JL$a4-&1!j|n|;ZxCyVv&19B8A69klt)Y6$5tpKl(|t}li7>x zKfOgG(RV#hmHCDJ@;j)itJj`j_N1P{)*|uNd zW?L@7{+jp&h=P&?BoOE<1Yl8-c+f= zQQ=`$Vv8-$!xsqkAAO$3yP09TV8Gz7w;&)NBP&b{%0((5i((_oAOsR!f=j1 zz!jVx47Yug^?6!sQNg&vg0|~U5(?fbHX7N8W*@uWrJJAE&b(zkV6Nq zf00||R4j4ayxMZ^RUK?_%AHWXTj{U%S9(1y_6Gt^1w9Ar_=pZGu*3=0MeoP>b?fNR a7B6t?9Dk$Z4>`el*H`COwIvnDr2Y@fJqY#y delta 4529 zcmYM%dvuR=0LSs~Y(q0M%zfj>Y_bbmm>HSPnp9I$O0w7(8`9>UOOH#f7DEfwOvUKt zZiJL2-&AK-`n%3olAX67W+7tn)od@Y^O*l zDX(ixGat$gwbz(}#>UjcLhB0{M13AMz@-?2<@Wdy>uIdd{&T4Fe#9cI!8SOxi7|VO zam?!!^x%x9#&p1O*c?mn9$bsQxCz5?8@9x6F#xY)N4$-#v0aG!z$9!%JsowQk;tDJ zXX_4j=lQ0Xf-c-^J%=>X{Drzf-DYmXJg5ivM~%R6PaYeu?~#F51uYO)Coi_&w^tRn!GFsG+}&YDk?H#x%lE)Oj)1p4L=UM>0_7=V3pb zZ};yW81Ny@Hf;0b3Dd$!Ih|Wd=%BO?@&|w8)^~W@i6|3u4&!gm}rbg&1n{DN+uzH zW(Gez%aoz!b{FcpgQ$jGwDnu4kqBlb>p`th_lrhd*AI1F25JOHI}~(c9%@m|vv)HBbsx|HW7yvxqp$$=z?G<>{t$z)3bmL| zp+EkDk$V4YDCh&ytg}0mNvIo*#BR6{wTP-vH$H*7!Fjv~FC*VD^DEZFe^Ddo&rQ^T zR;UNZq1M8KsJA8y19`s5R{^IXZ;n}jOru$4_kUqMfxhfNkM;2q>H*hKBXv$}x=LyK48NiPkIvLf0B6L((L_sH(qK3W#b>khVo*YLt=rVfHm+{u|ju?Txky$a> zsF5s2J!li^`hBSDzp?voqSi=*SjL|PX<}pD6Ejf_$hGz97(jg?rui7N0@dIPyxe|x z1$F#qtcy30*)%s%Q_-G}i}rU$)#GeE5euj%cV+z5^DXRHiu+J=G&s(kim|93%tPH^ zIcf@4p%&$8492~vWfgKjl!J%Q@s4;YC*q0SGy-~Et8U=!-`*c8)HQ!^CxmW)N+ zXM#QcB5I^c(a{AfDd@z__P}-wrv5qB!IP*(blQ3j)q^Xj2j4)w6@Go)5vq@xvT#(- zQ!xZ{aWc-tEUf9v_?J<5B-wqyHPjGaN3}ShpS$`)Q9X*nA=nGGXqTX-q72o6?Kl8; zqZ;Ou;$9bms)wW2Mglg#`%@VI90~*Nfejc&y%Iz5H0t%MLEYdVR8JbEx((=v8i}r` zDM`i-I27CCEYt&6p{`$xy5CN0jt3nIYWYQMi&sz&)+?cr2*Z0Z5j$Zv>U}S^u0TDY z0yU=}qo%YHHD!lvy&Co4tG0dvHNuX6nmZINP#1)w9uSSqFcH;|LH2k)>OqC*hci)A z;h;v~HS}NwYRV3v&Od`%Qx{Q-_;;iMjtP0dy-_4;l}Dpaj7Rk(6*X5+qFS7T?QjZe z#FnAXue9|8sG+}#;pm_4PFZKv6!b-1pXseL|AiDh?05-v!8-2&zFg>SF=`}!M}6sh zSz$i7oum-0=vhRYrf8D4WXvb{66r>c5`F!&tt5xMB}SL$d;d#Ub@jF`Swjwxe&l^J zjBFs9mLsG$DI{+bExuRC3bKc2n?v-Lj3T26Z>L#A))Q^3h&oC?^!>ZLJwX8d*X#ecGnGn2+@Q5mYjXhPK=usAVAq zt$uC!q{3Tb(OEyocWqfXWGxv<=8!o(7y2pA)81t$tC-VHhl+X zdrR*B\n" "Language-Team: \n" "Language: en\n" @@ -405,7 +405,7 @@ msgstr "Add a question" #: shared/templates/auth/create-user.html:32 #: shared/templates/auth/election_login.html:34 #: shared/templates/auth/permission-management.html:38 -#: shared/templates/authens/pwd_login.html:34 +#: shared/templates/authens/pwd_login.html:47 #: shared/templates/authens/pwd_reset.html:34 #: shared/templates/forms/common-form.html:25 msgid "Retour" @@ -573,7 +573,7 @@ msgstr "Vote for the question:" #: shared/templates/auth/create-user.html:23 #: shared/templates/auth/election_login.html:25 #: shared/templates/auth/permission-management.html:29 -#: shared/templates/authens/pwd_login.html:25 +#: shared/templates/authens/pwd_login.html:38 #: shared/templates/authens/pwd_reset_confirm.html:25 #: shared/templates/forms/modal-form.html:24 msgid "Enregistrer" @@ -915,11 +915,20 @@ msgstr "" msgid "Choisissez la méthode de connexion" msgstr "Choose the connection method" -#: shared/templates/authens/pwd_login.html:42 +#: shared/templates/authens/login_switch.html:47 +#: shared/templates/authens/pwd_login.html:21 +msgid "" +"La connexion par identifiants reçus par mail pour un vote particulier se " +"fera directement sur la page du vote lorsqu'il sera ouvert." +msgstr "" +"Logging in using the credentials received by e-mail for a specific vote will " +"be done directly on the voting page when it is opened." + +#: shared/templates/authens/pwd_login.html:55 msgid "Mot de passe oublié :" msgstr "Forgotten password:" -#: shared/templates/authens/pwd_login.html:48 +#: shared/templates/authens/pwd_login.html:61 msgid "Réinitialiser mon mot de passe." msgstr "Reset my password." diff --git a/shared/templates/authens/login_switch.html b/shared/templates/authens/login_switch.html index 522f067..184ce8c 100644 --- a/shared/templates/authens/login_switch.html +++ b/shared/templates/authens/login_switch.html @@ -37,4 +37,17 @@ +
+
+
+
+ + + + {% trans "La connexion par identifiants reçus par mail pour un vote particulier se fera directement sur la page du vote lorsqu'il sera ouvert." %} +
+
+
+
+ {% endblock %} diff --git a/shared/templates/authens/pwd_login.html b/shared/templates/authens/pwd_login.html index b9c22d6..2e0cc9c 100644 --- a/shared/templates/authens/pwd_login.html +++ b/shared/templates/authens/pwd_login.html @@ -11,7 +11,20 @@
-
+
+
+
+
+ + + + {% trans "La connexion par identifiants reçus par mail pour un vote particulier se fera directement sur la page du vote lorsqu'il sera ouvert." %} +
+
+
+
+ + {% csrf_token %} {% include "forms/form.html" with errors=True %} diff --git a/shared/templates/forms/form.html b/shared/templates/forms/form.html index 0ab9f16..1159714 100644 --- a/shared/templates/forms/form.html +++ b/shared/templates/forms/form.html @@ -1,11 +1,10 @@ {% if errors %} {% if form.non_field_errors %} -
-
- {% for non_field_error in form.non_field_errors %} - {{ non_field_error }} - {% endfor %} -
+
+ {% for non_field_error in form.non_field_errors %} + {{ non_field_error }} + {% if not forloop.last %}
{% endif %} + {% endfor %}
{% endif %} {% endif %}