From be8509f9d47d427be5bf7ad9cdcd99a0929f8ac1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <benoit.pin@gmail.com>
Date: Mon, 12 May 2014 23:48:28 +0200
Subject: [PATCH] =?utf8?q?Corrections=20messages=20pour=20r=C3=A9initialis?=
=?utf8?q?ation=20de=20mot=20de=20passe.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
---
RegistrationTool.py | 2 +-
locales/en/LC_MESSAGES/plinn.mo | Bin 2348 -> 2348 bytes
locales/en/LC_MESSAGES/plinn.po | 40 +++++---
locales/fr/LC_MESSAGES/plinn.mo | Bin 41843 -> 42184 bytes
locales/fr/LC_MESSAGES/plinn.po | 88 ++++++++++++------
locales/plinn.pot | 43 +++++----
skins/generic/password_reset_form.py | 2 +-
skins/generic/password_reset_mail.py | 2 +-
skins/generic/password_reset_template.pt | 6 +-
.../request_password_reset_template.pt | 11 ++-
10 files changed, 125 insertions(+), 69 deletions(-)
diff --git a/RegistrationTool.py b/RegistrationTool.py
index bddd44b..e8262f9 100644
--- a/RegistrationTool.py
+++ b/RegistrationTool.py
@@ -270,7 +270,7 @@ class RegistrationTool(BaseRegistrationTool) :
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
diff --git a/locales/en/LC_MESSAGES/plinn.mo b/locales/en/LC_MESSAGES/plinn.mo
index deb2b3fa97461c36ed8454835033f9abe8a25a23..65d19a21bba39d4732e6b78bf899d563bb503a49 100644
GIT binary patch
delta 32
ncmZ1@v_@!yGn=q)ex8DFVx@wik%E!2m9dGHsoCZ*wrflPo&X6i
delta 32
ncmZ1@v_@!yGn;ToX{v%_L6L%jp@N~Am4TU+so~}@wrflPoaqS}
diff --git a/locales/en/LC_MESSAGES/plinn.po b/locales/en/LC_MESSAGES/plinn.po
index 69cef88..740eca6 100644
--- a/locales/en/LC_MESSAGES/plinn.po
+++ b/locales/en/LC_MESSAGES/plinn.po
@@ -1,7 +1,7 @@
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"
@@ -41,7 +41,7 @@ msgid "Your reset password request has expired. You can ask a new one."
msgstr ""
#: n/RegistrationTool.py:273
-msgid "Password successfully reset."
+msgid "Password successfully updated."
msgstr ""
#: n/RegistrationTool.py:275
@@ -532,7 +532,6 @@ msgstr ""
#: 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 ""
@@ -600,14 +599,14 @@ 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}"
@@ -672,7 +671,6 @@ msgstr ""
#: 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 ""
@@ -921,7 +919,6 @@ msgid "Given Name"
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 ""
@@ -1097,12 +1094,16 @@ 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
@@ -1128,7 +1129,15 @@ msgid "Password resetting"
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
@@ -1216,18 +1225,19 @@ 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."
+"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 ""
diff --git a/locales/fr/LC_MESSAGES/plinn.mo b/locales/fr/LC_MESSAGES/plinn.mo
index c7f4f909f8840da70f580fe7d51e786204697a76..a837fd74fa1c892f9d0a2cfb2f1ec86a6516bfd7 100644
GIT binary patch
delta 13686
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
delta 13412
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
diff --git a/locales/fr/LC_MESSAGES/plinn.po b/locales/fr/LC_MESSAGES/plinn.po
index 6e87849..b1c2847 100755
--- a/locales/fr/LC_MESSAGES/plinn.po
+++ b/locales/fr/LC_MESSAGES/plinn.po
@@ -1,8 +1,8 @@
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"
@@ -43,8 +43,8 @@ msgstr ""
"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."
@@ -551,7 +551,6 @@ msgstr "Login"
#: 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"
@@ -631,14 +630,14 @@ msgstr "Requête faîte par l'IP ${ip} à ${time}"
#: 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}"
@@ -706,7 +705,6 @@ msgstr "Corps"
#: 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"
@@ -973,7 +971,6 @@ msgid "Given Name"
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"
@@ -1149,13 +1146,17 @@ msgstr "Coller"
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 ""
@@ -1182,10 +1183,16 @@ msgid "Password resetting"
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"
@@ -1278,24 +1285,26 @@ msgstr "Réinitialisation de mot de passe"
#: 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 "
@@ -2362,6 +2371,33 @@ msgstr "Ceci est la page d'accueil par défaut."
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."
diff --git a/locales/plinn.pot b/locales/plinn.pot
index 2336247..1695fb6 100644
--- a/locales/plinn.pot
+++ b/locales/plinn.pot
@@ -14,7 +14,7 @@
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"
@@ -48,7 +48,7 @@ msgid "Your reset password request has expired. You can ask a new one."
msgstr ""
#: n/RegistrationTool.py:273
-msgid "Password successfully reset."
+msgid "Password successfully updated."
msgstr ""
#: n/RegistrationTool.py:275
@@ -115,11 +115,11 @@ msgid "Cancel delete mode"
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
@@ -542,7 +542,6 @@ msgstr ""
#: 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 ""
@@ -602,14 +601,14 @@ 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
@@ -675,7 +674,6 @@ msgstr ""
#: 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 ""
@@ -932,7 +930,6 @@ 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 ""
@@ -1112,12 +1109,16 @@ 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
@@ -1141,7 +1142,15 @@ msgid "Password resetting"
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
@@ -1225,14 +1234,14 @@ msgid "Password reset"
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 ""
@@ -1246,7 +1255,7 @@ msgid "Restore this revision"
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
@@ -1254,7 +1263,7 @@ msgid "current revision"
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
diff --git a/skins/generic/password_reset_form.py b/skins/generic/password_reset_form.py
index dce99eb..eaa2eb7 100644
--- a/skins/generic/password_reset_form.py
+++ b/skins/generic/password_reset_form.py
@@ -27,7 +27,7 @@ if passwordChanged :
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),
diff --git a/skins/generic/password_reset_mail.py b/skins/generic/password_reset_mail.py
index 442a1f6..7a9ab12 100644
--- a/skins/generic/password_reset_mail.py
+++ b/skins/generic/password_reset_mail.py
@@ -3,7 +3,7 @@ from Products.Plinn.utils import translate as _
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:")
diff --git a/skins/generic/password_reset_template.pt b/skins/generic/password_reset_template.pt
index 0440dd7..d0db692 100644
--- a/skins/generic/password_reset_template.pt
+++ b/skins/generic/password_reset_template.pt
@@ -19,19 +19,19 @@
<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>
diff --git a/skins/generic/request_password_reset_template.pt b/skins/generic/request_password_reset_template.pt
index 3604a2b..69b13d5 100644
--- a/skins/generic/request_password_reset_template.pt
+++ b/skins/generic/request_password_reset_template.pt
@@ -10,14 +10,15 @@
<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>
--
2.20.1