From 55fa8d8e6b6b1562174b12c2658dd463c9b018dc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Thu, 16 Apr 2015 19:03:20 +0200 Subject: [PATCH] =?utf8?q?Gestion=20de=20l'option=20=C2=AB=C2=A0email=5Fas?= =?utf8?q?=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 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 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 \n" "Language-Team: Zope 3 Developers \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 \n" "Language-Team: Zope 3 Developers \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 @@
-
+ - +
@@ -75,12 +75,13 @@ tal:attributes="value options/member_email|nothing"/>
+
-- 2.20.1