Ajout d'un lien vers la réinitialisation de mot de passe si jamais la connexion a...

diff --git a/locales/en/LC_MESSAGES/plinn.mo b/locales/en/LC_MESSAGES/plinn.mo
index 849a6a2..785873f 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 baf482b..9713ba3 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"
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"

-"POT-Creation-Date: Fri Aug  2 09:38:06 2013\n"
+"POT-Creation-Date: Fri Aug  2 10:08:44 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"
 "PO-Revision-Date: 2007-10-17 14:43+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"


@@ -440,6 +440,7 @@ msgid "Bottom"
 msgstr ""
 
 #: n/skins/custom_generic/logged_in.py:28
 msgstr ""
 
 #: n/skins/custom_generic/logged_in.py:28

+#: n/skins/custom_generic/logged_in_template.pt:9

 msgid "Login failure"
 msgstr ""
 
 msgid "Login failure"
 msgstr ""
 


@@ -451,6 +452,52 @@ msgstr ""
 msgid "Login success"
 msgstr ""
 
 msgid "Login success"
 msgstr ""
 

+#: n/skins/custom_generic/logged_in_template.pt:11
+msgid ""
+"You are not currently logged in. Your username and or password may be "
+"incorrect. Your browser may also not be configured to accept cookies."
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:17
+msgid ""
+"If you have forgotten your password, you can reset it by going to this page:"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:21
+msgid "password resetting"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:29
+msgid "Welcome!"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:33
+msgid ""
+"This is the first time that you've logged in to ${portal_title}. Before you "
+"start exploring you need to change your original password. This will ensure "
+"that the password we sent you via email cannot be used in a malicious manner."
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:38
+msgid "Please use the form below to change your password."
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:53
+msgid "Username"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:58
+msgid "New password"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:63
+msgid "Confirm new password"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:70
+msgid "Change password"
+msgstr ""
+

 #: n/skins/custom_generic/mail_password_template.py:30
 msgid "${portal_title}: Membership reminder"
 msgstr ""
 #: n/skins/custom_generic/mail_password_template.py:30
 msgid "${portal_title}: Membership reminder"
 msgstr ""

diff --git a/locales/fr/LC_MESSAGES/plinn.mo b/locales/fr/LC_MESSAGES/plinn.mo
index 07899bd..2d05a96 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 1869d4e..979c5de 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"
 msgid ""
 msgstr ""
 "Project-Id-Version: Plinn 2.0\n"

-"POT-Creation-Date: Fri Aug  2 09:38:06 2013\n"
-"PO-Revision-Date: 2013-08-02 09:38+0200\n"
+"POT-Creation-Date: Fri Aug  2 10:08:44 2013\n"
+"PO-Revision-Date: 2013-08-02 10:10+0200\n"

 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
 "Language: \n"


@@ -450,6 +450,7 @@ msgid "Bottom"
 msgstr "Dernier"
 
 #: n/skins/custom_generic/logged_in.py:28
 msgstr "Dernier"
 
 #: n/skins/custom_generic/logged_in.py:28

+#: n/skins/custom_generic/logged_in_template.pt:9

 msgid "Login failure"
 msgstr "Échec de la connexion"
 
 msgid "Login failure"
 msgstr "Échec de la connexion"
 


@@ -461,6 +462,59 @@ msgstr "Échec de la connexion"
 msgid "Login success"
 msgstr "Connexion réussie"
 
 msgid "Login success"
 msgstr "Connexion réussie"
 

+#: n/skins/custom_generic/logged_in_template.pt:11
+msgid ""
+"You are not currently logged in. Your username and or password may be "
+"incorrect. Your browser may also not be configured to accept cookies."
+msgstr ""
+"Vous n'êtes pas encore connecté. Votre nom d'utilisateur ou votre mot de "
+"passe sont peut-être incorrects. Votre navigateur doit être configuré afin "
+"d'accepter les cookies."
+
+#: n/skins/custom_generic/logged_in_template.pt:17
+msgid ""
+"If you have forgotten your password, you can reset it by going to this page:"
+msgstr "Si vous avez oublié votre mot de passe, vous pouvez le réinitialiser en allant sur cette page :"
+
+#: n/skins/custom_generic/logged_in_template.pt:21
+msgid "password resetting"
+msgstr "réinitialisation de mot de passe"
+
+#: n/skins/custom_generic/logged_in_template.pt:29
+msgid "Welcome!"
+msgstr "Bienvenue !"
+
+#: n/skins/custom_generic/logged_in_template.pt:33
+msgid ""
+"This is the first time that you've logged in to ${portal_title}. Before you "
+"start exploring you need to change your original password. This will ensure "
+"that the password we sent you via email cannot be used in a malicious manner."
+msgstr ""
+"C'est la première fois que vous vous connectez à ${portal_title}. Avant de "
+"commencer à naviguer, vous devez changer votre mot de passe initial. Cela "
+"vous assurera que le mot de passe, envoyé par mail, ne sera pas utilisé à "
+"votre insu, dans le cas où le message aurait été intercepté."
+
+#: n/skins/custom_generic/logged_in_template.pt:38
+msgid "Please use the form below to change your password."
+msgstr "Utilisez le formulaire ci-dessous pour changer votre mot de passe."
+
+#: n/skins/custom_generic/logged_in_template.pt:53
+msgid "Username"
+msgstr "Login"
+
+#: n/skins/custom_generic/logged_in_template.pt:58
+msgid "New password"
+msgstr "Nouveau mot de passe"
+
+#: n/skins/custom_generic/logged_in_template.pt:63
+msgid "Confirm new password"
+msgstr "Confirmation"
+
+#: n/skins/custom_generic/logged_in_template.pt:70
+msgid "Change password"
+msgstr "Changer le mot de passe"
+

 #: n/skins/custom_generic/mail_password_template.py:30
 msgid "${portal_title}: Membership reminder"
 msgstr "${portal_title} : rappel du mot de passe"
 #: n/skins/custom_generic/mail_password_template.py:30
 msgid "${portal_title}: Membership reminder"
 msgstr "${portal_title} : rappel du mot de passe"


@@ -1082,7 +1136,9 @@ msgstr "Mot de passe changé"
 msgid ""
 "Your password has been successfully reset. You can log in immediately by "
 "clicking the \"Login\" button."
 msgid ""
 "Your password has been successfully reset. You can log in immediately by "
 "clicking the \"Login\" button."

-msgstr "Votre mot de passe a été correctement réinitialisé. Vous pouvez à présent vous connecter en cliquant sur le bouton « Connexion »."
+msgstr ""
+"Votre mot de passe a été correctement réinitialisé. Vous pouvez à présent "
+"vous connecter en cliquant sur le bouton « Connexion »."

 
 #: n/skins/generic/pending_members.pt:9
 msgid "Review members registration"
 
 #: n/skins/generic/pending_members.pt:9
 msgid "Review members registration"

diff --git a/locales/plinn.pot b/locales/plinn.pot
index bedde4e..9dbc6f1 100644 (file)
--- a/locales/plinn.pot
+++ b/locales/plinn.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.0 beta 1\n"

-"POT-Creation-Date: Fri Aug  2 09:38:06 2013\n"
+"POT-Creation-Date: Fri Aug  2 10:09:29 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"
 "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"


@@ -450,6 +450,7 @@ msgid "Bottom"
 msgstr ""
 
 #: n/skins/custom_generic/logged_in.py:28
 msgstr ""
 
 #: n/skins/custom_generic/logged_in.py:28

+#: n/skins/custom_generic/logged_in_template.pt:9

 msgid "Login failure"
 msgstr ""
 
 msgid "Login failure"
 msgstr ""
 


@@ -461,6 +462,46 @@ msgstr ""
 msgid "Login success"
 msgstr ""
 
 msgid "Login success"
 msgstr ""
 

+#: n/skins/custom_generic/logged_in_template.pt:11
+msgid "You are not currently logged in. Your username and or password may be incorrect. Your browser may also not be configured to accept cookies."
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:17
+msgid "If you have forgotten your password, you can reset it by going to this page:"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:21
+msgid "password resetting"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:29
+msgid "Welcome!"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:33
+msgid "This is the first time that you've logged in to ${portal_title}. Before you start exploring you need to change your original password. This will ensure that the password we sent you via email cannot be used in a malicious manner."
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:38
+msgid "Please use the form below to change your password."
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:53
+msgid "Username"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:58
+msgid "New password"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:63
+msgid "Confirm new password"
+msgstr ""
+
+#: n/skins/custom_generic/logged_in_template.pt:70
+msgid "Change password"
+msgstr ""
+

 #: n/skins/custom_generic/mail_password_template.py:30
 msgid "${portal_title}: Membership reminder"
 msgstr ""
 #: n/skins/custom_generic/mail_password_template.py:30
 msgid "${portal_title}: Membership reminder"
 msgstr ""

diff --git a/skins/custom_generic/logged_in_template.pt b/skins/custom_generic/logged_in_template.pt
index 68a9b00..46f903d 100644 (file)
--- a/skins/custom_generic/logged_in_template.pt
+++ b/skins/custom_generic/logged_in_template.pt
@@ -3,18 +3,24 @@
   <head>
     <title>Logged in template</title>
   </head>
   <head>
     <title>Logged in template</title>
   </head>

-  <body i18n:domain="cmf_default">
-    <div metal:fill-slot="main_no_tabs" tal:omit-tag="">
+  <body i18n:domain="plinn">
+    <div metal:fill-slot="main_no_tabs" id="Desktop">

       <div tal:condition="options/is_anon" tal:omit-tag="">
         <h1 class="DesktopTitle" i18n:translate="">Login failure</h1>
 
       <div tal:condition="options/is_anon" tal:omit-tag="">
         <h1 class="DesktopTitle" i18n:translate="">Login failure</h1>
 

-        <p class="Desktop" i18n:translate="">You are not currently logged in. Your
-          username and or password may be incorrect. Your browser may also not be
-          configured to accept HTTP cookies. If you need help please contact
-           <a href="mailto:admin@here.com" title="Email Admin"
-              tal:attributes="href string:mailto:${options/admin_email}"
-              tal:content="options/admin_email"
-              i18n:name="admin_email">Email Admin</a>.
+        <p i18n:translate="">
+          You are not currently logged in. Your username and or password may
+          be incorrect. Your browser may also not be configured to accept
+          cookies.
+        </p>
+        <p>
+          <span i18n:translate="">
+            If you have forgotten your password, you can reset it by going to
+            this page:
+          </span>
+          <a href="#"
+            tal:attributes="href string:$portal_url/request_password_reset_form"
+            i18n:translate="">password resetting</a>.

         </p>
         
       </div>
         </p>
         
       </div>


@@ -22,14 +28,14 @@
       <div tal:condition="options/changePassword|nothing" tal:omit-tag="">
        <h1 class="DesktopTitle" i18n:translate="">Welcome!</h1>
 
       <div tal:condition="options/changePassword|nothing" tal:omit-tag="">
        <h1 class="DesktopTitle" i18n:translate="">Welcome!</h1>
 

-       <p class="Desktop" i18n:translate="">
+       <p i18n:translate="">

           This is the first time that you've logged in to
           <span tal:replace="portal_title" i18n:name="portal_title">Here</span>.
           Before you start exploring you need to change your original password.
           This will ensure that the password we sent you via email cannot be
           used in a malicious manner.</p>
 
           This is the first time that you've logged in to
           <span tal:replace="portal_title" i18n:name="portal_title">Here</span>.
           Before you start exploring you need to change your original password.
           This will ensure that the password we sent you via email cannot be
           used in a malicious manner.</p>
 

-       <p class="Desktop" i18n:translate="">
+       <p i18n:translate="">

           Please use the form below to change your password.</p>
 
        <form action="change_password" method="post"
           Please use the form below to change your password.</p>
 
        <form action="change_password" method="post"