if member :
member.setSecurityProfile(password=password)
del self._passwordResetRequests[uuid]
- return userid, _('Password successfully reset.')
+ return userid, _('Password successfully updated.')
else :
return None, _('"%s" username not found.') % userid
msgid ""
msgstr ""
"Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Tue Apr 1 16:10:35 2014\n"
+"POT-Creation-Date: Mon May 12 23:42:25 2014\n"
"PO-Revision-Date: 2013-11-28 13:12+0100\n"
"Last-Translator: Benoît PIN\n"
"Language-Team: CRI http://cri.ensmp.fr\n"
msgstr ""
#: n/RegistrationTool.py:273
-msgid "Password successfully reset."
+msgid "Password successfully updated."
msgstr ""
#: n/RegistrationTool.py:275
#: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268
#: n/skins/generic/gruf_macros.pt:390
-#: n/skins/generic/password_reset_template.pt:28
msgid "Password"
msgstr ""
#: n/skins/custom_generic/main_template_standard.pt:111
#: n/skins/custom_generic/talkback_tree.pt:63
-#: n/skins/generic/main_template_ajax.pt:12
+#: n/skins/generic/main_template_ajax.pt:11
#: n/skins/photo_theme/main_template_standard.pt:119
msgid "Information"
msgstr ""
#: n/skins/custom_generic/main_template_standard.pt:112
#: n/skins/custom_generic/talkback_tree.pt:64
-#: n/skins/generic/main_template_ajax.pt:13 n/skins/generic/widgets.pt:17
+#: n/skins/generic/main_template_ajax.pt:12 n/skins/generic/widgets.pt:17
#: n/skins/photo_theme/main_template_standard.pt:120
#: n/skins/photo_theme/search_results_macros.pt:38
msgid "${DYNAMIC_CONTENT}"
#: n/skins/custom_generic/talkback_tree.pt:82
#: n/skins/generic/gruf_macros.pt:77 n/skins/generic/gruf_macros.pt:410
#: n/skins/generic/header_widgets.pt:32 n/skins/generic/header_widgets.pt:173
-#: n/skins/generic/password_reset_form.py:30
#: n/skins/generic/send_email_form.pt:79
msgid "Validate"
msgstr ""
msgstr ""
#: n/skins/generic/gruf_macros.pt:274 n/skins/generic/gruf_macros.pt:396
-#: n/skins/generic/password_reset_template.pt:34
msgid "Confirm"
msgstr ""
msgid "Exit boxes editing"
msgstr ""
+#: n/skins/generic/password_reset_form.py:30
+msgid "Update Password"
+msgstr ""
+
#: n/skins/generic/password_reset_mail.py:4
msgid "Hi %(fullName)s,"
msgstr ""
#: n/skins/generic/password_reset_mail.py:6
-msgid "You have asked to change your password."
+msgid "You recently asked to reset your password."
msgstr ""
#: n/skins/generic/password_reset_mail.py:8
msgstr ""
#: n/skins/generic/password_reset_template.pt:21
-msgid "Please enter a new password and clic on \"Validate\" button."
+msgid "Please choose a new password."
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:28
+msgid "New Password"
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:34
+msgid "Confirm New Password"
msgstr ""
#: n/skins/generic/password_reset_template.pt:49
#: n/skins/generic/request_password_reset_template.pt:12
msgid ""
-"Enter your email or your username below and click on the \"Send\" button. "
-"You will receive an email with a link to reset your password."
+"Enter your email or your login below and click on the \"Send\" button. For "
+"security reasons, we store your password encrypted, and cannot mail it to "
+"you. You will receive an email with a link to reset your password."
msgstr ""
-#: n/skins/generic/request_password_reset_template.pt:19
+#: n/skins/generic/request_password_reset_template.pt:21
msgid ""
-"If this will not work for you (for example, if you forget your username or "
-"didn't enter your email address) send email to ${admin_email}."
+"If this will not work for you (for example, if you forgot your login or your "
+"email address has changed), contact us at ${admin_email}."
msgstr ""
#. Default: "Send"
-#: n/skins/generic/request_password_reset_template.pt:26
+#: n/skins/generic/request_password_reset_template.pt:27
msgid " Send "
msgstr ""
msgid ""
msgstr ""
"Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Tue Apr 1 16:10:35 2014\n"
-"PO-Revision-Date: 2014-01-19 10:51+0100\n"
+"POT-Creation-Date: Mon May 12 23:42:25 2014\n"
+"PO-Revision-Date: 2014-05-12 23:42+0200\n"
"Last-Translator: Benoît PIN\n"
"Language-Team: CRI http://cri.ensmp.fr\n"
"Language: \n"
"demander une nouvelle."
#: n/RegistrationTool.py:273
-msgid "Password successfully reset."
-msgstr "Mot de passe correctement réinitialisé."
+msgid "Password successfully updated."
+msgstr "Mot de passe correctement mis à jour."
#: n/RegistrationTool.py:275
msgid "\"%s\" username not found."
#: n/skins/custom_generic/login_form.pt:28 n/skins/generic/gruf_macros.pt:268
#: n/skins/generic/gruf_macros.pt:390
-#: n/skins/generic/password_reset_template.pt:28
msgid "Password"
msgstr "Mot de passe"
#: n/skins/custom_generic/main_template_standard.pt:111
#: n/skins/custom_generic/talkback_tree.pt:63
-#: n/skins/generic/main_template_ajax.pt:12
+#: n/skins/generic/main_template_ajax.pt:11
#: n/skins/photo_theme/main_template_standard.pt:119
msgid "Information"
msgstr "Information"
#: n/skins/custom_generic/main_template_standard.pt:112
#: n/skins/custom_generic/talkback_tree.pt:64
-#: n/skins/generic/main_template_ajax.pt:13 n/skins/generic/widgets.pt:17
+#: n/skins/generic/main_template_ajax.pt:12 n/skins/generic/widgets.pt:17
#: n/skins/photo_theme/main_template_standard.pt:120
#: n/skins/photo_theme/search_results_macros.pt:38
msgid "${DYNAMIC_CONTENT}"
#: n/skins/custom_generic/talkback_tree.pt:82
#: n/skins/generic/gruf_macros.pt:77 n/skins/generic/gruf_macros.pt:410
#: n/skins/generic/header_widgets.pt:32 n/skins/generic/header_widgets.pt:173
-#: n/skins/generic/password_reset_form.py:30
#: n/skins/generic/send_email_form.pt:79
msgid "Validate"
msgstr "Valider"
msgstr "Prénom"
#: n/skins/generic/gruf_macros.pt:274 n/skins/generic/gruf_macros.pt:396
-#: n/skins/generic/password_reset_template.pt:34
msgid "Confirm"
msgstr "Confirmation"
msgid "Exit boxes editing"
msgstr "Quitter l'édition des boîtes"
+#: n/skins/generic/password_reset_form.py:30
+msgid "Update Password"
+msgstr "Mettre à jour le mot de passe"
+
#: n/skins/generic/password_reset_mail.py:4
msgid "Hi %(fullName)s,"
msgstr "Bonjour %(fullName)s,"
#: n/skins/generic/password_reset_mail.py:6
-msgid "You have asked to change your password."
-msgstr "Vous avez demandé de changer de mot de passe."
+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
msgid ""
msgstr "Réinitialisation du mot de passe"
#: n/skins/generic/password_reset_template.pt:21
-msgid "Please enter a new password and clic on \"Validate\" button."
-msgstr ""
-"Veuillez entrer un nouveau mot de passe puis cliquer sur le bouton "
-"« Valider »."
+msgid "Please choose a new password."
+msgstr "Veuillez choisir un nouveau mot de passe."
+
+#: n/skins/generic/password_reset_template.pt:28
+msgid "New Password"
+msgstr "Nouveau mot de passe"
+
+#: n/skins/generic/password_reset_template.pt:34
+msgid "Confirm New Password"
+msgstr "Confirmer le nouveau mot de passe"
#: n/skins/generic/password_reset_template.pt:49
msgid "Password changed"
#: n/skins/generic/request_password_reset_template.pt:12
msgid ""
-"Enter your email or your username below and click on the \"Send\" button. "
-"You will receive an email with a link to reset your password."
+"Enter your email or your login below and click on the \"Send\" button. For "
+"security reasons, we store your password encrypted, and cannot mail it to "
+"you. You will receive an email with a link to reset your password."
msgstr ""
"Entrez votre email ou votre login ci-dessous et cliquez sur « Envoyer ». "
-"Vous recevrez un email contenant un lien pour réinitialiser votre mot de "
-"passe."
+"Pour des raisons de sécurité, nous conservons votre mot de passe sous forme "
+"cryptée : nous ne pouvons donc pas vous l'envoyer. Vous recevrez un email "
+"contenant un lien pour réinitialiser votre mot de passe.\""
-#: n/skins/generic/request_password_reset_template.pt:19
+#: n/skins/generic/request_password_reset_template.pt:21
msgid ""
-"If this will not work for you (for example, if you forget your username or "
-"didn't enter your email address) send email to ${admin_email}."
+"If this will not work for you (for example, if you forgot your login or your "
+"email address has changed), contact us at ${admin_email}."
msgstr ""
-"Si cela ne marche pas dans votre cas (par exemple si vous avez oublié votre "
-"login ou si vous n'aviez pas entré une adresse email), vous pouvez envoyer "
-"un email à ${admin_email}."
+"Si cela ne marche pas dans votre cas (par exemple, si vous avez oublié votre "
+"login ou si votre adresse mail a changé), contactez-nous à l'adresse "
+"suivante : ${admin_email}"
#. Default: "Send"
-#: n/skins/generic/request_password_reset_template.pt:26
+#: n/skins/generic/request_password_reset_template.pt:27
msgid " Send "
msgstr " Envoyer "
msgid "Huge Folder"
msgstr "Dossier"
+#~ msgid "Password successfully reset."
+#~ msgstr "Mot de passe correctement réinitialisé."
+
+#~ msgid "You have asked to change your password."
+#~ msgstr "Vous avez demandé de changer de mot de passe."
+
+#~ msgid "Please enter a new password and clic on \"Validate\" button."
+#~ msgstr ""
+#~ "Veuillez entrer un nouveau mot de passe puis cliquer sur le bouton "
+#~ "« Valider »."
+
+#~ msgid ""
+#~ "Enter your email or your username below and click on the \"Send\" button. "
+#~ "You will receive an email with a link to reset your password."
+#~ msgstr ""
+#~ "Entrez votre email ou votre login ci-dessous et cliquez sur « Envoyer ». "
+#~ "Vous recevrez un email contenant un lien pour réinitialiser votre mot de "
+#~ "passe."
+
+#~ msgid ""
+#~ "If this will not work for you (for example, if you forget your username "
+#~ "or didn't enter your email address) send email to ${admin_email}."
+#~ msgstr ""
+#~ "Si cela ne marche pas dans votre cas (par exemple si vous avez oublié "
+#~ "votre login ou si vous n'aviez pas entré une adresse email), vous pouvez "
+#~ "envoyer un email à ${admin_email}."
+
#~ msgid ""
#~ "Enter your username below and click on the \"Send\" button. You will "
#~ "receive an email with a link to reset your password."
msgid ""
msgstr ""
"Project-Id-Version: 2.0 beta 1\n"
-"POT-Creation-Date: Tue Apr 1 16:10:35 2014\n"
+"POT-Creation-Date: Mon May 12 23:42:25 2014\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"
msgstr ""
#: n/RegistrationTool.py:273
-msgid "Password successfully reset."
+msgid "Password successfully updated."
msgstr ""
#: n/RegistrationTool.py:275
msgstr ""
#: n/skins/content/changes_history_template.pt:24
-msgid "\302\253 later revisions"
+msgid "« later revisions"
msgstr ""
#: n/skins/content/changes_history_template.pt:28
-msgid "earlier revisions \302\273"
+msgid "earlier revisions »"
msgstr ""
#: n/skins/content/changes_history_template.pt:37
#: n/skins/custom_generic/login_form.pt:28
#: n/skins/generic/gruf_macros.pt:268
#: n/skins/generic/gruf_macros.pt:390
-#: n/skins/generic/password_reset_template.pt:28
msgid "Password"
msgstr ""
#: n/skins/custom_generic/main_template_standard.pt:111
#: n/skins/custom_generic/talkback_tree.pt:63
-#: n/skins/generic/main_template_ajax.pt:12
+#: n/skins/generic/main_template_ajax.pt:11
#: n/skins/photo_theme/main_template_standard.pt:119
msgid "Information"
msgstr ""
#: n/skins/custom_generic/main_template_standard.pt:112
#: n/skins/custom_generic/talkback_tree.pt:64
-#: n/skins/generic/main_template_ajax.pt:13
+#: n/skins/generic/main_template_ajax.pt:12
#: n/skins/generic/widgets.pt:17
#: n/skins/photo_theme/main_template_standard.pt:120
#: n/skins/photo_theme/search_results_macros.pt:38
#: n/skins/generic/gruf_macros.pt:410
#: n/skins/generic/header_widgets.pt:32
#: n/skins/generic/header_widgets.pt:173
-#: n/skins/generic/password_reset_form.py:30
#: n/skins/generic/send_email_form.pt:79
msgid "Validate"
msgstr ""
#: n/skins/generic/gruf_macros.pt:274
#: n/skins/generic/gruf_macros.pt:396
-#: n/skins/generic/password_reset_template.pt:34
msgid "Confirm"
msgstr ""
msgid "Exit boxes editing"
msgstr ""
+#: n/skins/generic/password_reset_form.py:30
+msgid "Update Password"
+msgstr ""
+
#: n/skins/generic/password_reset_mail.py:4
msgid "Hi %(fullName)s,"
msgstr ""
#: n/skins/generic/password_reset_mail.py:6
-msgid "You have asked to change your password."
+msgid "You recently asked to reset your password."
msgstr ""
#: n/skins/generic/password_reset_mail.py:8
msgstr ""
#: n/skins/generic/password_reset_template.pt:21
-msgid "Please enter a new password and clic on \"Validate\" button."
+msgid "Please choose a new password."
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:28
+msgid "New Password"
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:34
+msgid "Confirm New Password"
msgstr ""
#: n/skins/generic/password_reset_template.pt:49
msgstr ""
#: n/skins/generic/request_password_reset_template.pt:12
-msgid "Enter your email or your username below and click on the \"Send\" button. You will receive an email with a link to reset your password."
+msgid "Enter your email or your login below and click on the \"Send\" button. For security reasons, we store your password encrypted, and cannot mail it to you. You will receive an email with a link to reset your password."
msgstr ""
-#: n/skins/generic/request_password_reset_template.pt:19
-msgid "If this will not work for you (for example, if you forget your username or didn't enter your email address) send email to ${admin_email}."
+#: n/skins/generic/request_password_reset_template.pt:21
+msgid "If this will not work for you (for example, if you forgot your login or your email address has changed), contact us at ${admin_email}."
msgstr ""
-#: n/skins/generic/request_password_reset_template.pt:26
+#: n/skins/generic/request_password_reset_template.pt:27
#. Default: "Send"
msgid " Send "
msgstr ""
msgstr ""
#: n/skins/generic/revision_context_header.pt:22
-msgid "\342\206\220 previous revision"
+msgid "← previous revision"
msgstr ""
#: n/skins/generic/revision_context_header.pt:27
msgstr ""
#: n/skins/generic/revision_context_header.pt:29
-msgid "next revision \342\206\222"
+msgid "next revision →"
msgstr ""
#: n/skins/generic/search.py:109
else :
hidden_vars = []
target = '%s/password_reset_form/%s' % (utool(), uuid)
- buttons = ({'name': 'validate', 'value': _('Validate')},)
+ buttons = ({'name': 'validate', 'value': _('Update Password')},)
options['form'] = { 'action': target,
'listButtonInfos': tuple(buttons),
print _('Hi %(fullName)s,')
print
-print _('You have asked to change your password.')
+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:")
<td colspan="2">
<dl class="FieldHelp">
<dd i18n:translate="">
- Please enter a new password and clic on "Validate" button.
+ Please choose a new password.
</dd>
</dl>
</td>
</tr>
<tr>
- <th i18n:translate="">Password</th>
+ <th i18n:translate="">New Password</th>
<td>
<input type="password" name="password"/>
</td>
</tr>
<tr>
- <th i18n:translate="">Confirm</th>
+ <th i18n:translate="">Confirm New Password</th>
<td>
<input type="password" name="confirm"/>
</td>
<div id="Desktop" tal:define="ptool here/portal_properties">
<h1 i18n:translate="">Password reset</h1>
<p i18n:translate="">
- Enter your email or your username below and click on the "Send"
- button. You will receive an email with a link to reset your
+ Enter your email or your login below and click on the "Send" button.
+ For security reasons, we store your password encrypted, and cannot
+ mail it to you. You will receive an email with a link to reset your
password.
</p>
<p i18n:translate="">
- If this will not work for you (for example, if you forget your
- username or didn't enter your email address) send email to <a
- tal:attributes="href string:mailto:${ptool/email_from_address}"
+ If this will not work for you (for example, if you forgot your login
+ or your email address has changed), contact us at
+ <a tal:attributes="href string:mailto:${ptool/email_from_address}"
tal:content="ptool/email_from_address" href="mailto:me@here.com"
i18n:name="admin_email">me@here.com</a>.
</p>