From 8477d1d3bd27406257f7d1834ed69216440c56bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Thu, 16 Apr 2015 16:40:24 +0200 Subject: [PATCH] =?utf8?q?Inscription=20avec=20validation=20de=20l'email?= =?utf8?q?=20et=20email=20en=20tant=20que=20login=20op=C3=A9rationnelle.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Products/Plinn/RegistrationTool.py | 11 +- .../Plinn/locales/en/LC_MESSAGES/plinn.mo | Bin 51286 -> 50572 bytes .../Plinn/locales/en/LC_MESSAGES/plinn.po | 159 ++++++++++++------ .../Plinn/locales/fr/LC_MESSAGES/plinn.mo | Bin 55074 -> 54365 bytes .../Plinn/locales/fr/LC_MESSAGES/plinn.po | 151 +++++++++++------ Products/Plinn/locales/plinn.pot | 92 ++++++---- .../Plinn/skins/custom_generic/join_form.py | 42 ++--- .../skins/custom_generic/join_template.pt | 6 +- .../skins/generic/password_reset_form.py | 3 +- .../skins/generic/password_reset_mail.py | 26 ++- 10 files changed, 308 insertions(+), 182 deletions(-) diff --git a/Products/Plinn/RegistrationTool.py b/Products/Plinn/RegistrationTool.py index 3cd5e4d..3451d37 100644 --- a/Products/Plinn/RegistrationTool.py +++ b/Products/Plinn/RegistrationTool.py @@ -233,7 +233,7 @@ class RegistrationTool(BaseRegistrationTool) : return str(uuid4()) security.declarePublic('requestPasswordReset') - def requestPasswordReset(self, userid, initialize=False): + def requestPasswordReset(self, userid, initial=False): """ add uuid / (userid, expiration) pair if ok: send an email to member. returns error message otherwise. """ @@ -263,12 +263,15 @@ class RegistrationTool(BaseRegistrationTool) : mailhost = portal.MailHost sender = encodeQuopriEmail(ptool.getProperty('email_from_name'), ptool.getProperty('email_from_address')) to = encodeQuopriEmail(member.getMemberFullName(nameBefore=0), member.getProperty('email')) - if initialize : - subject = translate(_('How to initialize your password on the %s website')) % ptool.getProperty('title') + if initial : + subject = translate(_('Complete your registration on the %s website')) % ptool.getProperty('title') else : subject = translate(_('How to reset your password on the %s website')) % ptool.getProperty('title') subject = encodeMailHeader(subject) - options = {'fullName' : member.getMemberFullName(nameBefore=0), + options = {'initial' : initial, + 'fullName' : member.getMemberFullName(nameBefore=0), + 'member_id' : member.getId(), + 'loginIsNotEmail' : member.getId() != member.getProperty('email'), 'siteName' : ptool.getProperty('title'), 'resetPasswordUrl' : '%s/password_reset_form/%s' % (utool(), uuid)} body = self.password_reset_mail(options) diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo index 4279cc3ab45a2f3b9b2db33b260dfa25b588f229..d79bd63e53542739d7194f939f5f22d2905207d3 100644 GIT binary patch delta 14182 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 Bv^M|% delta 14448 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 S*#WsZM>_iFzW>g<`ThfM#vwHT diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po index 60e2dc4..6a1d966 100644 --- a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po +++ b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0 beta 1\n" -"POT-Creation-Date: Wed Apr 15 17:38:57 2015\n" +"POT-Creation-Date: Thu Apr 16 16:35:11 2015\n" "PO-Revision-Date: 2015-04-15 17:00+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" @@ -32,27 +32,31 @@ msgstr "Object deleted" msgid "Please rename each listed object." msgstr "Please rename each listed object." -#: n/RegistrationTool.py:254 +#: n/RegistrationTool.py:267 +msgid "Complete your registration on the %s website" +msgstr "Complete your registration on the %s website" + +#: n/RegistrationTool.py:269 msgid "How to reset your password on the %s website" msgstr "How to reset your password on the %s website" -#: n/RegistrationTool.py:269 +#: n/RegistrationTool.py:287 msgid "Unknown user name. Please retry." msgstr "Unknown user name. Please retry." -#: n/RegistrationTool.py:284 +#: n/RegistrationTool.py:302 msgid "Invalid reset password request." msgstr "Invalid reset password request." -#: n/RegistrationTool.py:290 +#: n/RegistrationTool.py:308 msgid "Your reset password request has expired. You can ask a new one." msgstr "Your reset password request has expired. You can ask a new one." -#: n/RegistrationTool.py:299 +#: n/RegistrationTool.py:317 msgid "Password successfully updated." msgstr "Password successfully updated." -#: n/RegistrationTool.py:301 +#: n/RegistrationTool.py:319 msgid "\"%s\" username not found." msgstr "\"%s\" username not found." @@ -592,7 +596,11 @@ msgstr "No news is no news." msgid "More..." msgstr "More..." -#: n/skins/custom_generic/join_form.py:60 +#: n/skins/custom_generic/join_form.py:41 +msgid "Success!" +msgstr "Success!" + +#: n/skins/custom_generic/join_form.py:67 #: n/skins/photo_theme/photo_main_macros.pt:28 msgid "Join" msgstr "Join" @@ -619,11 +627,11 @@ msgstr "You have been registered as a member." #: n/skins/custom_generic/join_template.pt:24 msgid "" -"You will receive an email shortly containing your password and instructions " -"on how to activate your membership." +"You will receive an email shortly. Please follow sent instructions to " +"complete your registration." msgstr "" -"You will receive an email shortly containing your password and instructions " -"on how to activate your membership." +"You will receive an email shortly. Please follow sent instructions to " +"complete your registration." #: n/skins/custom_generic/join_template.pt:29 msgid "Click the button to log in immediately." @@ -655,57 +663,35 @@ msgstr "" msgid "Return to homepage" msgstr "Return to homepage" -#: n/skins/custom_generic/join_template.pt:56 -msgid "" -"Becoming a member gives you the ability to personalize the site and " -"participate in the community." -msgstr "" -"Becoming a member gives you the ability to personalize the site and " -"participate in the community." - -#: n/skins/custom_generic/join_template.pt:60 -msgid "" -"It does not cost any money to become a member and your email and other " -"personal information will remain private." -msgstr "" -"It does not cost any money to become a member and your email and other " -"personal information will remain private." - -#: n/skins/custom_generic/join_template.pt:64 -msgid "" -"You must submit a valid email address. This address will be used to send you " -"a randomly-generated password. Once you have logged in with this password, " -"you may change it to anything you like." -msgstr "" -"You must submit a valid email address. This address will be used to send you " -"a randomly-generated password. Once you have logged in with this password, " -"you may change it to anything you like." - -#: n/skins/custom_generic/join_template.pt:76 +#: n/skins/custom_generic/join_template.pt:61 msgid "First name" msgstr "First name" -#: n/skins/custom_generic/join_template.pt:81 +#: n/skins/custom_generic/join_template.pt:66 msgid "Last name" msgstr "Last name" -#: n/skins/custom_generic/join_template.pt:88 +#: n/skins/custom_generic/join_template.pt:73 #: n/skins/custom_generic/personalize_form.pt:39 #: n/skins/generic/gruf_macros.pt:280 n/skins/generic/gruf_macros.pt:402 msgid "Email address" msgstr "Email address" -#: n/skins/custom_generic/join_template.pt:94 +#: n/skins/custom_generic/join_template.pt:79 msgid "use as login" msgstr "use as login" -#: n/skins/custom_generic/join_template.pt:101 +#: n/skins/custom_generic/join_template.pt:85 +msgid "login" +msgstr "login" + +#: n/skins/custom_generic/join_template.pt:93 #: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268 #: n/skins/generic/gruf_macros.pt:390 msgid "Password" msgstr "Password" -#: n/skins/custom_generic/join_template.pt:107 +#: n/skins/custom_generic/join_template.pt:99 msgid "Password (confirm)" msgstr "Password (confirm)" @@ -799,7 +785,7 @@ msgid "Remember my name." msgstr "Remember my name." #: n/skins/custom_generic/login_form.pt:43 -#: n/skins/generic/password_reset_form.py:26 +#: n/skins/generic/password_reset_form.py:25 msgid " Login " msgstr " Login " @@ -1564,19 +1550,19 @@ msgstr "Paste" msgid "Exit boxes editing" msgstr "Exit boxes editing" -#: n/skins/generic/password_reset_form.py:30 +#: n/skins/generic/password_reset_form.py:29 msgid "Update Password" msgstr "Update Password" -#: n/skins/generic/password_reset_mail.py:4 +#: n/skins/generic/password_reset_mail.py:5 msgid "Hi %(fullName)s," msgstr "Hi %(fullName)s," -#: n/skins/generic/password_reset_mail.py:6 +#: n/skins/generic/password_reset_mail.py:8 msgid "You recently asked to reset your password." msgstr "You recently asked to reset your password." -#: n/skins/generic/password_reset_mail.py:8 +#: n/skins/generic/password_reset_mail.py:10 msgid "" "To get back into your account on the %(siteName)s website, you'll need to " "create a new password." @@ -1584,18 +1570,40 @@ msgstr "" "To get back into your account on the %(siteName)s website, you'll need to " "create a new password." -#: n/skins/generic/password_reset_mail.py:9 +#: n/skins/generic/password_reset_mail.py:11 +#: n/skins/generic/password_reset_mail.py:18 msgid "It's easy:" msgstr "It's easy:" -#: n/skins/generic/password_reset_mail.py:10 +#: n/skins/generic/password_reset_mail.py:12 +#: n/skins/generic/password_reset_mail.py:19 msgid "Click the link below to open a browser window." msgstr "Click the link below to open a browser window." -#: n/skins/generic/password_reset_mail.py:11 +#: n/skins/generic/password_reset_mail.py:13 msgid "Fill the form with your new password." msgstr "Fill the form with your new password." +#: n/skins/generic/password_reset_mail.py:16 +msgid "You just sign up on the %(siteName)s website." +msgstr "You just sign up on the %(siteName)s website." + +#: n/skins/generic/password_reset_mail.py:17 +msgid "Now you have to create your password to complete your registration." +msgstr "Now you have to create your password to complete your registration." + +#: n/skins/generic/password_reset_mail.py:20 +msgid "Choose a password and enter it in the form." +msgstr "Choose a password and enter it in the form." + +#: n/skins/generic/password_reset_mail.py:25 +msgid "Please note:" +msgstr "Please note:" + +#: n/skins/generic/password_reset_mail.py:26 +msgid "Your personal login to sign in later is:" +msgstr "Your personal login to sign in later is:" + #: n/skins/generic/password_reset_template.pt:16 msgid "Password resetting" msgstr "Password resetting" @@ -2533,7 +2541,9 @@ msgid "Member properties" msgstr "Member properties" msgid "member_creation_area_explanations" -msgstr "This function determines if a personal folder will be created at the first user entrance." +msgstr "" +"This function determines if a personal folder will be created at the first " +"user entrance." msgid "member_creation_area_title" msgstr "Creation of member areas" @@ -2542,7 +2552,9 @@ msgid "Membership role mappings" msgstr "Membership role mappings" msgid "membership_role_mapping_explanations" -msgstr "Use this screen if you are using a userfolder other than the built-in folder to map existing role names to roles understood by the CMF." +msgstr "" +"Use this screen if you are using a userfolder other than the built-in folder " +"to map existing role names to roles understood by the CMF." msgid "Metadata" msgstr "Metadata" @@ -2929,6 +2941,45 @@ msgstr "Directory" msgid "Configure portal" msgstr "Configure portal" +#~ msgid "Your personal login to log in later is:" +#~ msgstr "Your personal login to log in later is:" + +#~ msgid "%(member_id)s" +#~ msgstr "%(member_id)s" + +#~ msgid "How to initialize your password on the %s website" +#~ msgstr "How to initialize your password on the %s website" + +#~ msgid "" +#~ "You will receive an email shortly containing your password and " +#~ "instructions on how to activate your membership." +#~ msgstr "" +#~ "You will receive an email shortly containing your password and " +#~ "instructions on how to activate your membership." + +#~ msgid "" +#~ "Becoming a member gives you the ability to personalize the site and " +#~ "participate in the community." +#~ msgstr "" +#~ "Becoming a member gives you the ability to personalize the site and " +#~ "participate in the community." + +#~ msgid "" +#~ "It does not cost any money to become a member and your email and other " +#~ "personal information will remain private." +#~ msgstr "" +#~ "It does not cost any money to become a member and your email and other " +#~ "personal information will remain private." + +#~ msgid "" +#~ "You must submit a valid email address. This address will be used to send " +#~ "you a randomly-generated password. Once you have logged in with this " +#~ "password, you may change it to anything you like." +#~ msgstr "" +#~ "You must submit a valid email address. This address will be used to send " +#~ "you a randomly-generated password. Once you have logged in with this " +#~ "password, you may change it to anything you like." + #~ msgid "" #~ "You are already a member. You may use the personalization form to change your membership information." diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo index 0942bc6edb2e25a3f9aecf383c98381cca5063ac..065fa1890f0a07df38fbd26d368f2a020f118ab8 100644 GIT binary patch delta 14206 zcmZ|V33QEDzsK<>AtH#7L<~VrOi754L_!o5^E^{?MH~_`kjd<5ky4a66g5+GYiJZT zwUoA~v8@)>R$HC4Rc%du^>x3$^X#tGd)K;W-QCZgo<02ce$Gkz-i^CT+}KuP&uiW; zKg+TzwzaI17>cFPfn_iPy)n+zCtx7u7FZU0n))FaKzStkV~#1$#9+#cu`_N)je7@c z;9qSmmz6}ON;@XQJ{W^jFa)<_ReT4l<2BTRAD|C^osXJexhZc!h4c;7j*g(t@O`X}x3DGpb+UKf5w)Ox z7>9#U3s_+4U%`sZZ>=*8dr@cpHfrK4=!3UR`)%VRQ}4@-QV9J~m$DT`VsGOVR0KAm z?$}oR1aG45)PXKsc;>e*k zMcsi(=!tz(?0)sIEag~K|CXqU zx}%=!k0)>{4#QU6?YpuXweZ8}iXwA@OeOpo{n5LJ9l8prj=`vjLs3T(kJ?ERMq^vl z!pCEIoNCH1B4=zZLmll_EQiNXF@`#S-xTH9d$#!HvLc&IZgd| zROBY17BU?bksX+h`!N6=z3eZt#;E7xaR9dJMf?|#Sw=-6*6M9p-Ecb&#QUfLd-kz+ zHUvW{k45dE5Ub%rRKIP;eW;zjgMoMs6^XA*{qLsy#6?E$bH%>)%3@JR&;k{aE?6G> zq0TlHHSjp}?A$mV)&F@@USP^axPy#V(Xx%}vD|)Wk1gAg)G*YBwr` zhfsIm465JPru{e6#Q!n+^tbOw0P6WlsQwPrf@4q{ibo>mvf7Z*ggsCpO~D{cvpZPR zP_N5e(_VzSgey=3uQk4g+TkHogpQ()>WuL_Y(&|cgV%F$SWfSMYcj!9bjJ`JX`GDO z@nTfyx1lE9gWB1CQ-2)wMROXp&~v8#3Ti`Npf-35E8s)aUGRH`arOR(l2Ju%)PxDB z_q{vnH(?BF#WPV8yo6fNa^pHvzZEs%9@K&knDSxN!cU-{`v7%h7t!815lS~Flu4LPz%XLU8?D*BUy=x&{ouhucH>SAGMIvsJG`DYQmpP`yS0I}nT7SzFZ4YbR`sqcI$pqeA!=#^G($0&5PnCvJiYbw^a_`2YmU9vOQH>SfqRLCBq9xON9E>}gBqfnttL`~2h+hY$*#igjoJVf3!tHHCD z)f}J4+ISQdv76|t_x}MI?c@pS>_SG^XB>q($0u_N*Q4!jS zx&y_iqd1A`_c`h^{(z;K-};%1&io!$#lKKH3{J5Jtc@zyM-7mKT5x;R0*7K0jzyj6 zQcS{a7>!?JfEQ_`Jx>^6(sOmtr8AEsqubpQHBm>@L<3CyNYsQGxC&>XZhhD&`8umt%Lzmr)No z()lvN5m*xs<1M^~$@tD#e#p>!9OsH{F$&X=CTj_51An7J@0DRkz*Uiq4;9r=p>bd- zj6^M{5stuIMfXr)o?L#R4!{L8NEh_unK;N zI)YmmioRL)M72>1j6n5kgc`6D>TE}#&U^xDK?SIVPBZm0QS;0}2QEiHz5fTvcvEo# zwenM_2z-KN@pIJ9en3rd54C{5OnXqa9m+6cBx;ATsQ%qh&-X?xbU5nHWTWTze;yf~ zQ4wmw$EcN;9&ca5a;SkqP&)`k-QI>c028q*E<`Q-DhA+JsONq|KfH%rC+i9NW7-7b zKa)%WnOJ;)VHlOe4+M5bl|MnP_#Q69fL!}lZ^k0ZXE6zf<#E$-Io8MO`Mhe_5m(}N z?160yxahc~fcQJfd`CqhcALnbPdE!_V(&@z?Z1qQNZ@39=OI|0au{l7F&K!=Fa*1z zj&vmIIVUPI=~xNJqxu(4=KS?Kt)!wV9>nT+8P)L)2BFUs`&X+fs=fv4^7S$0v8cZx zXQKKq!)mx4wV;!z39qB(`4y{SY1dTya@0nhX=77PLJio#l!ssi%4w*xos2red8i01 zNA=%;TEKo&K7)E2zC=af7V3`ujCw6y4^2ghX?8;ZYT!^*h@(&oYlfOQ88u*UQ~wO= zwH#qgL*4fASO=%0UgwRd9iKGyUn0-Btdi61TUrh^a7C<$l~HFHg<5&EDaRWVQ6Wu2 zEub4}f&EaC7=?=1WYhj4YC}s*c>{*&{ohVTAv|sT2sQ8x)Ixqky#?Mg?DxJFMo@kV z8(}Icly1}p)?y8O6&1-7SQ9Uz=T4#Sgb#CM zrWq%qZfzmz2$rKlx&uS;m}$Reyp7GNe~cZl>0Eol8K~zAQAfJcco6mee~MbD>l-pY zWPZUC_y_7NA7E3AnrDYB1@%A%s(*oT8gkdH=TQ-vjS;vM58@Hj2J>IEBQhKH{CxCf zeyfO#&Uhti0lVx5>kZV7520S8E2jQi)I>j{LjD+aH0All(icoUT!hJ}onAsM=mxe$ zp9S`hRcGv=_kR|dS~Q%&DEtMZvGPKD;&xbyav$`=LB>=pM>!LVFG$XMR_i`K{oW?45+828u`RunlU$K1isnp{9Nm>Q?8W2AqukScqD{Qq+Ri zpvHL>lW?D@{}roKzK1S#3?yC(WmVLK4U7qxK>2A5z;Q4P&dJ86U3Sy!xwgRn8q#6h?hweYe<_T8z0 znjjoCVSCg#!_k3bP(QzOQAfV9i1_PlPEnyqT*vbGHCDvCsM}g%317?Thq`3FQEx{E zHp5p@m-hzho9-rt^IACE_JZ0hwSNsqqv!UcB3I-hQ-;hI)JpfF&iat?1nT`ggNoFT zsD<4#`YyANrYb5@QK$$uMU9h;8n-iQ;y$K+pwTsgj9#BK)FqjTI^#pAx8O6>Kt3}fwN`i{;IdkiQRw=k1{{R?#v6&c zWCf_5PsI-S0%}3$u>xMfD)>F>`$B(d>JC)L0Bnuw-wPvfAS&WBv4Y97&?1@tCrAt#NeQ9C`4iog})HPlYNK<)T@)PjCRE%Y&J z;Q^cM=j&lr$}t#$u1;iXk{OQ*=_1sFTTufYLQjZ|7f};_X1s|dDF1|t)UT+8|A~6; z5h{{iui85(O$RJciGEDtc)a_r4x|FL?6K%y%+>N>e zXYnb#j%~2=X4}CSPI-+-&i`#Px@r{oNjlK9u_!2VpYhXHl1FgRvMDkyEIR zoJTF}GFHPIs0BSlEwuDjyI%$L{QVzHMhy4n;HHtI;Gn)Z3dmr)Vh zg!(2th}z*L;~!X$a;0td9ch8;-xgiIWCoIn!V%aSU&I(Zi%;WUs1P>aZf-3q0!65Z zZNf0zhq`PZoBG?R@gJj(rsNK@QPlI1J2-zoGR>*b4%?x2-V1BvFw_9gVO^YuM{u{P z&)8{)HV;cvKO4*7Lez6Bunw+AO?V1*`#&}9cXx9BTG=Bi^gdR4&3+4_jLE3_L0Aqm zQ4yJfeee)!0{_?TuhuvmLOC6y@DysoJE#Tu?Xovg5jAg9m#OHBnqV?&!a}TtuV7g` zirU#})J{IeQurNe=f9xdmiwrI{dU{q)kR&(I8^^c)OaniKDs)SsZJ&jH9-;T60SxK zcmQ>&&Y;fv8`L-3pV$E7_Siqm!?7{t&3FT^pmw}(uf5d3#ql6wDtAmiBq zYUlS+x4z69{8VBTs{J(T7GK5+_y`sHGR5{n8(~GtZBRSyXB=YcN1`UqGxamDD)U=& z$OO@_4)wcUj9Tf>sEHn<7T~|n9ykQ`y-))cvD&6S1{LZA)LW2*>emYui2p#PxW0_z?7?gXNPVyG#%z$uj5qsDi=Lq;qA5Oow6Q3GGaN_Z0$ z+6Sn!FL~VlZ#q3uw|NDseIx3*-Kd2eK;4BSs0AgQu&nji5nJF7SYPjd-FNvrj*4Cw zhh8V`9W}wdl>4AUSn?GA`30L`7Jh_oZ1bM|@AX$OpK`VL`Tobn*c)qpVBh-jIG^&@ z*aWjqb4+^wH<4LJh3ky{KgCo!YyWLG8MVV{sL&Uh`lYC&T8<&O0~NvJ=!2(FJ3Nbe zzVwH7L;_KFs4|wtXbfO}s~H(R*vZ%f!zuSeg{}Z~6mv~^E$WW!K@D^qwZL_2YD0rB5`UdxifNdH+R-%B19OaXQAaW#6@k}L z3qOd}@gnMX{uk81zL)F}mq$gU3NAp0DZh>tD8K1474I3(V+svdP+t(uF59>N8H}O) z0&2(mQ42kZPCSP?)A*0m-M{Oh|g@Cjc-$ThLldZuW3{Ja{YtPa8izY zLc>O`AbLGTX(;Mj<#o~@l z-I&U*C~EatZ+vVQt)8Z=>sO0(f~WM+ZPCl9Pkqxz`5f{)>64AqNM%i1AZ-mvy(w2A z9VBt7JpU6$m@e5!(@`&8ck+Ldo{-0j0rO~J_ zfxYDQnNM30DbJLr+0~x^_~Y$mxmPvztML+T+f4g5`uxw{;6C0s$bUFFeV(OP zhWlpYAXh(1yUa5y$seW1%amU>J)bi^GTz6L^qXMHZE*wTOV}E3p}rFW86%XuKEdSm zIfcJd=ZmZGfHwy+#WYT&B7pQA=?Kd5({l?jN&hBdYn7XMr&YK^uF=X^*n{OH_x?9GD`Yfb0 z)IBUN%+-cm8wNgr<#3kicaVGp&kexoq^_p^w3+BAb^7FDGIqx;o*MrDv#`MAKjyh6 zw3WdmQ#Y3K2=YbVp8tr+A7C`jq2fzY0(pNrG$Vh3d=K&iFoM*Ix)zl4$iIh;DK{nm zl{-1Uvd=Yg6gcK_&$zzFN|*xUWe8fsL^LJwZBoGk3ZvPQmXrE ze5fm#++dPE{GM1b^vE>jR^-Q0cT0_Yu2BDgG@0Zyee4$g#e>Xq^sh$RL)&`FvH$9` zoBCCx5c9xNyRDw*Ka*ahvVcZ?>e4WXd=>I@$n&FU6}wk93H2J{ezQrKe>LiAn7(hi zZ#D^Xji#oz9yOn7wC<&D4pu__R;5cm|0Tte!c94Wy#6g@8%dvKJhR=5ew{w0$yYb! zxkfkjhskfk7ri`xA=?k1rs7%BKcCOk;hzG2P1zq?;8pBN+Dtl2Ifm51eKetRrPs+t zQ~LqwCiz6B8s`2nA+*L-O2H)k5pa_fPI}QSYPmZ+G049pt^a&}btfl=H9SI1Px>68 z`ZoCxlE3NI4O^2kXm5wlyB8)_c8wsHPVbI*5Cido8T4uLb;h$T1nbglSZIiLH$$NWy{tE?v|In!sombK@gS>nRY)+GW84G=bBdbKWAF5(`%{w zZqp#w5^5e&iZ?A?>HjYI_PCCeZ=R=%=QD}6zf8W6wq@iel4?+Y3{yy*NMBNJjx$NA znOJpG=R`%F?buZHeh zNnx%*G#p?EKN@S3*T+ddjC^~$X#I|_P)?x!9nN(&u>-aw?Id3U^?4fKqPzk(lY*&xmvouBzexe= z#2>apo~q>4w|K%+8-0uO+t%`q${e5J%yT*>XXocQa-3t*bMtai^3t=j9QtjLy!;$e!rP zb!O!`(z6&UKUHJpI`Xm|soDSERKfq}IhpBM&KyTUc3zHC^Q7jakN2!OmrZ0i9jsOhFCMyR zZ-wGn>wAWj>6@RL`tG*e6YIl^FYONrbgw<#w_ARe!`U!1B|XEDo1O0%@63;J3~=VB zXJk01ICAsT3m7}Ynft%@;mj(?p8W21s#8X%XE{bW9eJMBZ0dT(w`}?-_MJXDJtZrz KxXY!_eEtX4w&Vc- delta 14585 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 form to change your membership information." diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot index 2b0facd..23989b6 100644 --- a/Products/Plinn/locales/plinn.pot +++ b/Products/Plinn/locales/plinn.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0 beta 1\n" -"POT-Creation-Date: Wed Apr 15 17:38:57 2015\n" +"POT-Creation-Date: Thu Apr 16 16:35:11 2015\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" @@ -31,27 +31,31 @@ msgstr "" msgid "Please rename each listed object." msgstr "" -#: n/RegistrationTool.py:254 -msgid "How to reset your password on the %s website" +#: n/RegistrationTool.py:267 +msgid "Complete your registration on the %s website" msgstr "" #: n/RegistrationTool.py:269 +msgid "How to reset your password on the %s website" +msgstr "" + +#: n/RegistrationTool.py:287 msgid "Unknown user name. Please retry." msgstr "" -#: n/RegistrationTool.py:284 +#: n/RegistrationTool.py:302 msgid "Invalid reset password request." msgstr "" -#: n/RegistrationTool.py:290 +#: n/RegistrationTool.py:308 msgid "Your reset password request has expired. You can ask a new one." msgstr "" -#: n/RegistrationTool.py:299 +#: n/RegistrationTool.py:317 msgid "Password successfully updated." msgstr "" -#: n/RegistrationTool.py:301 +#: n/RegistrationTool.py:319 msgid "\"%s\" username not found." msgstr "" @@ -592,7 +596,11 @@ msgstr "" msgid "More..." msgstr "" -#: n/skins/custom_generic/join_form.py:60 +#: n/skins/custom_generic/join_form.py:41 +msgid "Success!" +msgstr "" + +#: n/skins/custom_generic/join_form.py:67 #: n/skins/photo_theme/photo_main_macros.pt:28 msgid "Join" msgstr "" @@ -614,7 +622,7 @@ msgid "You have been registered as a member." msgstr "" #: n/skins/custom_generic/join_template.pt:24 -msgid "You will receive an email shortly containing your password and instructions on how to activate your membership." +msgid "You will receive an email shortly. Please follow sent instructions to complete your registration." msgstr "" #: n/skins/custom_generic/join_template.pt:29 @@ -637,45 +645,37 @@ msgstr "" msgid "Return to homepage" msgstr "" -#: n/skins/custom_generic/join_template.pt:56 -msgid "Becoming a member gives you the ability to personalize the site and participate in the community." -msgstr "" - -#: n/skins/custom_generic/join_template.pt:60 -msgid "It does not cost any money to become a member and your email and other personal information will remain private." -msgstr "" - -#: n/skins/custom_generic/join_template.pt:64 -msgid "You must submit a valid email address. This address will be used to send you a randomly-generated password. Once you have logged in with this password, you may change it to anything you like." -msgstr "" - -#: n/skins/custom_generic/join_template.pt:76 +#: n/skins/custom_generic/join_template.pt:61 msgid "First name" msgstr "" -#: n/skins/custom_generic/join_template.pt:81 +#: n/skins/custom_generic/join_template.pt:66 msgid "Last name" msgstr "" -#: n/skins/custom_generic/join_template.pt:88 +#: n/skins/custom_generic/join_template.pt:73 #: n/skins/custom_generic/personalize_form.pt:39 #: n/skins/generic/gruf_macros.pt:280 #: n/skins/generic/gruf_macros.pt:402 msgid "Email address" msgstr "" -#: n/skins/custom_generic/join_template.pt:94 +#: n/skins/custom_generic/join_template.pt:79 msgid "use as login" msgstr "" -#: n/skins/custom_generic/join_template.pt:101 +#: n/skins/custom_generic/join_template.pt:85 +msgid "login" +msgstr "" + +#: n/skins/custom_generic/join_template.pt:93 #: n/skins/custom_generic/login_form.pt:28 #: n/skins/generic/gruf_macros.pt:268 #: n/skins/generic/gruf_macros.pt:390 msgid "Password" msgstr "" -#: n/skins/custom_generic/join_template.pt:107 +#: n/skins/custom_generic/join_template.pt:99 msgid "Password (confirm)" msgstr "" @@ -753,7 +753,7 @@ msgid "Remember my name." msgstr "" #: n/skins/custom_generic/login_form.pt:43 -#: n/skins/generic/password_reset_form.py:26 +#: n/skins/generic/password_reset_form.py:25 msgid " Login " msgstr "" @@ -1463,34 +1463,56 @@ msgstr "" msgid "Exit boxes editing" msgstr "" -#: n/skins/generic/password_reset_form.py:30 +#: n/skins/generic/password_reset_form.py:29 msgid "Update Password" msgstr "" -#: n/skins/generic/password_reset_mail.py:4 +#: n/skins/generic/password_reset_mail.py:5 msgid "Hi %(fullName)s," msgstr "" -#: n/skins/generic/password_reset_mail.py:6 +#: n/skins/generic/password_reset_mail.py:8 msgid "You recently asked to reset your password." msgstr "" -#: n/skins/generic/password_reset_mail.py:8 +#: n/skins/generic/password_reset_mail.py:10 msgid "To get back into your account on the %(siteName)s website, you'll need to create a new password." msgstr "" -#: n/skins/generic/password_reset_mail.py:9 +#: n/skins/generic/password_reset_mail.py:11 +#: n/skins/generic/password_reset_mail.py:18 msgid "It's easy:" msgstr "" -#: n/skins/generic/password_reset_mail.py:10 +#: n/skins/generic/password_reset_mail.py:12 +#: n/skins/generic/password_reset_mail.py:19 msgid "Click the link below to open a browser window." msgstr "" -#: n/skins/generic/password_reset_mail.py:11 +#: n/skins/generic/password_reset_mail.py:13 msgid "Fill the form with your new password." msgstr "" +#: n/skins/generic/password_reset_mail.py:16 +msgid "You just sign up on the %(siteName)s website." +msgstr "" + +#: n/skins/generic/password_reset_mail.py:17 +msgid "Now you have to create your password to complete your registration." +msgstr "" + +#: n/skins/generic/password_reset_mail.py:20 +msgid "Choose a password and enter it in the form." +msgstr "" + +#: n/skins/generic/password_reset_mail.py:25 +msgid "Please note:" +msgstr "" + +#: n/skins/generic/password_reset_mail.py:26 +msgid "Your personal login to sign in later is:" +msgstr "" + #: n/skins/generic/password_reset_template.pt:16 msgid "Password resetting" msgstr "" diff --git a/Products/Plinn/skins/custom_generic/join_form.py b/Products/Plinn/skins/custom_generic/join_form.py index 0e07d03..d65c8ef 100644 --- a/Products/Plinn/skins/custom_generic/join_form.py +++ b/Products/Plinn/skins/custom_generic/join_form.py @@ -24,34 +24,27 @@ form = context.REQUEST.form if add : if validate_email : password = confirm = rtool.generatePassword() + ok = True else : ok = context.validatePassword(**form) - try : - if email_as_login : - member_id = member_email - rtool.addMember(id=member_id, password=password, - properties={'username': member_id, - 'given_name' : given_name, - 'name' : name, - 'email': member_email}) - context.setStatus(True, _('Success!')) - except ValueError, errmsg: - context.setStatus(False, errmsg) + if ok : + try : + if email_as_login : + member_id = member_email + rtool.addMember(id=member_id, password=password, + properties={'username': member_id, + 'given_name' : given_name, + 'name' : name, + 'email': member_email}) + if validate_email : + rtool.requestPasswordReset(member_id, initial=True) + context.setStatus(True, _('Success!')) + is_newmember = True + is_anon = False + except ValueError, errmsg: + context.setStatus(False, errmsg) - - -# if add and \ -# context.validatePassword(**form) and \ -# context.members_add_control(**form) and \ -# context.setRedirect(atool, 'user/join', b_start=b_start, ajax=ajax): -# return - options = {} - -if context.REQUEST.get('portal_status_message', '') == 'Success!': - is_anon = False - is_newmember = True - options['member_id'] = member_id options['given_name'] = given_name options['name'] = name @@ -60,6 +53,7 @@ options['password'] = is_newmember and context.REQUEST.get('password', '') or '' options['portal_url'] = portal_url options['isAnon'] = is_anon options['isNewMember'] = is_newmember +options['isOrdinaryMember'] = not (mtool.isAnonymousUser() or is_newmember) options['validate_email'] = validate_email options['isAnonRegistration'] = rtool.getMode() == MODE_ANONYMOUS options['isReviewedRegistration'] = rtool.getMode() == MODE_REVIEWED diff --git a/Products/Plinn/skins/custom_generic/join_template.pt b/Products/Plinn/skins/custom_generic/join_template.pt index 337aa94..3434f56 100644 --- a/Products/Plinn/skins/custom_generic/join_template.pt +++ b/Products/Plinn/skins/custom_generic/join_template.pt @@ -11,7 +11,7 @@ tal:define="form options/form">

Become a member

-

+

You are already authenticated. You may use the

You have been registered as a member.

- You will receive an email shortly containing your password and - instructions on how to activate your membership. + You will receive an email shortly. Please follow sent instructions + to complete your registration.

Click the button to log in immediately.

diff --git a/Products/Plinn/skins/generic/password_reset_form.py b/Products/Plinn/skins/generic/password_reset_form.py index eaa2eb7..9cb4b1d 100644 --- a/Products/Plinn/skins/generic/password_reset_form.py +++ b/Products/Plinn/skins/generic/password_reset_form.py @@ -9,8 +9,7 @@ uuid = traverse_subpath[0] passwordChanged = False -if validate and \ - context.validatePassword(**form) : +if validate : userid = context.reset_password_control(uuid=uuid, **form) if userid : passwordChanged = True diff --git a/Products/Plinn/skins/generic/password_reset_mail.py b/Products/Plinn/skins/generic/password_reset_mail.py index 7a9ab12..9717740 100644 --- a/Products/Plinn/skins/generic/password_reset_mail.py +++ b/Products/Plinn/skins/generic/password_reset_mail.py @@ -1,15 +1,29 @@ ##parameters=options={} from Products.Plinn.utils import translate as _ + print _('Hi %(fullName)s,') print -print _('You recently asked to reset your password.') +if not options.get('initial') : + print _('You recently asked to reset your password.') -print _("To get back into your account on the %(siteName)s website, you'll need to create a new password.") -print _("It's easy:") -print '— %s' % _("Click the link below to open a browser window.") -print '— %s' % _("Fill the form with your new password.") -print + print _("To get back into your account on the %(siteName)s website, you'll need to create a new password.") + print _("It's easy:") + print '— %s' % _("Click the link below to open a browser window.") + print '— %s' % _("Fill the form with your new password.") + print +else : + print _('You just sign up on the %(siteName)s website.') + print _('Now you have to create your password to complete your registration.') + print _("It's easy:") + print '— %s' % _("Click the link below to open a browser window.") + print '— %s' % _("Choose a password and enter it in the form.") print '%(resetPasswordUrl)s' +if options['loginIsNotEmail'] : + print + print _("Please note:") + print _("Your personal login to sign in later is:") + print "%(member_id)s" + return printed % options \ No newline at end of file -- 2.20.1