From c842e5e6424e39757c43950456c66e7bb14c32c8 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 16 Apr 2015 12:58:21 +0200
Subject: [PATCH 01/16] Modernisation de l'inscription (suite).

---
 .../Plinn/skins/custom_generic/join_form.py   | 35 ++++++++++++++-----
 .../skins/custom_generic/join_template.pt     |  6 ++--
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/Products/Plinn/skins/custom_generic/join_form.py b/Products/Plinn/skins/custom_generic/join_form.py
index 579a38f..0e07d03 100644
--- a/Products/Plinn/skins/custom_generic/join_form.py
+++ b/Products/Plinn/skins/custom_generic/join_form.py
@@ -1,4 +1,4 @@
-##parameters=b_start=0, member_id='', given_name='', name='', member_email='', password='', confirm='', send_password='', add='', ajax=''
+##parameters=member_id='', given_name='', name='', member_email='', email_as_login='', password='', confirm='', add='', ajax=''
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.permissions import ManageUsers
@@ -20,11 +20,31 @@ is_usermanager = mtool.checkPermission(ManageUsers, mtool)
 
 
 form = context.REQUEST.form
-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
+
+if add :
+    if validate_email :
+        password = confirm = rtool.generatePassword()
+    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 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 = {}
 
@@ -37,12 +57,9 @@ options['given_name'] = given_name
 options['name'] = name
 options['member_email'] = member_email
 options['password'] = is_newmember and context.REQUEST.get('password', '') or ''
-options['send_password'] = send_password
 options['portal_url'] = portal_url
 options['isAnon'] = is_anon
-options['isAnonOrUserManager'] = is_anon or is_usermanager
 options['isNewMember'] = is_newmember
-options['isOrdinaryMember'] = not (is_anon or is_newmember or is_usermanager)
 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 aa53178..337aa94 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">
       <h1 i18n:translate="">Become a member</h1>
       <div class="Desktop">
-        <p tal:condition="options/isOrdinaryMember" i18n:translate="">
+        <p tal:condition="not:options/isAnon" i18n:translate="">
             You are already authenticated. You may use the
             <a tal:attributes="href string:$portal_url/personalize_form"
                i18n:name="personalize_form"
@@ -53,7 +53,7 @@
           </p>
         </div>
         
-        <div tal:condition="options/isAnonOrUserManager">
+        <div tal:condition="options/isAnon">
           <form method="post" tal:attributes="action form/action">
             <table>
               <tr>
@@ -74,7 +74,7 @@
                          placeholder="Email address" i18n:attributes="placeholder"
                          tal:attributes="value options/member_email|nothing"/>
                   <label>
-                    <input type="checkbox" name="email_as_login"
+                    <input type="checkbox" name="email_as_login" value="email_as_login"
                            tal:attributes="checked python:options.get('email_as_login', True)"/>
                     <span tal:omit-tag="" i18n:translate="">use as login</span>
                   </label>
-- 
2.20.1


From 65ff5cb6e355242be8f93d5ef1f26190af3f44e6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 16 Apr 2015 16:39:16 +0200
Subject: [PATCH 02/16] bugfix

---
 Products/Plinn/RegistrationTool.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Products/Plinn/RegistrationTool.py b/Products/Plinn/RegistrationTool.py
index 44b3034..3cd5e4d 100644
--- a/Products/Plinn/RegistrationTool.py
+++ b/Products/Plinn/RegistrationTool.py
@@ -314,6 +314,7 @@ class RegistrationTool(BaseRegistrationTool) :
                 return  userid, _('Password successfully updated.')
             else :
                 return None, _('"%s" username not found.') % userid
-
+        else :
+            return None, msg
 
 InitializeClass(RegistrationTool)
\ No newline at end of file
-- 
2.20.1


From 8477d1d3bd27406257f7d1834ed69216440c56bd Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 16 Apr 2015 16:40:24 +0200
Subject: [PATCH 03/16] =?utf8?q?Inscription=20avec=20validation=20de=20l'e?=
 =?utf8?q?mail=20et=20email=20en=20tant=20que=20login=20op=C3=A9rationnell?=
 =?utf8?q?e.?=
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 <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\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 <a href=\"personalize_form"
 #~ "\">personalization form</a> 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
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
KxXY!_eEtX4w&Vc-

delta 14585
zcmZA72Yij^|NrqjiHML$h#lm_3L3FuRuIIjy=sf(AY?C%;#j3tsbf^_S#9l9Z7ph3
zlq#jI@kM<VRXViw?eFzI_vQcp{(k52xca=-eT~m`-6ui6+vu}qi_f-A-mZAdvWm5~
zEPu?x0yrKE;$$q0Gte6snEJ(7obn1Rg4<2~0Su!21qR|JQ@({IDF1>T(65a>Zud5p
z%c?-dKq{KxSd73=Fbc0@DJ&9aS!J;jmd9qO1@}W=Ou#~zgnpQ5%41RerkMIU7)*H~
zYC#*~T=oO|OvMr771RzMVgUYS%7xn6J1m8os2Zw0%J?cOBJEAN7b=4BSOAkz3&_Aa
zIN3#}AenqDgL_c}Uqmh7nknB$?eGbP;h$I(%eAwtidX|RL3`8$ozVveqn;av8gDfE
zVIC?1u1RDnky(TVaSv(-pQ9!?W6IZ1p}dFM(G%3s{f(8eTzkuk!RDxlj6*GG2G+xO
zPzyL@>d#>@=C>}HhP$Y<eukR32sgzS%b^~07^6&mGgJs$p)O+<R>x_^t*8iGLEWwE
z_%)X5Xy2uuFqHYNf}QLgRYHF{)H3Bps2#LI-RgFzh4n>EI2;wRJkvhWw9i8=cqJ+l
zo6!&VqQ*arh42gpGQagT8BKH>71|$B6F$YN=<}Mr;u=_*a%)t-0ayfwqxxr}CYp?T
zZYCbaZ8!+CI@@>U0&3wuqpJp)-^rB3@Gkbs8=*oMhw9h?HE}o8k&Hy`Bo!m^4b+0x
zV^Q2@%AX-;Y@I?K?R5;mr>JqQuEbvreqHSWE2277M>cOYK<#J}>Q>J{P4vF0Uyq91
zX4FD<pd#`ECgB4N!rtBNFEA(S`H|QMv$_%g*<?;pF%A26x2)Ijdwd;V>0u8z6^l}y
zhoQI<wS#?F4iBRy{?2$GwUJ-3IC}TABT*7nA7RSTE;4$b+hRHnN3HN148&WgQ2&ft
zz@Mmy`1i60Du#+cMPp@D|LUe(&y*YCeClISU*(rjm(cYMnT}*`n2J|=+Y?8lR^AG=
zpx&rZ4n^ICbkqXhHtma06R$RYjJhj3P5VAn|6`~HUqUwIvaXU*=zc^^_zV?VKMp7a
zi=x^qp;jD)YHx&^pgC&bHpU*P9S%i>IstWL>BiYuoAO2s)cb#hj5^-M68IELVWGaZ
zVW=H9M1{T!YT`bq$P6^~BT#Qm8fu|grhXi1!BbHioQ1)-0*mSW-%3UUA5sOL#L{>T
z^;7RD>SseBH&Q#ThMFK6^<0cG&eV5CP1pyuph2b_kDk{T^;{~tbY{6^<V4htW||HQ
zQD?Or_23#*q&A{1<4)9bUzqwYQT?x(`WvSFZ`6h!qmI(ApJmm>kbcDfRWfl@G{Z?)
z5)Y!z{u1hk(~qc$iuAY7t|V%qai|HqVFT=qo)Dua#HdJZMMZ8mDk8^B`BZ=6ubo_>
zLLs?_+Tml<@o&^+vIf`-^Fb}7EQVrb)W9uJ5$cSZuqSFE15pb}L%lr{QS;3+?JHem
z^z(ZMYJdx<JMax^XZKM*W*=c43>e7QG{&GpI0WnAyQs*0ftvVRRHz@KLjT;<7vl$k
zHdqC<P*+_t3UyOd1iGL?+sAZ>H;yv(S?HjB0;>N?)Z6j_I`JUt@>LmZFW?o_M2%1r
zw?wsfMvm5H^&+Dkk1@_L9hRa(wg&a!4paWjl+U3;c^x&u1B}CGn1D@(*pXR*ywTPL
zY>L%~+P|<QU`f6I)5&Nj%TYU7j|$;_48?P(Gk#!vj;i<LS7%LJ8MT2(RLGm7cGwX$
zZg<oj=!ZIrQK){C(TDl1cgSd<`KU8rie+&XYKMDK1D-VH^QZxSKrQ$IYJuLv_&pGV
z(Q~BOgmM>*#J4fXi`N!4&r!nU(u1eS=*+L6Zuf1}#1Byu{cY+CCE61f$EDQQKwa9S
zsBg~GsPS%?@*~u^K3oiqTNG6;g9Wg%llbe5tDA<#sIzX3+F3VL`v|OtV^9lQf$F!}
zxED3>arDKnQ2nl;Cc1}Oz)z^7_ziV5e#42sLLW5T4sjXOKw%h;HBk?~hCbK_3u1p%
zzj)M9C8I(-4I5)VM&nOd6~jmH9f9reDo)3m81EWs-`3gKnu?!Mw=_D5R|L~g4<10i
zi>wz|5nmr=S$A*@#^RvSyjr*ttKbc+fxgLHIINA@!276(u0U<vwS|l?nO&%m9KeEj
z6t$o;I240ZY%@>;ePz6idj4Asz#FIu9-8tCEKIp@s(t%QVmZpSkRx(g?aAo%>5FAB
z2^IRusMl;AYQoP^3;Y7r?+og7x`R5?7pSu?nr1I31od25RDA{1JeAOa(de)Dzc(3g
zDu!SX4nsvC6LtIZP&<1IHPC$20v4P0ZKzQ0Hy%ap@Jm$x`>5w1p%(fV>dpkDvmxfU
zs*%wdMWH5Kf?D}{^v4fT1LdQ3up2euDbzRHMeKw%Gwg-uVi4u=sORRO#+i>?FKZbF
zqHiYgpGYQzOkG@nVR#H@;ayYC%(7QJ9~V-;33aPmW%GjvN20!H{=}&monu*_;U27s
zdAVF<T!%}r#2CJmaLX9t-;>M>DxBE;4SvnSU3eBB;Y8e@XTJq8W9`U{M@3)~7R8yU
z9WKG*xE4#{r>LVni;C!Z)X`o-{j|I`miX&|CsgRQD)6Sg)5=($atx|te+<ENtb|id
z{RgN^c)*mu#uAhtp!!?m?7L6`wV>Ll`P!oHKtGr1kcGM=@1S<J)Rfnu2HbAS$1s@k
zMbsJp3w4&yP!aGRZ}$&CEg;;K8=zj(j;IK9L)|r3Uov_>6HG;_aV%=!X{Zn{KrL)7
zYT`|%ydU*i9yOjtZRBgLg11nwv)=?e5;aiuZII_&RuY*4RAiu5n2W`59O~@eL9O^*
zQ-0656cx%9s0D0CEo=`eVkc3N`rfoZMs4JGQ!dEShw1$<N>b>ejEzwPw?ZwXH-_N|
z)O$Z2BXAYg#uKOr{(;(n&qVuIHh)wEBd{ViK;5NYsJk!<i|~v!iHthTLG5G{Dukb)
zB6A3}z+<Q#o=4s08(10tg<5c-N%jPxc;1Uw8W&LSJ;i>0F=|7rO*tQ3TKNG}aRRlF
zuTTR%!6+;+l^@YqA796T*c^9a4Sa@mvEp0yrR#<|f<$bOd8qz}u_by<v;WN5Y8vr>
zg^D>;Xu>_Hou5H1>?&%Yf1yJ5+_VQzw~wL%s$WAah_S}@sEBpN0@x4za4@R>aP-9t
zouwWeV>(Pgm8W4<oP%94AN8L5yluCKqK={xhGRWcXnUb19*!C(9sO_&Y6C8G;3Cvr
z*rf{H%CpAns9XC06_LMD?{Ux!^9K%8dkbSXY)UyE+u}0Rgtt-8KR_Mne~cAo+V6cc
z^rzm{o{U1#1AXvy)L9P1M)(dE#$%`lE};5fGu}k*nspBqk^2~d&v7?~^Mgbi{1%;R
zM@6RVY|l6@s}C8icp!Q%4Qe5IrhYtzQhp2dI;}SKTTv74LWTY~>WHplIedb1F<_3p
z<7KFYZN%1i9-HX>FY%5Yx-O{i_JvpjcVi^p!axjSG_AY>DiT$UQ5ZnEF&4!*EQGyK
zM=%I=*6FBz(@=NDt+L+#on*9w!>9o+VG!O%P4pBMp%<p!cb<K#OQHrWhgx6+YT^c{
zg*Hcx6Nmco+}qU8#qyLFp-Ua}$!Gz4Q4^jqUd9HLZ=eP$^{)NRRt@!9wLu+O2U8x5
zdOpFFQ?Ll-Ow>2$1gwmUQT_J4OZ?U0C>7e_1=Da9wUgVZo&AK>@K3CR;q!T?u?H5z
zO{hC_5H-PJ)P#3Y<NSjTEabL-?AAaXb!#{A*VzoGLXjAUI)W*vf#;)c`#NlgAE7SS
zFQ~U8aDn~%ejI866HwoDlQEpv;t*;<w-?$!_52pu<3(Z#>g&146eiOSwbCA_NDMG0
zpx)ons7TF3Eo_l-BkE}Oq9Sz)71}GPac-f;{WoeOPfh)Eqswct{o44WE=f36zyYY+
zpNAS~11dsWusH5S4SWI{;{|+%h2P`6@gH<x<`VlkH&&<oK5G0UNCaHgO)?7IZ>RzP
z#1Qm(-@as}Q9Cb>ZLvCPL1`F_V^C-PHtKs~H7eu>P?5Qb>i+~I@Hr~t;Y;;A=O0OC
zBo#5J&}~57iEXG*A45HG1vSuZ)Q%sRa+PHq3*|`Ef_9-6e8PAMhfuzOov`I{{z3|8
z<1oGd%~p8+e#u&iI-|c(6ML<+Ll}aJOf>2(h(S$|h>BD?>PV(yDO`+tehX^BpQG-^
z32ca$F$V)z5q~`}g^UJzAN5{uK}8@RHNZ(!{RLDcE~DyiqU!G(9~qzGIqLsFZ#=Qu
ze(p4Oq<k55m%`VW_rLlYd*#ung>*6w!RnN=O#3p_ndYPJ%n>Y&$59LV0k!jcsD95;
z6Zx;Tk0uz^9*(**_1C)W(7r~6BGDTas$|s8#-i?o3w1OzQ2pkjLcRgLaS!Ub{rC!=
z!YcS1#$f0=yMI4pGV1+zxyWe83s9G5qv@~*^+j|B3*a^54b)EWpbtJYK0)1)Ur{^$
z4{AZa>+Oj{Pz$eydOilrqAQL}1eqbIFPiD7kZwTj@E~fS3+M^4@g8cz$HqTU3-a1v
zN6HrqP%eUcE*KTbGN=t#vUOPv$rPlbBWi%|=!?BkAsT>MNIH7Hnoa$D)LZZY>Qd&T
zCOU|rcnoz1ZsDu=3%0_j4{S3qT<`xUo(#7Vb=m$v9Yy#?`#ZiKYC)rn=@?5n7j>C-
z8&6>&%GXgFxr18ReJqF1PzwtB&|YX5`Y^v0K}I`y#WXZRJ<tO6^SwXnXhxv=O+y{Y
zeAB+lxEU3(y{OxL4#V+BW8shN?~h0<NPSOq>4E-a{4fn`;23O)t1$|1VGAtwu^qbZ
z=()702y8?}Y%hl4Y1CzVVCua$+2e<xjwaNU8*L)~8lVLg{@5Lh-~bH35m*_sQ44$z
ztKur$kH<{?l+AW%XJH}gmttXDhk9-+R>57U`L3gG|D(;sUmXf<u~!z1+F2y(Eof<c
z-PEUJ0QFN*5qTGT;04qKRkqq+u^n&#<%y_>UPnz>aGO1!1GSOrE;0&97gI3`HNia8
zLY8AC+>VOOCDhJtpmy>Ab(SwsJ1?-^ep>=j<2q2|HA7v>4ygW}QRBIKk*P^$D3-@r
zs0lWrE@3|E_4^WascvF0{)zf#E3(7>#_ND>Dd%7v+>hVkLsW!M=i3Xuh(VO^AV==9
zekG$Xiht0vgHP<82cm9$IIhH&sP-FJ4ez5C61>w6eK;1U+!l*rKh#b~8#7IP9_p^m
z^3-$w3(4qgmSG5fiu(C}3bj(7Pwk09Pz$Jn8n_nfdm$PXv8JXz4i)OxuoQMf^&5eT
zL<(vFIq3QQ-$h0f&Q=8;MGf#3YQoE?0e(P5<PPfc71(9}QrZTaP@auZc+AxQit8!I
z?6#k~jTw}^_wa`k%tn{K5>JvDi2-}<e}>D!_bKnd2<*I%+v>%Nu_NWBynCAPE=Ho`
zfPL#b;~SKxqBigXOQ6?5djqA6<x!ESbddAc4r@{|0PEv;oQo+K_?dk--b6hx5f%Ek
zQAaZubq7|WBDW276bDeZ`vmIkxr92}-?1td`P`03-OpY2cYZf2%F>XBTDcn)^2JyN
zm!o#_DQe);s7w0|YC+dg&)r5X^d9QD$5<N+9kQQmjC!sOR>Tf2GJ0Sn>h`9ib~FVw
z(E?P6S79KYMJ?<a>baX(0q>&*_B(9f{s2^DE20A<Ou0RdrQ97o@BbMxTKN^z;W}#I
zJ6IAQqC)F)#6J6AY)^Rr>K3m<wQoT^w-2?DBdEJ@0`)q^e!(WNCpN=pSX1wR-J_fv
z6$7yz1|G9_)DpK-9*hcM@NxdG4_jg?{(x@ma)M*QTi6<xoFsbq9nQh{Q|uNWV+O{a
zw*PWFAETMyYH@~e(vXb{vD;bupJeW$H|36B+B@xxI)c8adME10Mq(*^6Mb+#>WCJh
zcDf7|sjH~S+(zA{AJOyoe=o@BHv6BmA1rGO!*J@WqC(gXbtL^vISqAJCZW!9K5Bt0
zP!nuI9nB#O!Y@&8!S|?szo6&e|E=@(uU3UIiiWbN4((Ap?1S1-66&_6p<c6GRKH26
z%QhEF<9n#Puno1a-KYh8f!fF=EQ)u}6Mr@QN`)Tuy<q>;s(=b{6I91$sL*yY^<9lU
zPz&gdshEJd_!TO09ljz8I2tuxnTz%~p{R|7UF7_AcGXNn3~DE_=sA01XVie*P&>~=
zEqFYZ$Azfxj~%Fi&!EoyA}SK!;cUEP%9)q!qZ{iYqYkr-Zj7hA6!iu10&8RWukE9G
z4YlJpQ45`cPMnXL@DJ3PdtbK8L8x+B)KOH!PFN2$uWJICa%85N4y#dTy%}{h`KZtz
z!OD0XL-7IXIlpi0zyGV@#Vbh)BRwMZrR^iq`{aue${nPS$p81Jnu0l(nwc~Va^H*$
z@%rBVYh>7<mH*W-h5Qkc&hZB6QwB<=oK2ddGvf0WPQ}luJ53rzxu<DU`(piv&k$0U
zJEK-@R|$H(N@)=4TV*rp8F_s^CCwwh%u`}!M(RU;B6SPMD?HQ5AHsObUS_6nEJuAA
z>_^))(hJfm$~vQdwCOX?n=iWlWF}ED4?CHLk!GNDe4V;C&=05L&+hI~p}xK7z0aKy
z73$P=52AjCd6uH*vzhWh>c7J-)ac9pBg(&FJIut7X&ZpLU{6T;45Muk^$F-E>9RC%
zKZz>ss!6RrtBrr#MXQ@B52sv-beN~~(QQfd<oM0d^zqb_|Cm1MIGz+>+Vl-mi`0X1
zS<)U7x8AydVY*}qWc1OC*M)p72Kk5lPWS5C5e=M_=2E*yUHI@jhxIvi`>D(E)bQ^I
z<R6hAN4@?Jh!5N^YKOUAr{*{*%k&zF4@rkfC+YPu)+6;Mf1IQrXaDzenELLFx}20m
zqrL>Tlh<c9ZSzSvraaEB_Wb3Kx0mH!TF1Y_T-r98_7Ca%6MY)tU{W#np*kUfL&&}S
zq_}U^332tNxWzoPg#1BzETX*F^qg#bZu|`s=$C2AZE!W^udpTFMSUj}XN>aX^(jHV
zCmzM8)cN5u+~v)Iyh%ZyH>e0E-6K7w+`&DkZkQ|G)5gCX(5t2Csj3z9YD`(*n|uvg
zgH78A98Fs-l0QkG6Q->xuBR^2)bBFBg=g)qRzXuY4wJq4fi;rMY#MV-LveRZy-?qG
zC=GHCsu$*JO|BIK@5TU}YWnRaAHj2da02NyQ-9J-bbva2vN0Ar;|5O+zuaT4$!GCg
zG;Kw&iK!b+IiCD{Z_l5S_+tu<Z&C3BsUi75Iy5GKo_rVbeX%;JId#n_=a4^!btpF`
zf72aXzqIc)a>?#N^-Gr>My?y}`XNvhSK@KZaL=j#N_bUTr&FWPyVO3RJR2Y422!H?
zYW+}GD{=!!`tTFeilRrVDK{rSnz}n`<ns;nzmvw2hMPWi3%`t#nN0t3r0uk=qFnF4
z`fR0MpHeo~Lc6V+HIxc|6|mAwhiWwRBVUHPY2^8_Zhhij5*_L_(7iJ{EHIS13a0O;
z?wipet`XF9r`OBRcv^Q*Hw{anMH(gf{D)MRRLPVZkRM3eNP7AC(2RbaK847aH{}_|
z1=Q~&zYb@4dH!@{KYEIap`@3etK?_CEZ}X*ff$2Vu`6jk=?vxCq;~ED4N8~XLN1cp
z6Qo<@8#2{k_x%Q;6~3iZlB8b(Zj!=Dv&^F2bB8w!3G}7)<>#?GwqaPU1Jrb-&wi?Z
zB43(R)b#3%v7{8*<8X?5PQ%i!cygoY-5z&i2%a;8wj^Jbd~cqpKz=FtRal*J2Kjs}
zND8Me604A2ewtCIPe)9pex_*~iychf+uQRO6I^*Z)u!_j8eHTZ<k#YI%tw6^-JKgn
z^ebRW@8U0{Ofyt@yOY(Ex*tuS7*i*Pn0}YZcQ@^Yv5Bdl<38J{bl{h!<r=*fx}P)(
zak;7agHp6<=|ul8$j9MIQm%QPE}l;wZGW2lblMh@A4950{XrZ?YEQaBxhYO0C6W)u
zMx;q3ePVgm>BTS4pO8tS!vreZlHR7QPi1_LcWBdRj#2r#<R6%FIm+iueyDl&iYfOu
z<&MU$>AQw}bJ`DL3ok!@6(n=a?cXG{>}9GyGmmPT2wJA#+wPbqp>_Mv(wCZjYT`42
zvWv1lUCFm5|0Xu1{59Tp&u9`_Z49|fq{^g?q^6_+^!y8Jnx~g~yH7PK=N09?(<IE*
zpN3rw;ZI`~^7;%X?;sy%7p-4#Ddh&#A2NN;;v~vPP1%?HUOh+BXASlLkZO{D71v@>
zQZrH^$|W&ct1m<0I|@lW_&518<R_9JLrSB3f~3z{GqCbY+<Tf<b_LQ>pY(xgSx$Z%
z=|_50CuLAS9}nRvY(iTEX)7s@x_@I^j3I3z?}PfZz`c~;!}X*R)EyyRr0xYNNS*kd
zZ@{Z1y?W(myt>A(NkUpmQtAjtyd%Y#GR&Fj7?G6g%yQ(V<v6lOIvw%Dl9H3M^Bmb}
zj&x^cR$6L&a?)6*r^!7bD<Z#G>nh&)!{ROkwss_@@my+Jwj&`eE87vDn&(JKOLcl4
z9p+>f275V2d}^X*$aFYU;**l;o9IYmHh0&IQY9Q?l9H1hnQBROq-Q4O#%DY8YxkT|
zJb$0l8PqW)hrzRQhNUDiha;EeB)%LaF)`Dbl@;aaH8Ls75pS35(S|u4Ia$s`?IO!*
z&+UkJU&smZa=7p0G~vHtxe@NLoDS}9$8`3NvfPKpl*m7jv!Gyp-*Fp!Li+M(Y<i}n
zZUaZ%MosHAY#LoRKX_tJ;aF#`Gc_sGv#U&}BR4H4izuX~IvvUJj`XywtRzqLj(q4y
zbpHSFWfA0Lrz0yV+v#w7O)eckY*KPk<8!i)d>EBKWoD31{{A`Jf?aL?_vlXcP0#e?
zBO9}wDbCbv$B4}M?3|?RC`X^PY^HbCvV)nFnw8|p$l;LEa<Vy++%$VtM?R!rA7ZLA
zIhg|C%64X^F_hx0_9&}Ik~7t_-29vsZA;}J`=n&?4vDN}tb-{tS$YoJi}ytO|4r#R
z1t)VR5#G#rM@}}ECX4Y10*CC0i!(JhEzf;pa!L2;;{pCT*=Z^9*-05W?jMfFy00AT
z6P~5ur8{#N|K(0JUIMFQMTwd5?qa7(ROL>X&1wA<vNLlMvXjzMc~(=!Q^;LA_PAgE
Jv@gH${U6q3l&Sy#

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index 8747019..f07a60a 100644
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Wed Apr 15 17:26:41 2015\n"
+"POT-Creation-Date: Thu Apr 16 16:35:11 2015\n"
 "PO-Revision-Date: 2015-04-15 15:06+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
@@ -24,29 +24,33 @@ msgstr "Objet supprimé"
 msgid "Please rename each listed object."
 msgstr "Veuillez renommer tous les éléments listés."
 
-#: n/RegistrationTool.py:254
+#: n/RegistrationTool.py:267
+msgid "Complete your registration on the %s website"
+msgstr "Terminer votre inscription sur le site %s"
+
+#: n/RegistrationTool.py:269
 msgid "How to reset your password on the %s website"
 msgstr "Comment réinitialiser votre mot de passe sur le site %s"
 
-#: n/RegistrationTool.py:269
+#: n/RegistrationTool.py:287
 msgid "Unknown user name. Please retry."
 msgstr "Nom d'utilisateur inconnu. Veuillez réessayer."
 
-#: n/RegistrationTool.py:284
+#: n/RegistrationTool.py:302
 msgid "Invalid reset password request."
 msgstr "Demande de réinitialisation de mot de passe invalide."
 
-#: n/RegistrationTool.py:290
+#: n/RegistrationTool.py:308
 msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 "Votre demande de réinitialisation de mot de passe a expiré. Vous pouvez en "
 "demander une nouvelle."
 
-#: n/RegistrationTool.py:299
+#: n/RegistrationTool.py:317
 msgid "Password successfully updated."
 msgstr "Mot de passe correctement mis à jour."
 
-#: n/RegistrationTool.py:301
+#: n/RegistrationTool.py:319
 msgid "\"%s\" username not found."
 msgstr "Nom : « %s » non trouvé."
 
@@ -585,7 +589,11 @@ msgstr "Pas de nouvelle bonne nouvelle !"
 msgid "More..."
 msgstr "Plus…"
 
-#: n/skins/custom_generic/join_form.py:60
+#: n/skins/custom_generic/join_form.py:41
+msgid "Success!"
+msgstr "Succès !"
+
+#: n/skins/custom_generic/join_form.py:67
 #: n/skins/photo_theme/photo_main_macros.pt:28
 msgid "Join"
 msgstr "S'inscrire"
@@ -598,7 +606,9 @@ msgstr "Devenir membre"
 msgid ""
 "You are already authenticated. You may use the ${personalize_form} to change "
 "your personal informations."
-msgstr "Vous êtes déjà authentifié. Vous pouvez utiliser le ${personalize_form} pour modifier vos informations personnelles."
+msgstr ""
+"Vous êtes déjà authentifié. Vous pouvez utiliser le ${personalize_form} pour "
+"modifier vos informations personnelles."
 
 #: n/skins/custom_generic/join_template.pt:16
 msgid "personalization form"
@@ -610,11 +620,11 @@ msgstr "Vous avez été enregistré en tant que membre."
 
 #: 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 ""
-"Vous allez recevoir sous peu un e-mail qui contiendra votre mot de passe "
-"ainsi que les instructions pour activer votre inscription."
+"Vous allez recevoir un e-mail sous peu. Veuillez suivre les instructions "
+"envoyées afin de terminer votre inscription."
 
 #: n/skins/custom_generic/join_template.pt:29
 msgid "Click the button to log in immediately."
@@ -646,57 +656,35 @@ msgstr ""
 msgid "Return to homepage"
 msgstr "Retour à la page d'accueil"
 
-#: 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 ""
-"Devenir membre vous donne la possibilité de personaliser le site et de "
-"participer à la communauté."
-
-#: 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 ""
-"Devenir membre est complètement gratuit. Votre e-mail ainsi que toutes vos "
-"données personnelles resteront privées."
-
-#: 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 ""
-"Vous devez entrer une adresse e-mail valide qui sera utilisée pour vous "
-"envoyer votre mot de passe généré automatiquement. Vous pourrez le changer "
-"dès votre première connexion."
-
-#: n/skins/custom_generic/join_template.pt:76
+#: n/skins/custom_generic/join_template.pt:61
 msgid "First name"
 msgstr "Prénom"
 
-#: n/skins/custom_generic/join_template.pt:81
+#: n/skins/custom_generic/join_template.pt:66
 msgid "Last name"
 msgstr "Nom"
 
-#: 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 "Adresse e-mail"
 
-#: n/skins/custom_generic/join_template.pt:94
+#: n/skins/custom_generic/join_template.pt:79
 msgid "use as login"
 msgstr "utiliser comme identifiant"
 
-#: n/skins/custom_generic/join_template.pt:101
+#: n/skins/custom_generic/join_template.pt:85
+msgid "login"
+msgstr "identifiant"
+
+#: 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 "Mot de passe"
 
-#: n/skins/custom_generic/join_template.pt:107
+#: n/skins/custom_generic/join_template.pt:99
 msgid "Password (confirm)"
 msgstr "Confirmation"
 
@@ -794,7 +782,7 @@ msgid "Remember my name."
 msgstr "Se souvenir de mon login."
 
 #: 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 "Connexion"
 
@@ -1282,12 +1270,13 @@ msgstr "Partager"
 msgid "Submit: \"${objectid}\" for Review."
 msgstr "Soumettre : «&nbsp;${objectid}&nbsp;» pour validation."
 
+#. Default: "Submit this content to request a validation by a reviewer."
 #: n/skins/generic/content_submit_form.pt:9
 msgid "submit_transition_explanations"
 msgstr ""
 "Soumettre ce document en vue d'une validation accordée par un modérateur."
 
-#: n/skins/generic/content_submit_form.pt:15
+#: n/skins/generic/content_submit_form.pt:17
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -1567,19 +1556,19 @@ msgstr "Coller"
 msgid "Exit boxes editing"
 msgstr "Quitter l'édition des boîtes"
 
-#: n/skins/generic/password_reset_form.py:30
+#: n/skins/generic/password_reset_form.py:29
 msgid "Update Password"
 msgstr "Mettre à jour le mot de passe"
 
-#: n/skins/generic/password_reset_mail.py:4
+#: n/skins/generic/password_reset_mail.py:5
 msgid "Hi %(fullName)s,"
 msgstr "Bonjour %(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 "Vous avez récemment demandé de réinitialiser votre mot de passe."
 
-#: 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."
@@ -1587,18 +1576,42 @@ msgstr ""
 "Pour accéder à nouveau à votre compte sur le site %(siteName)s, vous devez "
 "créer un nouveau mot de passe."
 
-#: 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 "Rien de plus simple :"
 
-#: 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 "Cliquez sur le lien ci-dessous pour ouvrir une fenêtre de navigateur."
 
-#: 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 "Remplissez le formulaire avec votre nouveau mot de passe."
 
+#: n/skins/generic/password_reset_mail.py:16
+msgid "You just sign up on the %(siteName)s website."
+msgstr "Vous venez de vous inscrire sur le site %(siteName)s."
+
+#: n/skins/generic/password_reset_mail.py:17
+msgid "Now you have to create your password to complete your registration."
+msgstr ""
+"Vous devez maintenant créer votre mot de passe pour terminer votre "
+"inscription."
+
+#: n/skins/generic/password_reset_mail.py:20
+msgid "Choose a password and enter it in the form."
+msgstr "Veuillez choisir un mot de passe et le saisir dans le formulaire."
+
+#: n/skins/generic/password_reset_mail.py:25
+msgid "Please note:"
+msgstr "Notez bien :"
+
+#: n/skins/generic/password_reset_mail.py:26
+msgid "Your personal login to sign in later is:"
+msgstr "Votre authentifiant pour vous connecter plus tard est :"
+
 #: n/skins/generic/password_reset_template.pt:16
 msgid "Password resetting"
 msgstr "Réinitialisation du mot de passe"
@@ -2947,6 +2960,36 @@ msgstr "Annuaire"
 msgid "Configure portal"
 msgstr "Configurer portail"
 
+#~ msgid ""
+#~ "You will receive an email shortly containing your password and "
+#~ "instructions on how to activate your membership."
+#~ msgstr ""
+#~ "Vous allez recevoir sous peu un e-mail qui contiendra votre mot de passe "
+#~ "ainsi que les instructions pour activer votre inscription."
+
+#~ msgid ""
+#~ "Becoming a member gives you the ability to personalize the site and "
+#~ "participate in the community."
+#~ msgstr ""
+#~ "Devenir membre vous donne la possibilité de personaliser le site et de "
+#~ "participer à la communauté."
+
+#~ msgid ""
+#~ "It does not cost any money to become a member and your email and other "
+#~ "personal information will remain private."
+#~ msgstr ""
+#~ "Devenir membre est complètement gratuit. Votre e-mail ainsi que toutes "
+#~ "vos données personnelles resteront privées."
+
+#~ 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 ""
+#~ "Vous devez entrer une adresse e-mail valide qui sera utilisée pour vous "
+#~ "envoyer votre mot de passe généré automatiquement. Vous pourrez le "
+#~ "changer dès votre première connexion."
+
 #~ msgid ""
 #~ "You are already a member. You may use the <a href=\"personalize_form"
 #~ "\">personalization form</a> 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 <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\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">
       <h1 i18n:translate="">Become a member</h1>
       <div class="Desktop">
-        <p tal:condition="not:options/isAnon" i18n:translate="">
+        <p tal:condition="options/isOrdinaryMember" i18n:translate="">
             You are already authenticated. You may use the
             <a tal:attributes="href string:$portal_url/personalize_form"
                i18n:name="personalize_form"
@@ -22,8 +22,8 @@
         <div tal:condition="python:options['isNewMember'] and options['isAnonRegistration']">
           <p i18n:translate="">You have been registered as a member.</p>
           <p tal:condition="options/validate_email" i18n:translate="">
-            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.
           </p>
           <tal:case tal:condition="not: options/validate_email">
             <p i18n:translate="">Click the button to log in immediately.</p>
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


From daae7666e381a03c2ed0f5665685648f0680ff1b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 16 Apr 2015 16:49:19 +0200
Subject: [PATCH 04/16] ajustement terminologique.

---
 .../Plinn/locales/en/LC_MESSAGES/plinn.mo     | Bin 50572 -> 51132 bytes
 .../Plinn/locales/fr/LC_MESSAGES/plinn.mo     | Bin 54365 -> 54984 bytes
 .../Plinn/locales/fr/LC_MESSAGES/plinn.po     |   2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo
index d79bd63e53542739d7194f939f5f22d2905207d3..33fce5d5e111d62a3d029a1d567c20101b83ba80 100644
GIT binary patch
delta 15863
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
HEcCwsqX<0k

delta 15465
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
O)QvAkKELNd#{UCq0kNI{

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo
index 065fa1890f0a07df38fbd26d368f2a020f118ab8..39d163397eccf9c51fea023720c91239c6357e87 100644
GIT binary patch
delta 15935
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
LMoc($H{bsOLhOwS

delta 15439
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

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index f07a60a..2ac8829 100644
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -1610,7 +1610,7 @@ msgstr "Notez bien :"
 
 #: n/skins/generic/password_reset_mail.py:26
 msgid "Your personal login to sign in later is:"
-msgstr "Votre authentifiant pour vous connecter plus tard est :"
+msgstr "Votre identifiant pour vous connecter plus tard est :"
 
 #: n/skins/generic/password_reset_template.pt:16
 msgid "Password resetting"
-- 
2.20.1


From 278ef7b50e5fcbf8b896e12fcf3c03fd43971d49 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 16 Apr 2015 19:02:26 +0200
Subject: [PATCH 05/16] Correction localisation.

---
 Products/Plinn/RegistrationTool.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Products/Plinn/RegistrationTool.py b/Products/Plinn/RegistrationTool.py
index 3451d37..fff500e 100644
--- a/Products/Plinn/RegistrationTool.py
+++ b/Products/Plinn/RegistrationTool.py
@@ -183,7 +183,7 @@ class RegistrationTool(BaseRegistrationTool) :
                 private_collections = portal.get('private_collections')
                 if not private_collections :
                     raise AccessControl_Unauthorized()
-                    return
+
                 data = private_collections.data
                 lines = filter(None, [l.strip() for l in data.split('\n')])
                 assert len(lines) % 3 == 0
@@ -194,7 +194,6 @@ class RegistrationTool(BaseRegistrationTool) :
                 if not (collecInfos.has_key(properties.get('collection_id')) and \
                     collecInfos[properties.get('collection_id')]['pw'] == properties.get('collection_password')) :
                     raise AccessControl_Unauthorized('Wrong primary credentials')
-                    return
 
 
             BaseRegistrationTool.addMember(self, id, password, roles=roles,
@@ -316,7 +315,7 @@ class RegistrationTool(BaseRegistrationTool) :
                 del self._passwordResetRequests[uuid]
                 return  userid, _('Password successfully updated.')
             else :
-                return None, _('"%s" username not found.') % userid
+                return None, _('"${userid}" username not found.', mapping={'userid': userid})
         else :
             return None, msg
 
-- 
2.20.1


From 55fa8d8e6b6b1562174b12c2658dd463c9b018dc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 16 Apr 2015 19:03:20 +0200
Subject: [PATCH 06/16] =?utf8?q?Gestion=20de=20l'option=20=C2=AB=C2=A0emai?=
 =?utf8?q?l=5Fas=5Flogin=C2=A0=C2=BB.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../Plinn/locales/en/LC_MESSAGES/plinn.mo     | Bin 51132 -> 51146 bytes
 .../Plinn/locales/en/LC_MESSAGES/plinn.po     |  31 ++++++++++--------
 .../Plinn/locales/fr/LC_MESSAGES/plinn.mo     | Bin 54984 -> 55003 bytes
 .../Plinn/locales/fr/LC_MESSAGES/plinn.po     |  31 ++++++++++--------
 Products/Plinn/locales/plinn.pot              |  26 +++++++--------
 .../Plinn/skins/custom_generic/join_form.py   |  29 ++++++++--------
 .../skins/custom_generic/join_template.pt     |  23 +++++++++++--
 7 files changed, 82 insertions(+), 58 deletions(-)

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo
index 33fce5d5e111d62a3d029a1d567c20101b83ba80..da9314c7e94750c8ceed03a2553b2cb5e6818e84 100644
GIT binary patch
delta 11594
zcmY+}dtlFH|HtvqcjpZo<~)bB8L^3tIp;7<j$zKrnbk1lu+Yp$PFdzK$J~aYTctAD
z(9bDG5hnfIM52^rH%i?}scygL>w8`Q{Qi1e*Y&wR*Y&>M*L8hnb7+O{=@q^!2e|bd
z$GO<vaVp~jd<uh}cAQ9Tg+p)%cEAs?KHkSTtV*NaOTy|n5F6qojK{SYizhJ}|ASFj
zy`$q)#I_xsu1*Mro-_pGAgq9+FbpSSD9**&xD3^AC;DSC2I7I$Pk6%J07~a=%NN$K
zF^KjbP|xq%`a`Tq-Ra~w$xsUw(kN8FskS}~!>Q-k`X*FFyHF7vMqfPM$#I=Z6i(8h
zoLoUI;Vx=Pf1zFs>1+b3iFzJ|dY*tauoEgJL$Mr=!>8~iY>it`0ba)P_%$l`cRRag
z0KX*jVjWa&8lfVMM-AKxqcF*uh6-Q_YQS}<3AUpG*ohw8hsynjSPx6^ef$=+kd<y1
z)1d(UXxNDws1P;rKJ>w3w*3SuQ)f^UUAOK3Mh*BgDlpG8rXGe>sMo{p*aBm5E^2&t
zCxto`_F@~nfI5y9*kGkF5v$=i)ZS;IPSsk}%J!f?9zva&5>y7y*!l%jzprfjEz~vm
z5ji`q6VcT~7>9bXv#ocxjzFzwIx5w#+WK<Tit|zLy=R{nTaTeKbk5elM6LJ-^uu4U
zBJ(>BDKw)Y=vkBcHt0Q6sDX!~0vK)UQ&20NiQ3b7s6$$Sb+HgN!8z3JxPZQR6ZPJ0
z)ObH*AoDwqDQJ%ZyO~2)8w03!M6IAJYJwD7AB{@sB-Dy#qPB28Mq>f;v2jkIGUmg^
zE1)n;z$&N!o<&y=22#*9OtlX(P<#FgYT`Wf#{&C&hqc(Ym!L9u3UxUDz$dYM4`U)K
z10zspYz$t+{2t_AhiY0+$BDpP48gZC7>jKEFe=bfs68)51$GTJ;ayb59^2;uz0C7!
zsFlW`GSM6Zu@h?iZoSBV5QP*P)bV-LMB`C`Oh!#O8)GmB6>uTy1M(@V-wiB>cTxR+
zM@<ye+q_p1OQ^TR;rIvYtPFOaGm*cHjcCZms`wUGz{9B2ok6YeGt|VFP+RgNY9+s7
z9R3#-P;4KQftILxGHQ$aqPBJnmPdCs1r5B|K3Ikt@J-uc7m`)yAZkT{ea)#3Lk%2>
zYL7)_t~n}@)~Jl6;dq>iVR#kwLA!&z?>awH7(~M#n2UY;5e#0#UN|nr{5<^tHDE}8
zySJz_6N6enXRL+YQ2oYQr=V7vg*q!sP?^~1ZD;@Aw+#nS_xUVpWp`0q@DP;|{{d#=
zFw~0cq6Th&-j!QhqxwH>>(APHFI+|YAXEm*Fi7|RE`=WWKn>VwpqaQkD&oPYfF__)
zn29<Ai%<b>vd`Z|O}x)~6m>>U+vn#|{jZ_|E<-nz!jBY`vcFLi2D2YZX>AP0Xw>so
zr~tdz=e<x9^hXUm)cPW7g_)=f%|dO}BI{OcO8xL4_FpgFvmO7$D%67pn^RiH+5)xW
zo~YE1MNK>rm6@rweGcljEJOvm#J1<57PJAizyhp@MT5z|4#NrC@e-<j9joJg)O`;c
zVtyt>p#pA)nxH!>pcHGWZ6AZ0a3U(8X}10{D)4O7dkb6&+OwtBwWt+su^o1z_G%C6
z#r>$19!725Y1I2yZ2Nbp{`YPB16zNLT9DsRvz4_mp1S)ag?1EDk$=fL>#!<bK<#}Q
zM&aM6i6T?Y-Ze%Anu?k*4HIz!dQ*(v6r(bA0+qQ^R7S317v2A_?Sts&&5Ghtsp*7T
zX*bjh15t-+C@R2VsDP$n1kOQC@CGVVJ5Uq9hYDyfDxg!STXY3Oncpe19eziBlgkY=
z12jgRg=VM~CZT@JK8wvT4He)zd;+(lQu;9_;6qfPjrrg!fKI4e)E~7KBh{|^Ka+w6
zdL0$<dQ|EQP?;!3rTUP4e$sm0wqL<Wp5H|E_a9+yPX$b)ULSQBUq=Oyhni;-x|(>0
z?NEf;>jS8jU$g#XpL<4{)CHm5t6}Rgww{POlu4)w`e8Dr;#e#|WyWum`Q*16MgH5;
zu$+cy{1lb4d#IK8jy5YPhe}}-Mqnapulrd?+V)APiE~g3ScO{go2U%zMvc24brwDv
z?V7zfZ#&*b9kyRl1O1NLd(Rm29SA_JFcLLjQ(JF|nkX5oVLw!W>DUNgM(>tl8|uXv
zhd;U$!aS^s{Ai-sapuKls6Fq1I_2F_6Zc0=G{&}1Mol;iH{uG^>5paO^(Bo*1=7{l
z2cX6sj~dsVVH@V69}PLE>#^LnZ$|C)JE)2F+2^I$fciC5V16%{e&N<g)I?3tA6ujP
zbwJJ28wtR5QYdIIhN1Rm5-RnX7=Uw811-WQa3w18J*a+%P+Rsf2H>Zt{^zkKUPYz)
z0k+1d7x^s+pT`*8|CJOv(y$M&;BVL%&!?MH`zLmxK5{(2eB*ZPjn`4{#ZBOZV+Pj6
zllVQ}!p?YhB6lA{Gt3_X`d}mKGjIa)JDVwJ1;LX{>MNjDRtJ^31{jEO7=SHM0ky+X
z=vu!)jnjFuF&XuKcPx*6P+L39)-%uzp<y-!eUTPoEzHMI+>g3OpI{BVjM{>qQP(hh
zikYY>D!}Hbe(g}>4M1&e25Qf<Q31_I1-fJk`PYM78Z=QJM&fo1#uMm+=P(REM`hp!
z>K5Eat?XCSIG&eG00F4y^-!6NwYESl@M%>4Auo}C4KSRBiZ}svXtGc%T8nI>vk5g|
z&{Pw76;yyVPy<C_C2WYAunqEW87B#Q;s#XU-(wiwMZNczOF;v9rtz`Ba##Up;5?j<
z@#s6<{Npqcmr@^S>o-sVdu9+UMqmtnfKBiV%tQZ7^Wj;K3#osOjnN(SGQZhUcojF`
zclaD;&*Wo+XE6;UXPMvS7Gq25g;<KWa2^)VHn$=16_cS%R3>I)D9%SMG!HA|My#g$
zzl(zQ_+!+eIE6~pS*(f|P%o6BuGe3v6-Q*5KSU&=`lVnvrehS&vF%$>hjFj1mtqy_
z-(k4!|L+uP(NKPl`NB0sP1pf7Q9so4iKw%(7`3w1ww{j~@Euz}f)%NsLGATds4cyV
z%D^L3f4^)3(EYDTK@Ck%*CPp)fo`Zn*9Ub?pSSfFtkX~f&qbv;7Zun>)WmP1#w)h%
z2T+Ilxb+NrfBs*fP@f0ipzgQ-T(jbasP-h(i!Y)dPC*Sk11sSxs4dJz1-`=8*I759
zGMbMXrw|q3{<-8|D?dqtQudYYa1XVj2e$4<n(9$6k4j;jwIyocPN+coV?9j68n_4>
z;%01$pP(}N8)^Zbc@*kU2%Kk98H07HH%ITGLQbiZj@k+r^?WI6B|A}PVh<`aAE5#~
zfm-1?)S<qP(fBPY;DA@n_%&S$V?0EMZ}4E%e6xqK3(SgIpeE{y+S}()DISdVa0F_=
zx%d?3VI&^KA$S8jVB3XeD`#UI_06dF+%pt(J+7lt^&9GgQ+E-cP3()&I0tpD3Q${h
z9F@v{p;r7g>M)j}R{jvRg@KFBHLZr~*Bt%vX=Gup(}h9+4Lz+X)}g4CkFuttGVqdp
zKHJvkp{{8TCgXNgfMpnfk8IuZn)yCdMm=wU-hcnMqM(SnqA&JB9j3mh6pcZxC=<29
zMW~gnMg_FZK7ZFfKZrVfpQ1AKE$ZytLv7I?*czW)LV%n<XEX&JqIA?&WTFOGhI(-a
z2I3x6pa)Qa9z|`*3F{B207G)jcr{QNh(Yy_Lynr$41+NNz5kWbp2GVy3`4Cn<aN`b
z7Wz@Ij~b{EhF~+)eQ#&mJD@U^j0$*&Z6AjkZz3wNEL+b(UHc8Mv;W;G?4m)3?RN~p
z`b*8VY>I8D_r`|!8Y+c_sB3v0wf7IOHiqSzz~fMvYKcME9+kmlTknm*)Cc8~e?1sQ
zLmZ}~4#!$lgga2r58C>1>t)o6?qPZS)7FEQnH5(<z1INs{3&ZYEJwYYtq*W1XvL#Z
zsm?$JFcq8Od{pX-P-o%*YTyf40k7J68EU0JqrMA|P=~bEa`VAzgc`paYW&`)GvSV)
zpclv3hKZ;Nrl2w~6LrXPQGpbqR<IA%uf*0*qf&YawV-cMU)DPqjlnC-AEle1GBObf
z$aQ8>NT4AbE8uSPz&V1thR1FDMbw^uhoSfgwa39L&3j?iI;i$oY=-gZy~g+?^-Sw#
z^kshMBn2I^Gk6jG^UR^TiV@TwpjK3Am04kJRJ{QzrSTYsEm47W#mYDkm9ccx^C_t3
zE^496Q9sa}d<shCJE#<XfZCFSs69G?n&=d2;!@OrmoWx!qs~U?YV-YQi0ao7wN*V(
z{Rg4uc>(p_WOPd?tf4R*2d^=QWiKl7e_<oMiu!5jzt%(^feNe<s$Ub-hpPoD^}SFF
zNx?WAh6*SLm4P+3zI`qE*B<YpL3?`?bvV924SdtK-$4!Nv(7v(k3Ff^M6D<dE8-;7
zM00I>4k~kbs6f`CGIAWp<7ey0zf#j?z4@YbM-9*m2jO7M#a*}<+r44_C|!a>sE2JZ
z1E!-^HUo8L7N8ce1@&*o9jJ+qSxZq1z2Z`+OyL$P6MxtT<^EynHBk4tF)FYgsKYZ5
zm65Tii6@~lF$c9Z3sEayVqIq2SK0bHTX#27;QTmSP~Y@~jppzrVh`#aY&{1x@hVin
z1*m|EP#HXe)$tsv-!1$6S5%;nt-<-`jD#ca^Z!2-^g?}9#0jVswL+z=D{8_NR7%q@
z95d|md8pfxYoD)09m0InxZA9|Q42hRO8qg6(EUH>EjZ4<u_+G%HklV&qB=f<Rj?mc
z!xyaCs1>h4rT#tC#KovBIAGh4*!m~d)3*H_dVl_3qM#LCL!ILLsI%bNYz7WT)gw?7
zHo=;hjJo$DQ7fH=%EV$+Kr5{4ZTl8f2H!>nScu;L|1YAT$Pb`iJc`=0Q`Y}Q?e$mo
z`46bA`U&;kuc%BtLTz2(7V~~JRC^?<e-qoDVC(I-kbkYHGY#77p%{;8*bdiYd%S>E
zv0{PQ`v#~VN^Mbr4o7X>i>N@?qbA&jiTD<JGmPF0qcY{$>Y7x9Y&C{r7amkbrF0N#
zMdMJJnT|?bmeoZass*S37o!5o#|Yek8m9!6sq?6bFQEeZS_3GeUr^V`cbl0o9MvHT
z>tZ5mfB~qpkcwJi2G+r;*bG;oQhpSlz*1C3f5HTOV!H`+0BU@90tKZ$8?_ZV_Q6)v
zK*gwtkD;#JX;dbzqf&j#KL6SJ$hP~wX?_t2MfGorx;?Eh4WB~}qw5q?Pyh!}6P-j&
zeBN|$u3;4Qo2Zos{?k|!b(&*QnM**umt^aGY<(nZ3o}sTXJIlf#Id^nrzt2kPwg<@
z{L$E!`iB^e|3U3-^|#DQnxIyah)Q8E)LxH7?RAzl$F{FWO<aUpz#-Iv&!PAJe@P*b
zh8w7}P=?xyN2rdK-!_M?E^44C^ut)xcc2++g*`9;huZom)caFV0cW8CT!oFW0A25%
zQfNcNb&SIr?~qatX+ljjaHn}O6}9K-s8c>2eK8v~(W|z78EV4y$Y<Z#h5p#%UGpXF
ziwY#|UGlF_>vS4Ia0zPQ)waF~6~No5J$~P|A4cu<Dbz$4?en|Xfcjskj6}a@`XyL9
zqUPy^3TW_q?7un=r$G~CpaPhR+KMdH*5qOku0f@E6KbG0QP->x_1@>GepgYMxryq3
z8`b|O)RsNMIIQBnZ+;o<j4fz*1!J%fJK{yWf>n2!zt{bQW2x6FG#{$DsKZ)<z433<
zdp&oXKT0n}eLrsD_vrtD`J?n5>_pvdvd8>kU@|tMVKq*`!>AQJS!7Zlhgw;CRO*sZ
zndymIVSns`sW=KZTOXsw8C7f?hk8F9%j^D6rVvI$mT7R7qEht+>K1IrT6hq(RhLlL
z=zG*pzlW$TsJPc$!vxfX&!GZLLG?>TjW->&wM)@Y_dlP4BHD_2@h$HI$9Weu(Qb^y
z64V}lhdy`@75IHr2AqB776c+IbHY()DiReyjD6k#mB}8G`JMh0w8CMi7iOXcn1hNm
z2X$!vfm%^9YKsnGIc&J!1l}AKU@O!(oly(uikff;4#Lsc6F)@n&wsxU%}UClUW`Bu
z6p88B7%SjvoQGR69;5!p{Nr>0E~P%h)|~?;;7D9cds~db^VkG`!#u2iko>oyu<xMx
ztMq+rOg;0E`J;3JZlLaS*!)pCANy0kgK60Di20rFpV*T6IV?s0k4&H!up{*WM@@#-
zpfd3W>MU(NO8&K%yKO@eR;FHpYQKm&6PK|yeudhCs>e*G>Y(~Zp|&CsbtXEa`t?Jd
zt)W;QN80w8r~q7-f?imT;kX$!@g7v9d#y)MTXPaM(OJ|PxorI&)&Cb;{}ZcH4=OSJ
z>Y~n4Eb6efM~&xpp`g9)hE*^H708RWo`qV$O4N(%PyuX0UDJ1Lz1Vsbbym)zR`?|<
zurgc!1vQ@MxHq$|6G*{_hH}<W)XFMh3f9G;I2CK)8GH?IqEei3!mMNlYT((ZQ}3e2
z%|ivg#@07lH)Cbp|E&}>P%&yN4xut}7L~Fa_W3WU6+N=`;E&CxxDqOZnN}BdCUQ`L
z<l_+Bg<3%1C+3e?k=T^^oo*ETa2EPwHYVW$48TuN1D2u!{RV5|ZPZryoHRcJLQ&7V
zqcYeJHSP%1xMNWZ9FM*@8>>cB$flqPwyFV(i^}3Y^C5Xf2bym4_1r2N-h7M4XNRZg
zzb(G>_gUbq{<3XbPtfYB?e_bW`V^gO7vu@9pOra1ZQA&8*+r=fp7$?mp47Z!VC%Mt
Tt=h)7E}Hb}o&Voq%rpN7IxJt(

delta 11580
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

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
index 6a1d966..4ac4724 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: Thu Apr 16 16:35:11 2015\n"
+"POT-Creation-Date: Thu Apr 16 18:57:18 2015\n"
 "PO-Revision-Date: 2015-04-15 17:00+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -32,33 +32,33 @@ msgstr "Object deleted"
 msgid "Please rename each listed object."
 msgstr "Please rename each listed object."
 
-#: n/RegistrationTool.py:267
+#: n/RegistrationTool.py:266
 msgid "Complete your registration on the %s website"
 msgstr "Complete your registration on the %s website"
 
-#: n/RegistrationTool.py:269
+#: n/RegistrationTool.py:268
 msgid "How to reset your password on the %s website"
 msgstr "How to reset your password on the %s website"
 
-#: n/RegistrationTool.py:287
+#: n/RegistrationTool.py:286
 msgid "Unknown user name. Please retry."
 msgstr "Unknown user name. Please retry."
 
-#: n/RegistrationTool.py:302
+#: n/RegistrationTool.py:301
 msgid "Invalid reset password request."
 msgstr "Invalid reset password request."
 
-#: n/RegistrationTool.py:308
+#: n/RegistrationTool.py:307
 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:317
+#: n/RegistrationTool.py:316
 msgid "Password successfully updated."
 msgstr "Password successfully updated."
 
-#: n/RegistrationTool.py:319
-msgid "\"%s\" username not found."
-msgstr "\"%s\" username not found."
+#: n/RegistrationTool.py:318
+msgid "\"${userid}\" username not found."
+msgstr "\"${userid}\" username not found."
 
 #: n/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py:52
 #: n/profiles/default/workflows/folder_workflow/scripts/sendNotificationEmail.py:52
@@ -600,7 +600,7 @@ msgstr "More..."
 msgid "Success!"
 msgstr "Success!"
 
-#: n/skins/custom_generic/join_form.py:67
+#: n/skins/custom_generic/join_form.py:68
 #: n/skins/photo_theme/photo_main_macros.pt:28
 msgid "Join"
 msgstr "Join"
@@ -681,17 +681,17 @@ msgstr "Email address"
 msgid "use as login"
 msgstr "use as login"
 
-#: n/skins/custom_generic/join_template.pt:85
+#: n/skins/custom_generic/join_template.pt:86
 msgid "login"
 msgstr "login"
 
-#: n/skins/custom_generic/join_template.pt:93
+#: n/skins/custom_generic/join_template.pt:94
 #: 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:99
+#: n/skins/custom_generic/join_template.pt:100
 msgid "Password (confirm)"
 msgstr "Password (confirm)"
 
@@ -2941,6 +2941,9 @@ msgstr "Directory"
 msgid "Configure portal"
 msgstr "Configure portal"
 
+#~ msgid "\"%s\" username not found."
+#~ msgstr "\"%s\" username not found."
+
 #~ msgid "Your personal login to log in later is:"
 #~ msgstr "Your personal login to log in later is:"
 
diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo
index 39d163397eccf9c51fea023720c91239c6357e87..0f0ede2a96a8a94c49f061cf6bf254c5bd8e0eb7 100644
GIT binary patch
delta 11605
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
O4;KD^-}7^S%lID%z=ucx

delta 11617
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
F{(t-Kn$G|L

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index 2ac8829..da60150 100644
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Thu Apr 16 16:35:11 2015\n"
+"POT-Creation-Date: Thu Apr 16 18:57:18 2015\n"
 "PO-Revision-Date: 2015-04-15 15:06+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
@@ -24,35 +24,35 @@ msgstr "Objet supprimé"
 msgid "Please rename each listed object."
 msgstr "Veuillez renommer tous les éléments listés."
 
-#: n/RegistrationTool.py:267
+#: n/RegistrationTool.py:266
 msgid "Complete your registration on the %s website"
 msgstr "Terminer votre inscription sur le site %s"
 
-#: n/RegistrationTool.py:269
+#: n/RegistrationTool.py:268
 msgid "How to reset your password on the %s website"
 msgstr "Comment réinitialiser votre mot de passe sur le site %s"
 
-#: n/RegistrationTool.py:287
+#: n/RegistrationTool.py:286
 msgid "Unknown user name. Please retry."
 msgstr "Nom d'utilisateur inconnu. Veuillez réessayer."
 
-#: n/RegistrationTool.py:302
+#: n/RegistrationTool.py:301
 msgid "Invalid reset password request."
 msgstr "Demande de réinitialisation de mot de passe invalide."
 
-#: n/RegistrationTool.py:308
+#: n/RegistrationTool.py:307
 msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 "Votre demande de réinitialisation de mot de passe a expiré. Vous pouvez en "
 "demander une nouvelle."
 
-#: n/RegistrationTool.py:317
+#: n/RegistrationTool.py:316
 msgid "Password successfully updated."
 msgstr "Mot de passe correctement mis à jour."
 
-#: n/RegistrationTool.py:319
-msgid "\"%s\" username not found."
-msgstr "Nom : « %s » non trouvé."
+#: n/RegistrationTool.py:318
+msgid "\"${userid}\" username not found."
+msgstr "Identifiant « ${userid} » non trouvé."
 
 #: n/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py:52
 #: n/profiles/default/workflows/folder_workflow/scripts/sendNotificationEmail.py:52
@@ -593,7 +593,7 @@ msgstr "Plus…"
 msgid "Success!"
 msgstr "Succès !"
 
-#: n/skins/custom_generic/join_form.py:67
+#: n/skins/custom_generic/join_form.py:68
 #: n/skins/photo_theme/photo_main_macros.pt:28
 msgid "Join"
 msgstr "S'inscrire"
@@ -674,17 +674,17 @@ msgstr "Adresse e-mail"
 msgid "use as login"
 msgstr "utiliser comme identifiant"
 
-#: n/skins/custom_generic/join_template.pt:85
+#: n/skins/custom_generic/join_template.pt:86
 msgid "login"
 msgstr "identifiant"
 
-#: n/skins/custom_generic/join_template.pt:93
+#: n/skins/custom_generic/join_template.pt:94
 #: 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 "Mot de passe"
 
-#: n/skins/custom_generic/join_template.pt:99
+#: n/skins/custom_generic/join_template.pt:100
 msgid "Password (confirm)"
 msgstr "Confirmation"
 
@@ -2960,6 +2960,9 @@ msgstr "Annuaire"
 msgid "Configure portal"
 msgstr "Configurer portail"
 
+#~ msgid "\"%s\" username not found."
+#~ msgstr "Nom : « %s » non trouvé."
+
 #~ msgid ""
 #~ "You will receive an email shortly containing your password and "
 #~ "instructions on how to activate your membership."
diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot
index 23989b6..00797b7 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: Thu Apr 16 16:35:11 2015\n"
+"POT-Creation-Date: Thu Apr 16 18:57:18 2015\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -31,32 +31,32 @@ msgstr ""
 msgid "Please rename each listed object."
 msgstr ""
 
-#: n/RegistrationTool.py:267
+#: n/RegistrationTool.py:266
 msgid "Complete your registration on the %s website"
 msgstr ""
 
-#: n/RegistrationTool.py:269
+#: n/RegistrationTool.py:268
 msgid "How to reset your password on the %s website"
 msgstr ""
 
-#: n/RegistrationTool.py:287
+#: n/RegistrationTool.py:286
 msgid "Unknown user name. Please retry."
 msgstr ""
 
-#: n/RegistrationTool.py:302
+#: n/RegistrationTool.py:301
 msgid "Invalid reset password request."
 msgstr ""
 
-#: n/RegistrationTool.py:308
+#: n/RegistrationTool.py:307
 msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 
-#: n/RegistrationTool.py:317
+#: n/RegistrationTool.py:316
 msgid "Password successfully updated."
 msgstr ""
 
-#: n/RegistrationTool.py:319
-msgid "\"%s\" username not found."
+#: n/RegistrationTool.py:318
+msgid "\"${userid}\" username not found."
 msgstr ""
 
 #: n/profiles/default/workflows/default_workflow/scripts/sendNotificationEmail.py:52
@@ -600,7 +600,7 @@ msgstr ""
 msgid "Success!"
 msgstr ""
 
-#: n/skins/custom_generic/join_form.py:67
+#: n/skins/custom_generic/join_form.py:68
 #: n/skins/photo_theme/photo_main_macros.pt:28
 msgid "Join"
 msgstr ""
@@ -664,18 +664,18 @@ msgstr ""
 msgid "use as login"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:85
+#: n/skins/custom_generic/join_template.pt:86
 msgid "login"
 msgstr ""
 
-#: n/skins/custom_generic/join_template.pt:93
+#: n/skins/custom_generic/join_template.pt:94
 #: 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:99
+#: n/skins/custom_generic/join_template.pt:100
 msgid "Password (confirm)"
 msgstr ""
 
diff --git a/Products/Plinn/skins/custom_generic/join_form.py b/Products/Plinn/skins/custom_generic/join_form.py
index d65c8ef..8e82159 100644
--- a/Products/Plinn/skins/custom_generic/join_form.py
+++ b/Products/Plinn/skins/custom_generic/join_form.py
@@ -1,4 +1,4 @@
-##parameters=member_id='', given_name='', name='', member_email='', email_as_login='', password='', confirm='', add='', ajax=''
+##parameters=member_id='', given_name='', name='', member_email='', password='', confirm='', add='', ajax=''
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.permissions import ManageUsers
@@ -6,7 +6,6 @@ from Products.Plinn.RegistrationTool import MODE_ANONYMOUS, MODE_REVIEWED
 from Products.Plinn.utils import translate
 def _(message) : return translate(message, context).encode('utf-8')
 
-
 mtool = getToolByName(script, 'portal_membership')
 ptool = getToolByName(script, 'portal_properties')
 rtool = getToolByName(script, 'portal_registration')
@@ -18,8 +17,8 @@ is_anon = mtool.isAnonymousUser()
 is_newmember = False
 is_usermanager = mtool.checkPermission(ManageUsers, mtool)
 
-
 form = context.REQUEST.form
+email_as_login = bool(form.get('email_as_login', True if context.REQUEST.method == 'GET' else False))
 
 if add :
     if validate_email :
@@ -31,24 +30,26 @@ if add :
         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})
+
+            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)
+            context.setStatus(False, errmsg)
     
 options = {}
 options['member_id'] = member_id
 options['given_name'] = given_name
 options['name'] = name
 options['member_email'] = member_email
+options['email_as_login'] = email_as_login
 options['password'] = is_newmember and context.REQUEST.get('password', '') or ''
 options['portal_url'] = portal_url
 options['isAnon'] = is_anon
@@ -60,12 +61,12 @@ options['isReviewedRegistration'] = rtool.getMode() == MODE_REVIEWED
 
 buttons = []
 if is_newmember:
-	target = atool.getActionInfo('user/logged_in')['url']
-	buttons.append( {'name': 'login', 'value': 'Log in'} )
+    target = atool.getActionInfo('user/logged_in')['url']
+    buttons.append( {'name': 'login', 'value': 'Log in'} )
 else:
-	target = atool.getActionInfo('user/join')['url']
-	buttons.append( {'name': 'add', 'value': _('Join')} )
+    target = atool.getActionInfo('user/join')['url']
+    buttons.append( {'name': 'add', 'value': _('Join')} )
 options['form'] = { 'action': target,
-					'listButtonInfos': tuple(buttons) }
+                    'listButtonInfos': tuple(buttons) }
 options['ajax']=ajax
 return context.join_template(**options)
diff --git a/Products/Plinn/skins/custom_generic/join_template.pt b/Products/Plinn/skins/custom_generic/join_template.pt
index 3434f56..4ac140b 100644
--- a/Products/Plinn/skins/custom_generic/join_template.pt
+++ b/Products/Plinn/skins/custom_generic/join_template.pt
@@ -54,7 +54,7 @@
         </div>
         
         <div tal:condition="options/isAnon">
-          <form method="post" tal:attributes="action form/action">
+          <form method="post" tal:attributes="action form/action" id="registration-form">
             <table>
               <tr>
                 <td>
@@ -75,12 +75,13 @@
                          tal:attributes="value options/member_email|nothing"/>
                   <label>
                     <input type="checkbox" name="email_as_login" value="email_as_login"
-                           tal:attributes="checked python:options.get('email_as_login', True)"/>
+                           tal:attributes="checked python:options['email_as_login']"/>
                     <span tal:omit-tag="" i18n:translate="">use as login</span>
                   </label>
                 </td>
               </tr>
-              <tr>
+              <tr id="login-row"
+                  tal:attributes="class python:'hidden' if options['email_as_login'] else nothing">
                 <td colspan="2">
                   <input type="text" name="member_id"
                          placeholder="login" i18n:attributes="placeholder"
@@ -108,6 +109,22 @@
               </tr>
             </table>
           </form>
+          <script type="text/javascript">
+            (function(){
+              var login_row = document.getElementById('login-row');
+              var form = document.getElementById('registration-form');
+              var cb = form.elements.namedItem('email_as_login');
+              addListener(cb,
+                          'change',
+                          function(){
+                            if (cb.checked)
+                              login_row.className = 'hidden';
+                            else
+                              login_row.className = null;
+                          }
+                          );
+            }());
+          </script>
         </div>
         
       </div>
-- 
2.20.1


From a50de52db3f62879126c92929bcdf697e02e6944 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Thu, 16 Apr 2015 19:15:12 +0200
Subject: [PATCH 07/16] post

---
 Products/Plinn/skins/custom_generic/join_template.pt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Products/Plinn/skins/custom_generic/join_template.pt b/Products/Plinn/skins/custom_generic/join_template.pt
index 4ac140b..db6c7f6 100644
--- a/Products/Plinn/skins/custom_generic/join_template.pt
+++ b/Products/Plinn/skins/custom_generic/join_template.pt
@@ -27,7 +27,7 @@
           </p>
           <tal:case tal:condition="not: options/validate_email">
             <p i18n:translate="">Click the button to log in immediately.</p>
-            <form tal:attributes="action form/action">
+            <form tal:attributes="action form/action" method="post">
               <input type="hidden" name="__ac_name" tal:attributes="value options/member_id"/>
               <input type="hidden" name="__ac_password" tal:attributes="value options/password"/>
               <input type="hidden" name="noAjax" value="1"/>
-- 
2.20.1


From f6d33133b4aad57e7050117a99e2adad711e118b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Fri, 17 Apr 2015 10:08:32 +0200
Subject: [PATCH 08/16] =?utf8?q?8=20caract=C3=A8res=20requis=20pour=20un?=
 =?utf8?q?=20mot=20de=20passe.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Products/Plinn/RegistrationTool.py | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/Products/Plinn/RegistrationTool.py b/Products/Plinn/RegistrationTool.py
index fff500e..3e04db1 100644
--- a/Products/Plinn/RegistrationTool.py
+++ b/Products/Plinn/RegistrationTool.py
@@ -35,6 +35,7 @@ from Products.CMFCore.exceptions import AccessControl_Unauthorized
 from Products.CMFDefault.exceptions import EmailAddressInvalid
 from Products.CMFCore.utils import getToolByName
 from Products.CMFCore.utils import getUtilityByInterfaceName
+from Products.CMFCore.utils import _checkPermission
 from Products.CMFDefault.utils import checkEmailAddress
 from Products.GroupUserFolder.GroupsToolPermissions import ManageGroups
 from Products.Plinn.utils import Message as _
@@ -217,6 +218,27 @@ class RegistrationTool(BaseRegistrationTool) :
             BaseRegistrationTool.addMember(self, id, password, roles=roles,
                                            domains=domains, properties=properties)
 
+    security.declarePublic( 'testPasswordValidity' )
+    def testPasswordValidity(self, password, confirm=None):
+
+        """ Verify that the password satisfies the portal's requirements.
+
+        o If the password is valid, return None.
+        o If not, return a string explaining why.
+        """
+        if not password:
+            return _(u'You must enter a password.')
+
+        if len(password) < 8 and not _checkPermission(ManagePortal, self):
+            return _(u'Your password must contain at least 8 characters.')
+
+        if confirm is not None and confirm != password:
+            return _(u'Your password and confirmation did not match. '
+                     u'Please try again.')
+
+        return None
+
+
 
     def afterAdd(self, member, id, password, properties):
         """ notify member creation """
-- 
2.20.1


From 2701c45ef3dd3b77599ced2495ba3955e354a17e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Fri, 17 Apr 2015 10:09:09 +0200
Subject: [PATCH 09/16] Finitions sur le formulaire d'inscription.

---
 .../Plinn/locales/en/LC_MESSAGES/plinn.mo     | Bin 51146 -> 51476 bytes
 .../Plinn/locales/en/LC_MESSAGES/plinn.po     |  28 +++++++++++++-----
 .../Plinn/locales/fr/LC_MESSAGES/plinn.mo     | Bin 55003 -> 55361 bytes
 .../Plinn/locales/fr/LC_MESSAGES/plinn.po     |  28 +++++++++++++-----
 Products/Plinn/locales/plinn.pot              |  28 +++++++++++++-----
 .../skins/custom_generic/join_template.pt     |   6 ++--
 6 files changed, 63 insertions(+), 27 deletions(-)

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo
index da9314c7e94750c8ceed03a2553b2cb5e6818e84..5a02e61fe352a456c3f339e98218e65fb87c66c0 100644
GIT binary patch
delta 13092
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
WrtT@26p-=%A6$svp52El2L3O@xr0Uk

delta 12819
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

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
index 4ac4724..efb623e 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: Thu Apr 16 18:57:18 2015\n"
+"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n"
 "PO-Revision-Date: 2015-04-15 17:00+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -32,31 +32,43 @@ msgstr "Object deleted"
 msgid "Please rename each listed object."
 msgstr "Please rename each listed object."
 
-#: n/RegistrationTool.py:266
+#: n/RegistrationTool.py:230
+msgid "You must enter a password."
+msgstr "You must enter a password."
+
+#: n/RegistrationTool.py:233
+msgid "Your password must contain at least 8 characters."
+msgstr "Your password must contain at least 8 characters."
+
+#: n/RegistrationTool.py:236
+msgid "Your password and confirmation did not match. Please try again."
+msgstr "Your password and confirmation did not match. Please try again."
+
+#: n/RegistrationTool.py:288
 msgid "Complete your registration on the %s website"
 msgstr "Complete your registration on the %s website"
 
-#: n/RegistrationTool.py:268
+#: n/RegistrationTool.py:290
 msgid "How to reset your password on the %s website"
 msgstr "How to reset your password on the %s website"
 
-#: n/RegistrationTool.py:286
+#: n/RegistrationTool.py:308
 msgid "Unknown user name. Please retry."
 msgstr "Unknown user name. Please retry."
 
-#: n/RegistrationTool.py:301
+#: n/RegistrationTool.py:323
 msgid "Invalid reset password request."
 msgstr "Invalid reset password request."
 
-#: n/RegistrationTool.py:307
+#: n/RegistrationTool.py:329
 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:316
+#: n/RegistrationTool.py:338
 msgid "Password successfully updated."
 msgstr "Password successfully updated."
 
-#: n/RegistrationTool.py:318
+#: n/RegistrationTool.py:340
 msgid "\"${userid}\" username not found."
 msgstr "\"${userid}\" username not found."
 
diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo
index 0f0ede2a96a8a94c49f061cf6bf254c5bd8e0eb7..e7103f57701328a50815ae17c98979ae141c4cb2 100644
GIT binary patch
delta 13102
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
I7g^+g0VxBt(EtDd

delta 12814
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

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index da60150..e075be8 100644
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Thu Apr 16 18:57:18 2015\n"
+"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n"
 "PO-Revision-Date: 2015-04-15 15:06+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
@@ -24,33 +24,45 @@ msgstr "Objet supprimé"
 msgid "Please rename each listed object."
 msgstr "Veuillez renommer tous les éléments listés."
 
-#: n/RegistrationTool.py:266
+#: n/RegistrationTool.py:230
+msgid "You must enter a password."
+msgstr "Vous devez entrer un mot de passe."
+
+#: n/RegistrationTool.py:233
+msgid "Your password must contain at least 8 characters."
+msgstr "Votre mot de passe doit comporter au moins 8 caractères."
+
+#: n/RegistrationTool.py:236
+msgid "Your password and confirmation did not match. Please try again."
+msgstr "Votre mot de passe et sa confirmation sont différents. Essayez à nouveau."
+
+#: n/RegistrationTool.py:288
 msgid "Complete your registration on the %s website"
 msgstr "Terminer votre inscription sur le site %s"
 
-#: n/RegistrationTool.py:268
+#: n/RegistrationTool.py:290
 msgid "How to reset your password on the %s website"
 msgstr "Comment réinitialiser votre mot de passe sur le site %s"
 
-#: n/RegistrationTool.py:286
+#: n/RegistrationTool.py:308
 msgid "Unknown user name. Please retry."
 msgstr "Nom d'utilisateur inconnu. Veuillez réessayer."
 
-#: n/RegistrationTool.py:301
+#: n/RegistrationTool.py:323
 msgid "Invalid reset password request."
 msgstr "Demande de réinitialisation de mot de passe invalide."
 
-#: n/RegistrationTool.py:307
+#: n/RegistrationTool.py:329
 msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 "Votre demande de réinitialisation de mot de passe a expiré. Vous pouvez en "
 "demander une nouvelle."
 
-#: n/RegistrationTool.py:316
+#: n/RegistrationTool.py:338
 msgid "Password successfully updated."
 msgstr "Mot de passe correctement mis à jour."
 
-#: n/RegistrationTool.py:318
+#: n/RegistrationTool.py:340
 msgid "\"${userid}\" username not found."
 msgstr "Identifiant « ${userid} » non trouvé."
 
diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot
index 00797b7..8c18e8a 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: Thu Apr 16 18:57:18 2015\n"
+"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -31,31 +31,43 @@ msgstr ""
 msgid "Please rename each listed object."
 msgstr ""
 
-#: n/RegistrationTool.py:266
+#: n/RegistrationTool.py:230
+msgid "You must enter a password."
+msgstr ""
+
+#: n/RegistrationTool.py:233
+msgid "Your password must contain at least 8 characters."
+msgstr ""
+
+#: n/RegistrationTool.py:236
+msgid "Your password and confirmation did not match. Please try again."
+msgstr ""
+
+#: n/RegistrationTool.py:288
 msgid "Complete your registration on the %s website"
 msgstr ""
 
-#: n/RegistrationTool.py:268
+#: n/RegistrationTool.py:290
 msgid "How to reset your password on the %s website"
 msgstr ""
 
-#: n/RegistrationTool.py:286
+#: n/RegistrationTool.py:308
 msgid "Unknown user name. Please retry."
 msgstr ""
 
-#: n/RegistrationTool.py:301
+#: n/RegistrationTool.py:323
 msgid "Invalid reset password request."
 msgstr ""
 
-#: n/RegistrationTool.py:307
+#: n/RegistrationTool.py:329
 msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 
-#: n/RegistrationTool.py:316
+#: n/RegistrationTool.py:338
 msgid "Password successfully updated."
 msgstr ""
 
-#: n/RegistrationTool.py:318
+#: n/RegistrationTool.py:340
 msgid "\"${userid}\" username not found."
 msgstr ""
 
diff --git a/Products/Plinn/skins/custom_generic/join_template.pt b/Products/Plinn/skins/custom_generic/join_template.pt
index db6c7f6..d5deaca 100644
--- a/Products/Plinn/skins/custom_generic/join_template.pt
+++ b/Products/Plinn/skins/custom_generic/join_template.pt
@@ -70,7 +70,7 @@
               </tr>
               <tr>
                 <td colspan="2">
-                  <input type="text" name="member_email"
+                  <input type="text" name="member_email" size="30"
                          placeholder="Email address" i18n:attributes="placeholder"
                          tal:attributes="value options/member_email|nothing"/>
                   <label>
@@ -91,13 +91,13 @@
               <tbody tal:condition="not: options/validate_email" tal:omit-tag="">
                 <tr>
                   <td colspan="2">
-                    <input type="password" name="password"
+                    <input type="password" name="password" size="25"
                            placeholder="Password" i18n:attributes="placeholder"/>
                   </td>
                 </tr>
                 <tr>
                   <td colspan="2">
-                    <input type="password" name="confirm"
+                    <input type="password" name="confirm" size="25"
                            placeholder="Password (confirm)" i18n:attributes="placeholder"/>
                   </td>
                 </tr>
-- 
2.20.1


From 3ea03165707ec21e141b91c554596bc440872312 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Fri, 17 Apr 2015 10:15:49 +0200
Subject: [PATCH 10/16] xmllint

---
 .../skins/custom_generic/reconfig_template.pt | 273 +++++++++---------
 1 file changed, 134 insertions(+), 139 deletions(-)

diff --git a/Products/Plinn/skins/custom_generic/reconfig_template.pt b/Products/Plinn/skins/custom_generic/reconfig_template.pt
index 65adf82..22425ae 100644
--- a/Products/Plinn/skins/custom_generic/reconfig_template.pt
+++ b/Products/Plinn/skins/custom_generic/reconfig_template.pt
@@ -1,149 +1,144 @@
-<html metal:use-macro="context/main_template/macros/master">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
-</head>
-<body metal:fill-slot="main_no_tabs" i18n:domain="plinn" tal:omit-tag="" tal:define="form options/form">
-
-<h1 i18n:translate="">Configure the Portal</h1>
-
-<div class="config">
-
-<p i18n:translate="">This form is used to set the portal configuration
+<?xml version="1.0" encoding="utf-8"?>
+<html xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:i18n="http://xml.zope.org/namespaces/i18n" metal:use-macro="context/main_template/macros/master">
+  <head>
+    <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
+  </head>
+  <body metal:fill-slot="main_no_tabs" i18n:domain="plinn" tal:omit-tag="" tal:define="form options/form">
+    <h1 i18n:translate="">Configure the Portal</h1>
+    <div class="config">
+      <p i18n:translate="">This form is used to set the portal configuration
   options.</p>
-
-<form method="post" tal:attributes="action form/action">
-<table class="TwoColumnForm">
- <tr>
-  <th i18n:translate="">Portal 'From' name</th>
-  <td>
-   <input name="email_from_name" value=""
-      tal:attributes="value form/email_from_name" />
-   <dl class="FieldHelp">
-    <dd i18n:translate="">When the portal generates mail, it uses this name as
+      <form method="post" tal:attributes="action form/action">
+        <table class="TwoColumnForm">
+          <tr>
+            <th i18n:translate="">Portal 'From' name</th>
+            <td>
+              <input name="email_from_name" value="" tal:attributes="value form/email_from_name"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate="">When the portal generates mail, it uses this name as
      its (apparent) sender.</dd>
-   </dl>
-  </td>
- </tr>
- <tr>
-  <th i18n:translate="">Portal 'From' address</th>
-  <td>
-   <input name="email_from_address" value=""
-      tal:attributes="value form/email_from_address" />
-   <dl class="FieldHelp">
-    <dd i18n:translate="">When the portal generates mail, it uses this address
+              </dl>
+            </td>
+          </tr>
+          <tr>
+            <th i18n:translate="">Portal 'From' address</th>
+            <td>
+              <input name="email_from_address" value="" tal:attributes="value form/email_from_address"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate="">When the portal generates mail, it uses this address
      as its (apparent) return address.</dd>
-   </dl>
-  </td>
- </tr>
- <tr>
-  <th i18n:translate="">SMTP server</th>
-  <td>
-   <input name="smtp_server" value=""
-      tal:attributes="value form/smtp_server" />
-   <dl class="FieldHelp">
-    <dd i18n:translate="">This is the address of your local SMTP (out-going
+              </dl>
+            </td>
+          </tr>
+          <tr>
+            <th i18n:translate="">SMTP server</th>
+            <td>
+              <input name="smtp_server" value="" tal:attributes="value form/smtp_server"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate="">This is the address of your local SMTP (out-going
      mail) server.</dd>
-   </dl>
-  </td>
- </tr>
- <tr>
-  <th i18n:translate="">Portal title</th>
-  <td>
-   <input name="title" value="" tal:attributes="value form/title" />
-   <dl class="FieldHelp">
-    <dd i18n:translate="">This is the title which appears at the top of every
+              </dl>
+            </td>
+          </tr>
+          <tr>
+            <th i18n:translate="">Portal title</th>
+            <td>
+              <input name="title" value="" tal:attributes="value form/title"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate="">This is the title which appears at the top of every
      portal page.</dd>
-   </dl>
-  </td>
- </tr>
- <tr>
-  <th i18n:translate="">Portal description</th>
-  <td class="TextField">
-   <textarea name="description" rows="3" cols="40" tal:content="form/description"></textarea>
-   <dl class="FieldHelp">
-    <dd i18n:translate=""> This description is made available via syndicated
+              </dl>
+            </td>
+          </tr>
+          <tr>
+            <th i18n:translate="">Portal description</th>
+            <td class="TextField">
+              <textarea name="description" rows="3" cols="40" tal:content="form/description"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate=""> This description is made available via syndicated
       content and elsewhere. It should be fairly brief.</dd>
-   </dl>
-  </td>
- </tr>
- <tr>
-  <th i18n:translate="">Keywords</th>
-  <td class="TextField">
-   <textarea name="keywords:lines" rows="6" cols="40" tal:content="form/keywords"></textarea>
-   <dl class="FieldHelp">
-    <dd i18n:translate="">Keywords describing the portal. Type one keyword (or expression) per line.</dd>
-   </dl>
-  </td>
- </tr>
- <tr i18n:domain="plinn">
-  <th i18n:translate="">Copyright notice</th>
-  <td class="TextField">
-   <input name="copyright_notice" value="" tal:attributes="value form/copyright_notice" />
-   <dl class="FieldHelp">
-    <dd i18n:translate="">Copyright notice displayed on the portal footer.</dd>
-   </dl>
-  </td>
- </tr>
- <tr>
-  <th i18n:translate="">Password policy</th>
-  <td><label>
-   <input type="radio" name="validate_email:boolean" value="True"
-      tal:attributes="checked form/validate_email" />
-   <tal:span i18n:translate="">Generate and email members' initial
-    password</tal:span></label>
-   <br /><label>
-   <input type="radio" name="validate_email:boolean" value="False"
-      tal:attributes="checked not:form/validate_email" />
-   <tal:span i18n:translate="">Allow members to select their initial
-    password</tal:span></label>
-  </td>
- </tr>
- <tr>
-  <th i18n:translate="">Portal default encoding</th>
-  <td>
-   <input name="default_charset" value="" disabled="disabled"
-      tal:attributes="value form/default_charset" />
-   <dl class="FieldHelp">
-    <dd i18n:translate="">Charset used to decode portal content strings.
+              </dl>
+            </td>
+          </tr>
+          <tr>
+            <th i18n:translate="">Keywords</th>
+            <td class="TextField">
+              <textarea name="keywords:lines" rows="6" cols="40" tal:content="form/keywords"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate="">Keywords describing the portal. Type one keyword (or expression) per line.</dd>
+              </dl>
+            </td>
+          </tr>
+          <tr i18n:domain="plinn">
+            <th i18n:translate="">Copyright notice</th>
+            <td class="TextField">
+              <input name="copyright_notice" value="" tal:attributes="value form/copyright_notice"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate="">Copyright notice displayed on the portal footer.</dd>
+              </dl>
+            </td>
+          </tr>
+          <tr>
+            <th i18n:translate="">Password policy</th>
+            <td>
+              <label>
+                <input type="radio" name="validate_email:boolean" value="True" tal:attributes="checked form/validate_email"/>
+                <tal:span i18n:translate="">Generate and email members' initial
+    password</tal:span>
+              </label>
+              <br/>
+              <label>
+                <input type="radio" name="validate_email:boolean" value="False" tal:attributes="checked not:form/validate_email"/>
+                <tal:span i18n:translate="">Allow members to select their initial
+    password</tal:span>
+              </label>
+            </td>
+          </tr>
+          <tr>
+            <th i18n:translate="">Portal default encoding</th>
+            <td>
+              <input name="default_charset" value="" disabled="disabled" tal:attributes="value form/default_charset"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate="">Charset used to decode portal content strings.
      If empty, 'ascii' is used.</dd>
-   </dl>
-  </td>
- </tr>
-  <tr>
-    <th i18n:translate="">
+              </dl>
+            </td>
+          </tr>
+          <tr>
+            <th i18n:translate="">
       Thumbnails size
     </th>
-    <td>
-      <input name="slide_size:int" value="" tal:attributes="value form/slide_size" size="5" />
-      <dl class="FieldHelp">
-        <dd i18n:translate="">This is the size of the thumbnails in the photo album, in pixels.</dd>
-      </dl>
-    </td>
-  </tr>
-    <tr i18n:domain="plinn">
-      <th i18n:translate="">Default ajax options</th>
-      <td>
-        <label>
-          <input type="checkbox" name="ajax_rootClickHandler:boolean" tal:attributes="checked form/ajax_rootClickHandler" />
-          <span i18n:translate="" tal:omit-tag="">Enable handling of all clicks over links</span>
-        </label>
-        <br/>
-        <label>
-          <input type="checkbox" name="ajax_autoFormManager:boolean" tal:attributes="checked form/ajax_autoFormManager" />
-          <span i18n:translate="" tal:omit-tag="">Enable handling of all forms submissions</span>
-        </label>
-      </td>
-    </tr>
-  <tr>
-  <td>&nbsp;</td>
-  <td>
-   <metal:macro metal:use-macro="context/form_widgets/macros/buttons" />
-  </td>
- </tr>
-</table>
-</form>
-
-</div>
-
-</body>
+            <td>
+              <input name="slide_size:int" value="" tal:attributes="value form/slide_size" size="5"/>
+              <dl class="FieldHelp">
+                <dd i18n:translate="">This is the size of the thumbnails in the photo album, in pixels.</dd>
+              </dl>
+            </td>
+          </tr>
+          <tr i18n:domain="plinn">
+            <th i18n:translate="">Default ajax options</th>
+            <td>
+              <label>
+                <input type="checkbox" name="ajax_rootClickHandler:boolean" tal:attributes="checked form/ajax_rootClickHandler"/>
+                <span i18n:translate="" tal:omit-tag="">Enable handling of all clicks over links</span>
+              </label>
+              <br/>
+              <label>
+                <input type="checkbox" name="ajax_autoFormManager:boolean" tal:attributes="checked form/ajax_autoFormManager"/>
+                <span i18n:translate="" tal:omit-tag="">Enable handling of all forms submissions</span>
+              </label>
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <br/>
+            </td>
+            <td>
+              <metal:macro metal:use-macro="context/form_widgets/macros/buttons"/>
+            </td>
+          </tr>
+        </table>
+      </form>
+    </div>
+  </body>
 </html>
-- 
2.20.1


From cb53449c564dc94a9eed16bc2a99006a78a1ec5a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Fri, 17 Apr 2015 10:43:56 +0200
Subject: [PATCH 11/16] Remaniement du formulaire de configuration du portail.

---
 .../Plinn/locales/en/LC_MESSAGES/plinn.mo     | Bin 51476 -> 51292 bytes
 .../Plinn/locales/en/LC_MESSAGES/plinn.po     |  86 +++++++------
 .../Plinn/locales/fr/LC_MESSAGES/plinn.mo     | Bin 55361 -> 55086 bytes
 .../Plinn/locales/fr/LC_MESSAGES/plinn.po     |  92 +++++++-------
 Products/Plinn/locales/plinn.pot              |  58 ++++-----
 .../skins/custom_generic/reconfig_form.py     |   1 -
 .../skins/custom_generic/reconfig_template.pt | 113 +++++++++++-------
 7 files changed, 192 insertions(+), 158 deletions(-)

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo
index 5a02e61fe352a456c3f339e98218e65fb87c66c0..d596a79bc2026b633e0aff15a3db55c5226fbb3d 100644
GIT binary patch
delta 15725
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
bsrdXy!Hngflu7kgObhw{HlWh)-_84f;sF(L

delta 15880
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
M|4n4{mdnNe2bo4q+yDRo

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
index efb623e..a22fbc7 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: Fri Apr 17 09:59:32 2015\n"
+"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n"
 "PO-Revision-Date: 2015-04-15 17:00+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -946,7 +946,7 @@ msgstr "Preferred languages"
 msgid "Please enter language codes separated by spaces."
 msgstr "Please enter language codes separated by spaces."
 
-#: n/skins/custom_generic/reconfig_template.pt:7
+#: n/skins/custom_generic/reconfig_template.pt:9
 msgid "Configure the Portal"
 msgstr "Configure the Portal"
 
@@ -964,11 +964,11 @@ msgid ""
 msgstr ""
 "When the portal generates mail, it uses this name as its (apparent) sender."
 
-#: n/skins/custom_generic/reconfig_template.pt:28
+#: n/skins/custom_generic/reconfig_template.pt:30
 msgid "Portal 'From' address"
 msgstr "Portal 'From' address"
 
-#: n/skins/custom_generic/reconfig_template.pt:33
+#: n/skins/custom_generic/reconfig_template.pt:35
 msgid ""
 "When the portal generates mail, it uses this address as its (apparent) "
 "return address."
@@ -976,27 +976,27 @@ msgstr ""
 "When the portal generates mail, it uses this address as its (apparent) "
 "return address."
 
-#: n/skins/custom_generic/reconfig_template.pt:39
+#: n/skins/custom_generic/reconfig_template.pt:43
 msgid "SMTP server"
 msgstr "SMTP server"
 
-#: n/skins/custom_generic/reconfig_template.pt:44
+#: n/skins/custom_generic/reconfig_template.pt:48
 msgid "This is the address of your local SMTP (out-going mail) server."
 msgstr "This is the address of your local SMTP (out-going mail) server."
 
-#: n/skins/custom_generic/reconfig_template.pt:50
+#: n/skins/custom_generic/reconfig_template.pt:56
 msgid "Portal title"
 msgstr "Portal title"
 
-#: n/skins/custom_generic/reconfig_template.pt:54
+#: n/skins/custom_generic/reconfig_template.pt:61
 msgid "This is the title which appears at the top of every portal page."
 msgstr "This is the title which appears at the top of every portal page."
 
-#: n/skins/custom_generic/reconfig_template.pt:60
+#: n/skins/custom_generic/reconfig_template.pt:69
 msgid "Portal description"
 msgstr "Portal description"
 
-#: n/skins/custom_generic/reconfig_template.pt:64
+#: n/skins/custom_generic/reconfig_template.pt:73
 msgid ""
 "This description is made available via syndicated content and elsewhere. It "
 "should be fairly brief."
@@ -1004,63 +1004,53 @@ msgstr ""
 "This description is made available via syndicated content and elsewhere. It "
 "should be fairly brief."
 
-#: n/skins/custom_generic/reconfig_template.pt:70
+#: n/skins/custom_generic/reconfig_template.pt:81
 msgid "Keywords"
 msgstr "Keywords"
 
-#: n/skins/custom_generic/reconfig_template.pt:74
+#: n/skins/custom_generic/reconfig_template.pt:85
 msgid ""
 "Keywords describing the portal. Type one keyword (or expression) per line."
 msgstr ""
 "Keywords describing the portal. Type one keyword (or expression) per line."
 
-#: n/skins/custom_generic/reconfig_template.pt:79
+#: n/skins/custom_generic/reconfig_template.pt:93
 msgid "Copyright notice"
 msgstr "Copyright notice"
 
-#: n/skins/custom_generic/reconfig_template.pt:83
+#: n/skins/custom_generic/reconfig_template.pt:98
 msgid "Copyright notice displayed on the portal footer."
 msgstr "Copyright notice displayed on the portal footer."
 
-#: n/skins/custom_generic/reconfig_template.pt:88
-msgid "Password policy"
-msgstr "Password policy"
+#: n/skins/custom_generic/reconfig_template.pt:105
+msgid "Registration policy"
+msgstr "Registration policy"
 
-#: n/skins/custom_generic/reconfig_template.pt:92
-msgid "Generate and email members' initial password"
-msgstr "Generate and email members' initial password"
+#: n/skins/custom_generic/reconfig_template.pt:110
+msgid "Send email to new members to validate their registrations"
+msgstr "Send email to new members to validate their registrations"
 
-#: n/skins/custom_generic/reconfig_template.pt:97
-msgid "Allow members to select their initial password"
-msgstr "Allow members to select their initial password"
+#: n/skins/custom_generic/reconfig_template.pt:118
+msgid "Allow new members to select their initial passwords"
+msgstr "Allow new members to select their initial passwords"
 
-#: n/skins/custom_generic/reconfig_template.pt:102
-msgid "Portal default encoding"
-msgstr "Portal default encoding"
-
-#: n/skins/custom_generic/reconfig_template.pt:107
-msgid ""
-"Charset used to decode portal content strings. If empty, 'ascii' is used."
-msgstr ""
-"Charset used to decode portal content strings. If empty, 'ascii' is used."
-
-#: n/skins/custom_generic/reconfig_template.pt:113
+#: n/skins/custom_generic/reconfig_template.pt:125
 msgid "Thumbnails size"
 msgstr "Thumbnails size"
 
-#: n/skins/custom_generic/reconfig_template.pt:119
+#: n/skins/custom_generic/reconfig_template.pt:130
 msgid "This is the size of the thumbnails in the photo album, in pixels."
 msgstr "This is the size of the thumbnails in the photo album, in pixels."
 
-#: n/skins/custom_generic/reconfig_template.pt:124
+#: n/skins/custom_generic/reconfig_template.pt:138
 msgid "Default ajax options"
 msgstr "Default ajax options"
 
-#: n/skins/custom_generic/reconfig_template.pt:128
+#: n/skins/custom_generic/reconfig_template.pt:143
 msgid "Enable handling of all clicks over links"
 msgstr "Enable handling of all clicks over links"
 
-#: n/skins/custom_generic/reconfig_template.pt:133
+#: n/skins/custom_generic/reconfig_template.pt:149
 msgid "Enable handling of all forms submissions"
 msgstr "Enable handling of all forms submissions"
 
@@ -2953,6 +2943,26 @@ msgstr "Directory"
 msgid "Configure portal"
 msgstr "Configure portal"
 
+#~ msgid "Registration option"
+#~ msgstr "Registration option"
+
+#~ msgid "Password policy"
+#~ msgstr "Password policy"
+
+#~ msgid "Generate and email members' initial password"
+#~ msgstr "Generate and email members' initial password"
+
+#~ msgid "Allow members to select their initial password"
+#~ msgstr "Allow members to select their initial password"
+
+#~ msgid "Portal default encoding"
+#~ msgstr "Portal default encoding"
+
+#~ msgid ""
+#~ "Charset used to decode portal content strings. If empty, 'ascii' is used."
+#~ msgstr ""
+#~ "Charset used to decode portal content strings. If empty, 'ascii' is used."
+
 #~ msgid "\"%s\" username not found."
 #~ msgstr "\"%s\" username not found."
 
diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo
index e7103f57701328a50815ae17c98979ae141c4cb2..9bd1fc3fc3c85702af128a1161761b5ab2456219 100644
GIT binary patch
delta 15815
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

delta 16027
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

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index e075be8..2f92760 100644
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n"
+"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n"
 "PO-Revision-Date: 2015-04-15 15:06+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
@@ -34,7 +34,8 @@ msgstr "Votre mot de passe doit comporter au moins 8 caractères."
 
 #: n/RegistrationTool.py:236
 msgid "Your password and confirmation did not match. Please try again."
-msgstr "Votre mot de passe et sa confirmation sont différents. Essayez à nouveau."
+msgstr ""
+"Votre mot de passe et sa confirmation sont différents. Essayez à nouveau."
 
 #: n/RegistrationTool.py:288
 msgid "Complete your registration on the %s website"
@@ -946,7 +947,7 @@ msgstr "Préférences linguistiques"
 msgid "Please enter language codes separated by spaces."
 msgstr "Veuillez entrer les codes de langues, séparés par des espaces."
 
-#: n/skins/custom_generic/reconfig_template.pt:7
+#: n/skins/custom_generic/reconfig_template.pt:9
 msgid "Configure the Portal"
 msgstr "Configurer le portail"
 
@@ -964,38 +965,38 @@ msgid ""
 msgstr ""
 "Lorsque le portail envoie un mail, il utilise ce nom pour l'expéditeur."
 
-#: n/skins/custom_generic/reconfig_template.pt:28
+#: n/skins/custom_generic/reconfig_template.pt:30
 msgid "Portal 'From' address"
 msgstr "Email d'expéditeur"
 
-#: n/skins/custom_generic/reconfig_template.pt:33
+#: n/skins/custom_generic/reconfig_template.pt:35
 msgid ""
 "When the portal generates mail, it uses this address as its (apparent) "
 "return address."
 msgstr ""
 "Lorsque le portail envoie un mail, il utilise cette adresse d'expédition."
 
-#: n/skins/custom_generic/reconfig_template.pt:39
+#: n/skins/custom_generic/reconfig_template.pt:43
 msgid "SMTP server"
 msgstr "Serveur SMTP"
 
-#: n/skins/custom_generic/reconfig_template.pt:44
+#: n/skins/custom_generic/reconfig_template.pt:48
 msgid "This is the address of your local SMTP (out-going mail) server."
 msgstr "Ceci est l'adresse de votre serveur SMTP (courrier sortant)."
 
-#: n/skins/custom_generic/reconfig_template.pt:50
+#: n/skins/custom_generic/reconfig_template.pt:56
 msgid "Portal title"
 msgstr "Titre du portail"
 
-#: n/skins/custom_generic/reconfig_template.pt:54
+#: n/skins/custom_generic/reconfig_template.pt:61
 msgid "This is the title which appears at the top of every portal page."
 msgstr "Ceci est le titre qui apparaîtra en haut de chaque page."
 
-#: n/skins/custom_generic/reconfig_template.pt:60
+#: n/skins/custom_generic/reconfig_template.pt:69
 msgid "Portal description"
 msgstr "Description du portail"
 
-#: n/skins/custom_generic/reconfig_template.pt:64
+#: n/skins/custom_generic/reconfig_template.pt:73
 msgid ""
 "This description is made available via syndicated content and elsewhere. It "
 "should be fairly brief."
@@ -1003,65 +1004,54 @@ msgstr ""
 "Cette description est visible via les canaux de diffusion et partout "
 "ailleurs. Il est recommandé d'être concis."
 
-#: n/skins/custom_generic/reconfig_template.pt:70
+#: n/skins/custom_generic/reconfig_template.pt:81
 msgid "Keywords"
 msgstr "Mots clés"
 
-#: n/skins/custom_generic/reconfig_template.pt:74
+#: n/skins/custom_generic/reconfig_template.pt:85
 msgid ""
 "Keywords describing the portal. Type one keyword (or expression) per line."
 msgstr ""
 "Mots clés décrivant le portail. Entrez un mot (ou expression) par ligne."
 
-#: n/skins/custom_generic/reconfig_template.pt:79
+#: n/skins/custom_generic/reconfig_template.pt:93
 msgid "Copyright notice"
 msgstr "Mention légale"
 
-#: n/skins/custom_generic/reconfig_template.pt:83
+#: n/skins/custom_generic/reconfig_template.pt:98
 msgid "Copyright notice displayed on the portal footer."
 msgstr "Mention légale affichée sur le pied de page du portail."
 
-#: n/skins/custom_generic/reconfig_template.pt:88
-msgid "Password policy"
-msgstr "Option des mots de passe"
-
-#: n/skins/custom_generic/reconfig_template.pt:92
-msgid "Generate and email members' initial password"
-msgstr "Générer et envoyer par e-mail les mots de passe initiaux aux membres"
+#: n/skins/custom_generic/reconfig_template.pt:105
+msgid "Registration policy"
+msgstr "Modalité d'inscription"
 
-#: n/skins/custom_generic/reconfig_template.pt:97
-msgid "Allow members to select their initial password"
-msgstr "Autoriser les membres à choisir leur mot de passe initial"
+#: n/skins/custom_generic/reconfig_template.pt:110
+msgid "Send email to new members to validate their registrations"
+msgstr "Envoyer un email aux nouveaux membres pour valider leurs inscriptions"
 
-#: n/skins/custom_generic/reconfig_template.pt:102
-msgid "Portal default encoding"
-msgstr "Encodage par défaut du portail"
+#: n/skins/custom_generic/reconfig_template.pt:118
+msgid "Allow new members to select their initial passwords"
+msgstr "Permettre aux nouveaux membre de choisir leurs mots de passe initiaux"
 
-#: n/skins/custom_generic/reconfig_template.pt:107
-msgid ""
-"Charset used to decode portal content strings. If empty, 'ascii' is used."
-msgstr ""
-"Encodage utilisé par le portail pour décoder les textes des contenus. Si ce "
-"champ est laissé vide, c'est l'encodage ascii qui sera utilisé."
-
-#: n/skins/custom_generic/reconfig_template.pt:113
+#: n/skins/custom_generic/reconfig_template.pt:125
 msgid "Thumbnails size"
 msgstr "Taille des vignettes"
 
-#: n/skins/custom_generic/reconfig_template.pt:119
+#: n/skins/custom_generic/reconfig_template.pt:130
 msgid "This is the size of the thumbnails in the photo album, in pixels."
 msgstr ""
 "C'est la taille, en pixels, utilisée pour les vignettes des albums photo."
 
-#: n/skins/custom_generic/reconfig_template.pt:124
+#: n/skins/custom_generic/reconfig_template.pt:138
 msgid "Default ajax options"
 msgstr "Options ajax par défaut"
 
-#: n/skins/custom_generic/reconfig_template.pt:128
+#: n/skins/custom_generic/reconfig_template.pt:143
 msgid "Enable handling of all clicks over links"
 msgstr "Activer l'interception de tous les clicks sur les liens"
 
-#: n/skins/custom_generic/reconfig_template.pt:133
+#: n/skins/custom_generic/reconfig_template.pt:149
 msgid "Enable handling of all forms submissions"
 msgstr "Activer l'interception de tous les envois de formulaires"
 
@@ -2972,6 +2962,28 @@ msgstr "Annuaire"
 msgid "Configure portal"
 msgstr "Configurer portail"
 
+#~ msgid "Registration option"
+#~ msgstr "Option d'inscription"
+
+#~ msgid "Password policy"
+#~ msgstr "Option des mots de passe"
+
+#~ msgid "Generate and email members' initial password"
+#~ msgstr ""
+#~ "Générer et envoyer par e-mail les mots de passe initiaux aux membres"
+
+#~ msgid "Allow members to select their initial password"
+#~ msgstr "Autoriser les membres à choisir leur mot de passe initial"
+
+#~ msgid "Portal default encoding"
+#~ msgstr "Encodage par défaut du portail"
+
+#~ msgid ""
+#~ "Charset used to decode portal content strings. If empty, 'ascii' is used."
+#~ msgstr ""
+#~ "Encodage utilisé par le portail pour décoder les textes des contenus. Si "
+#~ "ce champ est laissé vide, c'est l'encodage ascii qui sera utilisé."
+
 #~ msgid "\"%s\" username not found."
 #~ msgstr "Nom : « %s » non trouvé."
 
diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot
index 8c18e8a..2b3fa42 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: Fri Apr 17 09:59:32 2015\n"
+"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -887,7 +887,7 @@ msgstr ""
 msgid "Please enter language codes separated by spaces."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:7
+#: n/skins/custom_generic/reconfig_template.pt:9
 msgid "Configure the Portal"
 msgstr ""
 
@@ -903,91 +903,83 @@ msgstr ""
 msgid "When the portal generates mail, it uses this name as its (apparent) sender."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:28
+#: n/skins/custom_generic/reconfig_template.pt:30
 msgid "Portal 'From' address"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:33
+#: n/skins/custom_generic/reconfig_template.pt:35
 msgid "When the portal generates mail, it uses this address as its (apparent) return address."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:39
+#: n/skins/custom_generic/reconfig_template.pt:43
 msgid "SMTP server"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:44
+#: n/skins/custom_generic/reconfig_template.pt:48
 msgid "This is the address of your local SMTP (out-going mail) server."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:50
+#: n/skins/custom_generic/reconfig_template.pt:56
 msgid "Portal title"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:54
+#: n/skins/custom_generic/reconfig_template.pt:61
 msgid "This is the title which appears at the top of every portal page."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:60
+#: n/skins/custom_generic/reconfig_template.pt:69
 msgid "Portal description"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:64
+#: n/skins/custom_generic/reconfig_template.pt:73
 msgid "This description is made available via syndicated content and elsewhere. It should be fairly brief."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:70
+#: n/skins/custom_generic/reconfig_template.pt:81
 msgid "Keywords"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:74
+#: n/skins/custom_generic/reconfig_template.pt:85
 msgid "Keywords describing the portal. Type one keyword (or expression) per line."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:79
+#: n/skins/custom_generic/reconfig_template.pt:93
 msgid "Copyright notice"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:83
+#: n/skins/custom_generic/reconfig_template.pt:98
 msgid "Copyright notice displayed on the portal footer."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:88
-msgid "Password policy"
+#: n/skins/custom_generic/reconfig_template.pt:105
+msgid "Registration policy"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:92
-msgid "Generate and email members' initial password"
+#: n/skins/custom_generic/reconfig_template.pt:110
+msgid "Send email to new members to validate their registrations"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:97
-msgid "Allow members to select their initial password"
+#: n/skins/custom_generic/reconfig_template.pt:118
+msgid "Allow new members to select their initial passwords"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:102
-msgid "Portal default encoding"
-msgstr ""
-
-#: n/skins/custom_generic/reconfig_template.pt:107
-msgid "Charset used to decode portal content strings. If empty, 'ascii' is used."
-msgstr ""
-
-#: n/skins/custom_generic/reconfig_template.pt:113
+#: n/skins/custom_generic/reconfig_template.pt:125
 msgid "Thumbnails size"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:119
+#: n/skins/custom_generic/reconfig_template.pt:130
 msgid "This is the size of the thumbnails in the photo album, in pixels."
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:124
+#: n/skins/custom_generic/reconfig_template.pt:138
 msgid "Default ajax options"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:128
+#: n/skins/custom_generic/reconfig_template.pt:143
 msgid "Enable handling of all clicks over links"
 msgstr ""
 
-#: n/skins/custom_generic/reconfig_template.pt:133
+#: n/skins/custom_generic/reconfig_template.pt:149
 msgid "Enable handling of all forms submissions"
 msgstr ""
 
diff --git a/Products/Plinn/skins/custom_generic/reconfig_form.py b/Products/Plinn/skins/custom_generic/reconfig_form.py
index 8a0c540..1b9292d 100644
--- a/Products/Plinn/skins/custom_generic/reconfig_form.py
+++ b/Products/Plinn/skins/custom_generic/reconfig_form.py
@@ -29,7 +29,6 @@ options['form'] = { 'action': target,
 					'keywords': '\n'.join(ptool.getProperty('keywords', [])),
 					'copyright_notice': ptool.getProperty('copyright_notice'),
 					'validate_email': ptool.getProperty('validate_email'),
-					'default_charset': ptool.getProperty('default_charset', ''),
 					'slide_size' : ptool.getProperty('slide_size', ''),
 					'listButtonInfos': tuple(buttons),
 					'ajax_rootClickHandler' : ajax_config & 1 == 1,
diff --git a/Products/Plinn/skins/custom_generic/reconfig_template.pt b/Products/Plinn/skins/custom_generic/reconfig_template.pt
index 22425ae..ed96bbf 100644
--- a/Products/Plinn/skins/custom_generic/reconfig_template.pt
+++ b/Products/Plinn/skins/custom_generic/reconfig_template.pt
@@ -1,52 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:i18n="http://xml.zope.org/namespaces/i18n" metal:use-macro="context/main_template/macros/master">
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      metal:use-macro="context/main_template/macros/master">
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
   <body metal:fill-slot="main_no_tabs" i18n:domain="plinn" tal:omit-tag="" tal:define="form options/form">
     <h1 i18n:translate="">Configure the Portal</h1>
     <div class="config">
-      <p i18n:translate="">This form is used to set the portal configuration
-  options.</p>
+      <p i18n:translate="">
+        This form is used to set the portal configuration options.
+      </p>
       <form method="post" tal:attributes="action form/action">
         <table class="TwoColumnForm">
           <tr>
             <th i18n:translate="">Portal 'From' name</th>
             <td>
-              <input name="email_from_name" value="" tal:attributes="value form/email_from_name"/>
+              <input name="email_from_name" value=""
+                     tal:attributes="value form/email_from_name"/>
               <dl class="FieldHelp">
-                <dd i18n:translate="">When the portal generates mail, it uses this name as
-     its (apparent) sender.</dd>
+                <dd i18n:translate="">
+                  When the portal generates mail, it uses this name as its
+                  (apparent) sender.
+                </dd>
               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">Portal 'From' address</th>
             <td>
-              <input name="email_from_address" value="" tal:attributes="value form/email_from_address"/>
+              <input name="email_from_address" value=""
+                     tal:attributes="value form/email_from_address"/>
               <dl class="FieldHelp">
-                <dd i18n:translate="">When the portal generates mail, it uses this address
-     as its (apparent) return address.</dd>
+                <dd i18n:translate="">
+                  When the portal generates mail, it uses this address as its
+                  (apparent) return address.
+                </dd>
               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">SMTP server</th>
             <td>
-              <input name="smtp_server" value="" tal:attributes="value form/smtp_server"/>
+              <input name="smtp_server" value=""
+                     tal:attributes="value form/smtp_server"/>
               <dl class="FieldHelp">
-                <dd i18n:translate="">This is the address of your local SMTP (out-going
-     mail) server.</dd>
+                <dd i18n:translate="">
+                  This is the address of your local SMTP (out-going mail)
+                  server.
+                </dd>
               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">Portal title</th>
             <td>
-              <input name="title" value="" tal:attributes="value form/title"/>
+              <input name="title" value=""
+                     tal:attributes="value form/title"/>
               <dl class="FieldHelp">
-                <dd i18n:translate="">This is the title which appears at the top of every
-     portal page.</dd>
+                <dd i18n:translate="">
+                  This is the title which appears at the top of every portal
+                  page.
+                </dd>
               </dl>
             </td>
           </tr>
@@ -55,8 +70,10 @@
             <td class="TextField">
               <textarea name="description" rows="3" cols="40" tal:content="form/description"/>
               <dl class="FieldHelp">
-                <dd i18n:translate=""> This description is made available via syndicated
-      content and elsewhere. It should be fairly brief.</dd>
+                <dd i18n:translate="">
+                  This description is made available via syndicated content and
+                  elsewhere. It should be fairly brief.
+                </dd>
               </dl>
             </td>
           </tr>
@@ -65,66 +82,70 @@
             <td class="TextField">
               <textarea name="keywords:lines" rows="6" cols="40" tal:content="form/keywords"/>
               <dl class="FieldHelp">
-                <dd i18n:translate="">Keywords describing the portal. Type one keyword (or expression) per line.</dd>
+                <dd i18n:translate="">
+                  Keywords describing the portal. Type one keyword (or
+                  expression) per line.
+                </dd>
               </dl>
             </td>
           </tr>
-          <tr i18n:domain="plinn">
+          <tr>
             <th i18n:translate="">Copyright notice</th>
             <td class="TextField">
-              <input name="copyright_notice" value="" tal:attributes="value form/copyright_notice"/>
+              <input name="copyright_notice" value=""
+                     tal:attributes="value form/copyright_notice"/>
               <dl class="FieldHelp">
-                <dd i18n:translate="">Copyright notice displayed on the portal footer.</dd>
+                <dd i18n:translate="">
+                  Copyright notice displayed on the portal footer.
+                </dd>
               </dl>
             </td>
           </tr>
           <tr>
-            <th i18n:translate="">Password policy</th>
+            <th i18n:translate="">Registration policy</th>
             <td>
               <label>
-                <input type="radio" name="validate_email:boolean" value="True" tal:attributes="checked form/validate_email"/>
-                <tal:span i18n:translate="">Generate and email members' initial
-    password</tal:span>
+                <input type="radio" name="validate_email:boolean" value="True"
+                       tal:attributes="checked form/validate_email"/>
+                <span i18n:translate="" tal:omit-tag="">
+                  Send email to new members to validate their registrations
+                </span>
               </label>
               <br/>
               <label>
-                <input type="radio" name="validate_email:boolean" value="False" tal:attributes="checked not:form/validate_email"/>
-                <tal:span i18n:translate="">Allow members to select their initial
-    password</tal:span>
+                <input type="radio" name="validate_email:boolean" value="False"
+                       tal:attributes="checked not:form/validate_email"/>
+                <span i18n:translate="" tal:omit-tag="">
+                  Allow new members to select their initial passwords
+                </span>
               </label>
             </td>
           </tr>
           <tr>
-            <th i18n:translate="">Portal default encoding</th>
+            <th i18n:translate="">Thumbnails size</th>
             <td>
-              <input name="default_charset" value="" disabled="disabled" tal:attributes="value form/default_charset"/>
+              <input name="slide_size:int" value=""
+                     tal:attributes="value form/slide_size" size="5"/>
               <dl class="FieldHelp">
-                <dd i18n:translate="">Charset used to decode portal content strings.
-     If empty, 'ascii' is used.</dd>
+                <dd i18n:translate="">
+                  This is the size of the thumbnails in the photo album, in
+                  pixels.
+                </dd>
               </dl>
             </td>
           </tr>
           <tr>
-            <th i18n:translate="">
-      Thumbnails size
-    </th>
-            <td>
-              <input name="slide_size:int" value="" tal:attributes="value form/slide_size" size="5"/>
-              <dl class="FieldHelp">
-                <dd i18n:translate="">This is the size of the thumbnails in the photo album, in pixels.</dd>
-              </dl>
-            </td>
-          </tr>
-          <tr i18n:domain="plinn">
             <th i18n:translate="">Default ajax options</th>
             <td>
               <label>
-                <input type="checkbox" name="ajax_rootClickHandler:boolean" tal:attributes="checked form/ajax_rootClickHandler"/>
+                <input type="checkbox" name="ajax_rootClickHandler:boolean"
+                       tal:attributes="checked form/ajax_rootClickHandler"/>
                 <span i18n:translate="" tal:omit-tag="">Enable handling of all clicks over links</span>
               </label>
               <br/>
               <label>
-                <input type="checkbox" name="ajax_autoFormManager:boolean" tal:attributes="checked form/ajax_autoFormManager"/>
+                <input type="checkbox" name="ajax_autoFormManager:boolean"
+                       tal:attributes="checked form/ajax_autoFormManager"/>
                 <span i18n:translate="" tal:omit-tag="">Enable handling of all forms submissions</span>
               </label>
             </td>
-- 
2.20.1


From face2441fd6040fa2a45c5e02a0d2dbc6d4ce24d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Mon, 27 Apr 2015 13:39:49 +0200
Subject: [PATCH 12/16] =?utf8?q?Bugfix=C2=A0:=20correction=20syntaxe=20req?=
 =?utf8?q?u=C3=AAtes=20soir.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Products/Plinn/catalog.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Products/Plinn/catalog.py b/Products/Plinn/catalog.py
index 7e49083..d9e78a3 100644
--- a/Products/Plinn/catalog.py
+++ b/Products/Plinn/catalog.py
@@ -160,7 +160,7 @@ class DelegatedCatalog(Catalog) :
             try : plan.remove(i)
             except ValueError : pass
         c = SolrConnection(self.zcat.solr_url)
-        q =' AND '.join(['%s:"%s"' % item for item in delegatedQuery.items()])
+        q =' AND '.join(['%s:(%s)' % item for item in delegatedQuery.items()])
         resp = c.query(q, fields='id', rows=len(self))
         c.close()
         return IISet(filter(None, [self.uids.get(r['id']) for r in resp.results])) 
-- 
2.20.1


From a30079816469564a8471ea6f03942129c07ead9b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Tue, 28 Apr 2015 16:05:06 +0200
Subject: [PATCH 13/16] Ajout lien pour ouvrir un compte, en dessous du
 formulaire de login.

---
 .../Plinn/locales/en/LC_MESSAGES/plinn.mo     | Bin 51292 -> 51372 bytes
 .../Plinn/locales/en/LC_MESSAGES/plinn.po     |  14 +++++++++-----
 .../Plinn/locales/fr/LC_MESSAGES/plinn.mo     | Bin 55086 -> 55184 bytes
 .../Plinn/locales/fr/LC_MESSAGES/plinn.po     |  14 +++++++++-----
 Products/Plinn/locales/plinn.pot              |  12 ++++++++----
 .../Plinn/skins/custom_generic/login_form.pt  |   7 +++++++
 6 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo
index d596a79bc2026b633e0aff15a3db55c5226fbb3d..9d65f300a2cf1ea59af128b6518a30c579725ec6 100644
GIT binary patch
delta 14842
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

delta 14768
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

diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
index a22fbc7..c7f4230 100644
--- a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po
@@ -14,8 +14,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
-"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n"
-"PO-Revision-Date: 2015-04-15 17:00+0200\n"
+"POT-Creation-Date: Tue Apr 28 15:48:29 2015\n"
+"PO-Revision-Date: 2015-04-28 15:49+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "Language: \n"
@@ -805,17 +805,21 @@ msgstr " Login "
 msgid "Forgot your login or password?"
 msgstr "Forgot your login or password?"
 
-#: n/skins/custom_generic/login_form.pt:51
+#: n/skins/custom_generic/login_form.pt:55
+msgid "Not a member yet? Register now!"
+msgstr "Not a member yet? Register now!"
+
+#: n/skins/custom_generic/login_form.pt:58
 msgid ""
 "Having trouble logging in? Make sure to enable cookies in your web browser."
 msgstr ""
 "Having trouble logging in? Make sure to enable cookies in your web browser."
 
-#: n/skins/custom_generic/login_form.pt:55
+#: n/skins/custom_generic/login_form.pt:62
 msgid "Don't forget to logout or exit your browser when you're done."
 msgstr "Don't forget to logout or exit your browser when you're done."
 
-#: n/skins/custom_generic/login_form.pt:58
+#: n/skins/custom_generic/login_form.pt:65
 msgid ""
 "Setting the 'Remember my name' option will set a cookie with your username, "
 "so that when you next log in, your user name will already be filled in for "
diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo
index 9bd1fc3fc3c85702af128a1161761b5ab2456219..10f1c3dfe17872185d362ff03632ebad7085cdcf 100644
GIT binary patch
delta 14859
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
X*WT$v($c%84>`6vYUjfBODp^z4l(c9

delta 14764
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

diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
index 2f92760..8a6941e 100644
--- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
+++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n"
-"PO-Revision-Date: 2015-04-15 15:06+0200\n"
+"POT-Creation-Date: Tue Apr 28 15:48:29 2015\n"
+"PO-Revision-Date: 2015-04-28 15:49+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
@@ -803,20 +803,24 @@ msgstr "Connexion"
 msgid "Forgot your login or password?"
 msgstr "Login ou mot de passe oublié ?"
 
-#: n/skins/custom_generic/login_form.pt:51
+#: n/skins/custom_generic/login_form.pt:55
+msgid "Not a member yet? Register now!"
+msgstr "Pas encore membre ? Inscrivez-vous maintenant !"
+
+#: n/skins/custom_generic/login_form.pt:58
 msgid ""
 "Having trouble logging in? Make sure to enable cookies in your web browser."
 msgstr ""
 "Vous rencontrez des difficultés pour la connexion ? Vérifiez que votre "
 "navigateur accepte les cookies."
 
-#: n/skins/custom_generic/login_form.pt:55
+#: n/skins/custom_generic/login_form.pt:62
 msgid "Don't forget to logout or exit your browser when you're done."
 msgstr ""
 "N'oubliez pas de vous déconnecter ou de fermer votre navigateur à la fin de "
 "la session."
 
-#: n/skins/custom_generic/login_form.pt:58
+#: n/skins/custom_generic/login_form.pt:65
 msgid ""
 "Setting the 'Remember my name' option will set a cookie with your username, "
 "so that when you next log in, your user name will already be filled in for "
diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot
index 2b3fa42..2cd50f1 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: Fri Apr 17 10:39:07 2015\n"
+"POT-Creation-Date: Tue Apr 28 15:48:29 2015\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
@@ -773,15 +773,19 @@ msgstr ""
 msgid "Forgot your login or password?"
 msgstr ""
 
-#: n/skins/custom_generic/login_form.pt:51
+#: n/skins/custom_generic/login_form.pt:55
+msgid "Not a member yet? Register now!"
+msgstr ""
+
+#: n/skins/custom_generic/login_form.pt:58
 msgid "Having trouble logging in? Make sure to enable cookies in your web browser."
 msgstr ""
 
-#: n/skins/custom_generic/login_form.pt:55
+#: n/skins/custom_generic/login_form.pt:62
 msgid "Don't forget to logout or exit your browser when you're done."
 msgstr ""
 
-#: n/skins/custom_generic/login_form.pt:58
+#: n/skins/custom_generic/login_form.pt:65
 msgid "Setting the 'Remember my name' option will set a cookie with your username, so that when you next log in, your user name will already be filled in for you."
 msgstr ""
 
diff --git a/Products/Plinn/skins/custom_generic/login_form.pt b/Products/Plinn/skins/custom_generic/login_form.pt
index 09d9729..59fe6c6 100644
--- a/Products/Plinn/skins/custom_generic/login_form.pt
+++ b/Products/Plinn/skins/custom_generic/login_form.pt
@@ -48,6 +48,13 @@
         <p>
           <a href="" tal:attributes="href string:${here/portal_url}/request_password_reset_form" i18n:translate="">Forgot your login or password?</a>
         </p>
+        <p tal:define="join_action python:atool.getActionInfo('user/join', check_condition=1);
+                       mq python:modules['ZTUtils'].make_query;
+                       join_url python:join_action['url'] if not request.get('came_from') else '%s?%s' % (join_action['url'], mq(came_from=request.get('came_from')))"
+           tal:on-error="nothing">
+          <a tal:attributes="href join_url"
+             i18n:translate="">Not a member yet? Register now!</a>
+        </p>
         <p i18n:translate="">
           Having trouble logging in? Make sure to enable cookies in your web
           browser.
-- 
2.20.1


From f9f1aa2535d3fae8e35d803ba8c85f8891ec133c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Tue, 28 Apr 2015 17:28:54 +0200
Subject: [PATCH 14/16] =?utf8?q?Redirection=20vers=20url=20pass=C3=A9e=20e?=
 =?utf8?q?n=20param=C3=A8tre=20=C2=AB=C2=A0came=5Ffrom=C2=A0=C2=BB=20lors?=
 =?utf8?q?=20de=20l'inscription.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../Plinn/skins/custom_generic/join_form.py   |  3 ++-
 .../skins/custom_generic/join_template.pt     |  3 +++
 .../Plinn/skins/custom_generic/logged_in.py   | 24 +++++--------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Products/Plinn/skins/custom_generic/join_form.py b/Products/Plinn/skins/custom_generic/join_form.py
index 8e82159..f7cdead 100644
--- a/Products/Plinn/skins/custom_generic/join_form.py
+++ b/Products/Plinn/skins/custom_generic/join_form.py
@@ -1,4 +1,4 @@
-##parameters=member_id='', given_name='', name='', member_email='', password='', confirm='', add='', ajax=''
+##parameters=member_id='', given_name='', name='', member_email='', password='', confirm='', add='', came_from='', ajax=''
 ##
 from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.permissions import ManageUsers
@@ -58,6 +58,7 @@ 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
+options['came_from'] = came_from
 
 buttons = []
 if is_newmember:
diff --git a/Products/Plinn/skins/custom_generic/join_template.pt b/Products/Plinn/skins/custom_generic/join_template.pt
index d5deaca..eb33650 100644
--- a/Products/Plinn/skins/custom_generic/join_template.pt
+++ b/Products/Plinn/skins/custom_generic/join_template.pt
@@ -30,6 +30,7 @@
             <form tal:attributes="action form/action" method="post">
               <input type="hidden" name="__ac_name" tal:attributes="value options/member_id"/>
               <input type="hidden" name="__ac_password" tal:attributes="value options/password"/>
+              <input type="hidden" name="came_from" tal:attributes="value options/came_from">
               <input type="hidden" name="noAjax" value="1"/>
               <metal:macro metal:use-macro="context/form_widgets/macros/buttons"/>
             </form>
@@ -108,6 +109,8 @@
                 </td>
               </tr>
             </table>
+            <input type="hidden" name="came_from"
+                   tal:attributes="value options/came_from"/>
           </form>
           <script type="text/javascript">
             (function(){
diff --git a/Products/Plinn/skins/custom_generic/logged_in.py b/Products/Plinn/skins/custom_generic/logged_in.py
index c4663c4..a13d7c7 100755
--- a/Products/Plinn/skins/custom_generic/logged_in.py
+++ b/Products/Plinn/skins/custom_generic/logged_in.py
@@ -33,21 +33,9 @@ else:
 	now = context.ZopeTime()
 	last_login = member.getProperty('login_time', None)
 	member.setProperties(last_login_time=last_login, login_time=now)
-	is_first_login = (last_login == '2000/01/01' and
-					  ptool.getProperty('validate_email'))
-	if is_first_login:
-		member.setProperties(last_login_time='1999/01/01', login_time=now)
-		target = '%s/password_form' % portal_url
-		context.REQUEST.RESPONSE.redirect(target)
-		return
-	else:
-		member.setProperties(last_login_time=last_login, login_time=now)
-		came_from = context.REQUEST.get('came_from', None)
-		if came_from:
-			return context.REQUEST.RESPONSE.redirect(came_from)
-		else :
-			url = atool.getActionInfo('user/logged_in', object=portal)['url']
-			url = '%s?%s' %(url, mq(portal_status_message=_('Login success')))
-			return context.REQUEST.RESPONSE.redirect(url)
-
-return context.logged_in_template(**decode(options, script))
+	came_from = context.REQUEST.get('came_from', None)
+	if came_from:
+		return context.REQUEST.RESPONSE.redirect(came_from)
+	else :
+		url = '%s?%s' %(portal_url, mq(portal_status_message=_('Login success')))
+		return context.REQUEST.RESPONSE.redirect(url)
-- 
2.20.1


From ae75bab9028d6321710c42da338cef25c7afe576 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Tue, 28 Apr 2015 18:14:19 +0200
Subject: [PATCH 15/16] =?utf8?q?Prise=20en=20charge=20de=20la=20redirectio?=
 =?utf8?q?n=20vers=20=C2=AB=C2=A0came=5Ffrom=C2=A0=C2=BB=20lors=20de=20la?=
 =?utf8?q?=20r=C3=A9-initialisation=20de=20mot=20de=20passe.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 Products/Plinn/RegistrationTool.py                  | 10 +++++-----
 Products/Plinn/skins/custom_generic/join_form.py    |  3 ++-
 Products/Plinn/skins/generic/password_reset_form.py |  9 +++++----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Products/Plinn/RegistrationTool.py b/Products/Plinn/RegistrationTool.py
index 3e04db1..738d2ee 100644
--- a/Products/Plinn/RegistrationTool.py
+++ b/Products/Plinn/RegistrationTool.py
@@ -254,7 +254,7 @@ class RegistrationTool(BaseRegistrationTool) :
         return str(uuid4())
 
     security.declarePublic('requestPasswordReset')
-    def requestPasswordReset(self, userid, initial=False):
+    def requestPasswordReset(self, userid, initial=False, came_from=''):
         """ add uuid / (userid, expiration) pair
             if ok: send an email to member. returns error message otherwise.
         """
@@ -274,7 +274,7 @@ class RegistrationTool(BaseRegistrationTool) :
             uuid = str(uuid4())
             while self._passwordResetRequests.has_key(uuid) :
                 uuid = str(uuid4())
-            self._passwordResetRequests[uuid] = (userid, DateTime() + 1)
+            self._passwordResetRequests[uuid] = (userid, DateTime() + 1, came_from)
             utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IURLTool')
             ptool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IPropertiesTool')
             # fuck : mailhost récupéré avec getUtilityByInterfaceName n'est pas correctement
@@ -311,7 +311,7 @@ class RegistrationTool(BaseRegistrationTool) :
     def clearExpiredPasswordResetRequests(self):
         now = DateTime()
         for uuid, record in self._passwordResetRequests.items() :
-            userid, date = record
+            date = record[1]
             if date < now :
                 del self._passwordResetRequests[uuid]
 
@@ -322,7 +322,7 @@ class RegistrationTool(BaseRegistrationTool) :
         if not record :
             return None, _('Invalid reset password request.')
 
-        userid, expiration = record
+        userid, expiration, came_from = record
         now = DateTime()
         if expiration < now :
             self.clearExpiredPasswordResetRequests()
@@ -335,7 +335,7 @@ class RegistrationTool(BaseRegistrationTool) :
             if member :
                 member.setSecurityProfile(password=password)
                 del self._passwordResetRequests[uuid]
-                return  userid, _('Password successfully updated.')
+                return  {'userid': userid, 'came_from' : came_from}, _('Password successfully updated.')
             else :
                 return None, _('"${userid}" username not found.', mapping={'userid': userid})
         else :
diff --git a/Products/Plinn/skins/custom_generic/join_form.py b/Products/Plinn/skins/custom_generic/join_form.py
index f7cdead..3badc16 100644
--- a/Products/Plinn/skins/custom_generic/join_form.py
+++ b/Products/Plinn/skins/custom_generic/join_form.py
@@ -37,11 +37,12 @@ if add :
                                         'name' : name,
                                         'email': member_email})
             if validate_email :
-                rtool.requestPasswordReset(member_id, initial=True)
+                rtool.requestPasswordReset(member_id, initial=True, came_from=came_from)
             context.setStatus(True, _('Success!'))
             is_newmember = True
             is_anon = False
         except ValueError, errmsg:
+            raise
             context.setStatus(False, errmsg)
     
 options = {}
diff --git a/Products/Plinn/skins/generic/password_reset_form.py b/Products/Plinn/skins/generic/password_reset_form.py
index 9cb4b1d..7bd487a 100644
--- a/Products/Plinn/skins/generic/password_reset_form.py
+++ b/Products/Plinn/skins/generic/password_reset_form.py
@@ -10,18 +10,19 @@ uuid = traverse_subpath[0]
 passwordChanged = False
 
 if validate :
-    userid = context.reset_password_control(uuid=uuid, **form)
-    if userid :
+    infos = context.reset_password_control(uuid=uuid, **form)
+    if infos :
         passwordChanged = True
 
 options = {}
 options['uuid'] = uuid
 options['passwordChanged'] = passwordChanged
 if passwordChanged :
-    hidden_vars = ({'name' : '__ac_name',       'value' : userid},
+    hidden_vars = ({'name' : '__ac_name',       'value' : infos['userid']},
                    {'name' : '__ac_password',   'value' : form['password']},
+                   {'name' : 'came_from',       'value' : infos['came_from']},
                    {'name' : 'noAjax',          'value' : '1'})
-    target = utool()
+    target = atool.getActionInfo('user/logged_in')['url']
     buttons = ({'name': 'login', 'value': _(' Login ')},)
 else :
     hidden_vars = []
-- 
2.20.1


From fdcfbd9b5ac50582333e87ff5cc3e06883a7d5fa Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <pin@cri.ensmp.fr>
Date: Wed, 13 May 2015 14:24:31 +0200
Subject: [PATCH 16/16] fix. ajustement.

---
 Products/Plinn/skins/custom_generic/join_form.py     | 1 -
 Products/Plinn/skins/custom_generic/join_template.pt | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/Products/Plinn/skins/custom_generic/join_form.py b/Products/Plinn/skins/custom_generic/join_form.py
index 3badc16..4e7f6b3 100644
--- a/Products/Plinn/skins/custom_generic/join_form.py
+++ b/Products/Plinn/skins/custom_generic/join_form.py
@@ -42,7 +42,6 @@ if add :
             is_newmember = True
             is_anon = False
         except ValueError, errmsg:
-            raise
             context.setStatus(False, errmsg)
     
 options = {}
diff --git a/Products/Plinn/skins/custom_generic/join_template.pt b/Products/Plinn/skins/custom_generic/join_template.pt
index eb33650..a53a6cc 100644
--- a/Products/Plinn/skins/custom_generic/join_template.pt
+++ b/Products/Plinn/skins/custom_generic/join_template.pt
@@ -84,7 +84,7 @@
               <tr id="login-row"
                   tal:attributes="class python:'hidden' if options['email_as_login'] else nothing">
                 <td colspan="2">
-                  <input type="text" name="member_id"
+                  <input type="text" name="member_id" size="30"
                          placeholder="login" i18n:attributes="placeholder"
                          tal:attributes="value options/member_id|nothing"/>
                 </td>
-- 
2.20.1