Localisation des messages relatifs à la réinitialisation de son mot de passe.

diff --git a/locales/en/LC_MESSAGES/plinn.mo b/locales/en/LC_MESSAGES/plinn.mo
index 4f25697537c04e0ce265ac24ab9bdc7874ca9f4a..575c3e6d5a7099661858798e50a246e254fd4ec9 100644 (file)
Binary files a/locales/en/LC_MESSAGES/plinn.mo and b/locales/en/LC_MESSAGES/plinn.mo differ

diff --git a/locales/en/LC_MESSAGES/plinn.po b/locales/en/LC_MESSAGES/plinn.po
index aa5bd56e886f2aa6065a054480ae7ac7ffa839ff..af1cc7f6bd8fd2901182b49ae963e3cf7912ea27 100644 (file)
--- 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: Mon Jul 29 14:16:13 2013\n"
+"POT-Creation-Date: Wed Jul 31 12:38:09 2013\n"
 "PO-Revision-Date: 2007-10-17 14:43+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
@@ -32,23 +32,23 @@ msgstr ""
 msgid "%s's front page"
 msgstr ""
 
-#: n/RegistrationTool.py:217
-msgid "Invalid reset password request."
+#: n/RegistrationTool.py:230
+msgid "Unknown user name. Please retry."
 msgstr ""
 
-#: n/RegistrationTool.py:222
-msgid "Invalid userid."
+#: n/RegistrationTool.py:245
+msgid "Invalid reset password request."
 msgstr ""
 
-#: n/RegistrationTool.py:226
+#: n/RegistrationTool.py:251
 msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 
-#: n/RegistrationTool.py:235
+#: n/RegistrationTool.py:260
 msgid "Password successfully resetted."
 msgstr ""
 
-#: n/RegistrationTool.py:237
+#: n/RegistrationTool.py:262
 msgid "\"%s\" username not found."
 msgstr ""
 
@@ -559,6 +559,7 @@ 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_template.pt:39
 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr ""
@@ -813,10 +814,12 @@ msgid "Given Name"
 msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:268 n/skins/generic/gruf_macros.pt:390
+#: n/skins/generic/password_reset_template.pt:25
 msgid "Password"
 msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:274 n/skins/generic/gruf_macros.pt:396
+#: n/skins/generic/password_reset_template.pt:31
 msgid "Confirm"
 msgstr ""
 
@@ -992,6 +995,14 @@ msgstr ""
 msgid "Exit boxes editing"
 msgstr ""
 
+#: n/skins/generic/password_reset_template.pt:13
+msgid "Password resetting"
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:18
+msgid "Please enter a new password and clic on \"Validate\" button."
+msgstr ""
+
 #: n/skins/generic/pending_members.pt:9
 msgid "Review members registration"
 msgstr ""
@@ -1057,24 +1068,28 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: n/skins/generic/request_password_reset_form.pt:11
+#: n/skins/generic/request_password_reset_form.py:10
+msgid "Request for resetting password sent to your contact email."
+msgstr ""
+
+#: n/skins/generic/request_password_reset_template.pt:11
 msgid "Password reset"
 msgstr ""
 
-#: n/skins/generic/request_password_reset_form.pt:12
+#: n/skins/generic/request_password_reset_template.pt:12
 msgid ""
 "Enter your username below and click on the \"Send\" button. You will receive "
 "an email with a link to reset your password."
 msgstr ""
 
-#: n/skins/generic/request_password_reset_form.pt:18
+#: n/skins/generic/request_password_reset_template.pt:18
 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 ""
 
 #. Default: "Send"
-#: n/skins/generic/request_password_reset_form.pt:25
+#: n/skins/generic/request_password_reset_template.pt:25
 msgid " Send "
 msgstr ""
 

diff --git a/locales/fr/LC_MESSAGES/plinn.mo b/locales/fr/LC_MESSAGES/plinn.mo
index f791fe9bb47f0cb11a4a4bf4d9a8711a29f6f13c..c496a11501b322e3441655726ead48cdaa1362e0 100644 (file)
Binary files a/locales/fr/LC_MESSAGES/plinn.mo and b/locales/fr/LC_MESSAGES/plinn.mo differ

diff --git a/locales/fr/LC_MESSAGES/plinn.po b/locales/fr/LC_MESSAGES/plinn.po
index e3576be7afca4231de4a8b02272710d828c175f5..06f3233b5edd2267782c324d7fcc782b0b115312 100755 (executable)
--- 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: Mon Jul 29 14:16:13 2013\n"
-"PO-Revision-Date: 2013-07-29 15:16+0200\n"
+"POT-Creation-Date: Wed Jul 31 12:38:09 2013\n"
+"PO-Revision-Date: 2013-07-31 12:42+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
@@ -32,23 +32,25 @@ msgstr "Accueil : %s"
 msgid "%s's front page"
 msgstr "Page d'accueil de %s"
 
-#: n/RegistrationTool.py:217
+#: n/RegistrationTool.py:230
+msgid "Unknown user name. Please retry."
+msgstr "Nom d'utilisateur inconnu. Veuillez réessayer."
+
+#: n/RegistrationTool.py:245
 msgid "Invalid reset password request."
 msgstr "Demande de réinitialisation de mot de passe invalide."
 
-#: n/RegistrationTool.py:222
-msgid "Invalid userid."
-msgstr "Login invalide."
-
-#: n/RegistrationTool.py:226
+#: n/RegistrationTool.py:251
 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."
+msgstr ""
+"Votre demande de réinitialisation de mot de passe a expiré. Vous pouvez en "
+"demander une nouvelle."
 
-#: n/RegistrationTool.py:235
+#: n/RegistrationTool.py:260
 msgid "Password successfully resetted."
 msgstr "Mot de passe correctement réinitialisé."
 
-#: n/RegistrationTool.py:237
+#: n/RegistrationTool.py:262
 msgid "\"%s\" username not found."
 msgstr "Nom : « %s » non trouvé."
 
@@ -575,6 +577,7 @@ 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_template.pt:39
 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr "Valider"
@@ -847,10 +850,12 @@ msgid "Given Name"
 msgstr "Prénom"
 
 #: n/skins/generic/gruf_macros.pt:268 n/skins/generic/gruf_macros.pt:390
+#: n/skins/generic/password_reset_template.pt:25
 msgid "Password"
 msgstr "Mot de passe"
 
 #: n/skins/generic/gruf_macros.pt:274 n/skins/generic/gruf_macros.pt:396
+#: n/skins/generic/password_reset_template.pt:31
 msgid "Confirm"
 msgstr "Confirmation"
 
@@ -1026,6 +1031,14 @@ msgstr "Coller"
 msgid "Exit boxes editing"
 msgstr "Quitter l'édition des boîtes"
 
+#: n/skins/generic/password_reset_template.pt:13
+msgid "Password resetting"
+msgstr "Réinitialisation du mot de passe"
+
+#: n/skins/generic/password_reset_template.pt:18
+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 »."
+
 #: n/skins/generic/pending_members.pt:9
 msgid "Review members registration"
 msgstr "Modérer l'inscription des membres"
@@ -1093,24 +1106,33 @@ msgstr ""
 msgid "Send"
 msgstr "Envoyer"
 
-#: n/skins/generic/request_password_reset_form.pt:11
+#: n/skins/generic/request_password_reset_form.py:10
+msgid "Request for resetting password sent to your contact email."
+msgstr "Requête pour réinitialisation de mot de passe envoyée à votre adresse email de contact."
+
+#: n/skins/generic/request_password_reset_template.pt:11
 msgid "Password reset"
 msgstr "Réinitialisation de mot de passe"
 
-#: n/skins/generic/request_password_reset_form.pt:12
+#: n/skins/generic/request_password_reset_template.pt:12
 msgid ""
 "Enter your username below and click on the \"Send\" button. You will receive "
 "an email with a link to reset your password."
-msgstr "Entrez votre login ci-dessous et cliquez sur « Envoyer ». Vous recevrez un email contenant un lien pour réinitialiser votre mot de passe."
+msgstr ""
+"Entrez votre login ci-dessous et cliquez sur « Envoyer ». Vous recevrez un "
+"email contenant un lien pour réinitialiser votre mot de passe."
 
-#: n/skins/generic/request_password_reset_form.pt:18
+#: n/skins/generic/request_password_reset_template.pt:18
 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}."
+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}."
 
 #. Default: "Send"
-#: n/skins/generic/request_password_reset_form.pt:25
+#: n/skins/generic/request_password_reset_template.pt:25
 msgid " Send "
 msgstr " Envoyer "
 
@@ -2171,6 +2193,9 @@ msgstr "Cc"
 msgid "mail_bcc"
 msgstr "Cci"
 
+#~ msgid "Invalid userid."
+#~ msgstr "Login invalide."
+
 #~ msgid "List"
 #~ msgstr "Lister"
 

diff --git a/locales/plinn.pot b/locales/plinn.pot
index daff4511166712179fc408c2ff2a0d606dd83445..f8519ef82f80d457d3606d62f64c28d135ccab4b 100644 (file)
--- 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: Mon Jul 29 14:16:13 2013\n"
+"POT-Creation-Date: Wed Jul 31 12:38:09 2013\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"
@@ -39,23 +39,23 @@ msgstr ""
 msgid "%s's front page"
 msgstr ""
 
-#: n/RegistrationTool.py:217
-msgid "Invalid reset password request."
+#: n/RegistrationTool.py:230
+msgid "Unknown user name. Please retry."
 msgstr ""
 
-#: n/RegistrationTool.py:222
-msgid "Invalid userid."
+#: n/RegistrationTool.py:245
+msgid "Invalid reset password request."
 msgstr ""
 
-#: n/RegistrationTool.py:226
+#: n/RegistrationTool.py:251
 msgid "Your reset password request has expired. You can ask a new one."
 msgstr ""
 
-#: n/RegistrationTool.py:235
+#: n/RegistrationTool.py:260
 msgid "Password successfully resetted."
 msgstr ""
 
-#: n/RegistrationTool.py:237
+#: n/RegistrationTool.py:262
 msgid "\"%s\" username not found."
 msgstr ""
 
@@ -566,6 +566,7 @@ 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_template.pt:39
 #: n/skins/generic/send_email_form.pt:79
 msgid "Validate"
 msgstr ""
@@ -829,11 +830,13 @@ msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:268
 #: n/skins/generic/gruf_macros.pt:390
+#: n/skins/generic/password_reset_template.pt:25
 msgid "Password"
 msgstr ""
 
 #: n/skins/generic/gruf_macros.pt:274
 #: n/skins/generic/gruf_macros.pt:396
+#: n/skins/generic/password_reset_template.pt:31
 msgid "Confirm"
 msgstr ""
 
@@ -1014,6 +1017,14 @@ msgstr ""
 msgid "Exit boxes editing"
 msgstr ""
 
+#: n/skins/generic/password_reset_template.pt:13
+msgid "Password resetting"
+msgstr ""
+
+#: n/skins/generic/password_reset_template.pt:18
+msgid "Please enter a new password and clic on \"Validate\" button."
+msgstr ""
+
 #: n/skins/generic/pending_members.pt:9
 msgid "Review members registration"
 msgstr ""
@@ -1078,19 +1089,23 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: n/skins/generic/request_password_reset_form.pt:11
+#: n/skins/generic/request_password_reset_form.py:10
+msgid "Request for resetting password sent to your contact email."
+msgstr ""
+
+#: n/skins/generic/request_password_reset_template.pt:11
 msgid "Password reset"
 msgstr ""
 
-#: n/skins/generic/request_password_reset_form.pt:12
+#: n/skins/generic/request_password_reset_template.pt:12
 msgid "Enter your username below and click on the \"Send\" button. You will receive an email with a link to reset your password."
 msgstr ""
 
-#: n/skins/generic/request_password_reset_form.pt:18
+#: n/skins/generic/request_password_reset_template.pt:18
 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 ""
 
-#: n/skins/generic/request_password_reset_form.pt:25
+#: n/skins/generic/request_password_reset_template.pt:25
 #. Default: "Send"
 msgid " Send "
 msgstr ""

diff --git a/skins/generic/request_password_reset_form.py b/skins/generic/request_password_reset_form.py
index 1e9b57c2519aa06091b15c7dda15bc173324211f..a08d980a4c3b4b84fca311cfd9bac05c895f0890 100644 (file)
--- a/skins/generic/request_password_reset_form.py
+++ b/skins/generic/request_password_reset_form.py
@@ -1,6 +1,8 @@
 ##parameters=userid='', requestReset='', ajax=''
 from Products.CMFCore.utils import getUtilityByInterfaceName
-from Products.Plinn.utils import Message as _
+from Products.Plinn.utils import translate
+
+_ = lambda msg : translate(msg, context)
 utool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IURLTool')
 rtool = getUtilityByInterfaceName('Products.CMFCore.interfaces.IRegistrationTool')