i18n update

debian/changelog

@@ -2,5 +2,4 @@ cubicweb-forgotpwd (0.1.0-1) unstable; urgency=low
 
   * initial release
 
- -- Charles Hebert <charles.hebert@logilab.fr>  Fri, 22 Jan 2010 07:57:00 +0100
- 
\ No newline at end of file
+ -- Adrien Di Mascio <Adrien.DiMascio@logilab.fr>  Thu, 04 Feb 2010 09:01:14 +0100

debian/control

@@ -8,7 +8,7 @@ Standards-Version: 3.8.0
 
 Package: cubicweb-forgotpwd
 Architecture: all
-Depends: cubicweb-common (>= 3.5.11)
+Depends: cubicweb-common (>= 3.5.11), cubicwbe-registration (>= 0.2.1)
 Description: password recovery cube
  CubicWeb is a semantic web application framework.
  .

i18n/en.po

+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
 msgid ""
 msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"PO-Revision-Date: 2010-02-04 10:38+0100\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: pygettext.py 1.5\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#, python-format
-msgid ""
-"\n"
-"        There was recently a request to change the password on your "
-"account.\n"
-"        If you requested this password change, please set a new password by "
-"following\n"
-"        the link below:\n"
-"\n"
-"        %(url)s\n"
-"\n"
-"        If you do not want to change your password, you may ignore this "
-"message. The\n"
-"        link expires in %(limit)d minutes.\n"
-"\n"
-"        See you soon on %(base_url)s !\n"
-"        "
-msgstr ""
+#~ msgid ""
+#~ msgstr ""
+#~ "MIME-Version: 1.0\n"
+#~ "Content-Type: text/plain; charset=UTF-8\n"
+#~ "Content-Transfer-Encoding: 8bit\n"
+#~ "Generated-By: pygettext.py 1.5\n"
+#~ "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 msgid ""
 "An email has been sent, follow instructions in there to change your password."
 msgstr ""
 
-msgid "An error occured, this email is unknown."
+msgid "An error occured, this email address is unknown."
 msgstr ""
 
 msgid "Forgot your password ?"
 msgstr ""
 
-msgid "Forgotten your password ?"
-msgstr ""
-
 # schema pot file, generated on 2010-01-21 16:01:14
 #
 # singular and plural forms for each entity type
@@ -53,16 +46,28 @@ msgstr ""
 msgid "New Fpasswd"
 msgstr ""
 
-#, python-format
-msgid "Password request on %(base_url)s"
-msgstr ""
-
 msgid "Request to change your password"
 msgstr ""
 
 msgid "That link has either expired or is not valid."
 msgstr ""
 
+#, python-format
+msgid ""
+"There was recently a request to change the password on your account.\n"
+"If you requested this password change, please set a new password by "
+"following\n"
+"the link below:\n"
+"\n"
+"%(resetlink)s\n"
+"\n"
+"If you do not want to change your password, you may ignore this message. "
+"The\n"
+"link expires in %(limit)s minutes.\n"
+"\n"
+"See you soon on %(base_url)s !\n"
+msgstr ""
+
 msgid "This Fpasswd"
 msgstr ""
 
@@ -72,7 +77,7 @@ msgstr ""
 msgid "You already changed your password. This link has expired."
 msgstr ""
 
-msgid "You have already ask for a new password."
+msgid "You have already asked for a new password."
 msgstr ""
 
 msgid "Your password has been changed !"
@@ -100,18 +105,6 @@ msgstr ""
 msgid "incorrect captcha value"
 msgstr ""
 
-msgid "log in"
-msgstr ""
-
-msgid "login"
-msgstr ""
-
-msgid "login or email"
-msgstr ""
-
-msgid "password"
-msgstr ""
-
 msgid "passwords are different"
 msgstr ""
 
@@ -122,7 +115,7 @@ msgid "required attribute"
 msgstr ""
 
 msgid "revocation_date"
-msgstr ""
+msgstr "revocation date"
 
 msgctxt "Fpasswd"
 msgid "revocation_date"
@@ -138,5 +131,5 @@ msgstr ""
 msgid "unable to check captcha, please try again"
 msgstr ""
 
-msgid "your email"
+msgid "your email address"
 msgstr ""

i18n/es.po

@@ -6,38 +6,16 @@ msgstr ""
 "Generated-By: pygettext.py 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#, python-format
-msgid ""
-"\n"
-"        There was recently a request to change the password on your "
-"account.\n"
-"        If you requested this password change, please set a new password by "
-"following\n"
-"        the link below:\n"
-"\n"
-"        %(url)s\n"
-"\n"
-"        If you do not want to change your password, you may ignore this "
-"message. The\n"
-"        link expires in %(limit)d minutes.\n"
-"\n"
-"        See you soon on %(base_url)s !\n"
-"        "
-msgstr ""
-
 msgid ""
 "An email has been sent, follow instructions in there to change your password."
 msgstr ""
 
-msgid "An error occured, this email is unknown."
+msgid "An error occured, this email address is unknown."
 msgstr ""
 
 msgid "Forgot your password ?"
 msgstr ""
 
-msgid "Forgotten your password ?"
-msgstr ""
-
 # schema pot file, generated on 2010-01-21 16:01:14
 #
 # singular and plural forms for each entity type
@@ -53,16 +31,28 @@ msgstr ""
 msgid "New Fpasswd"
 msgstr ""
 
-#, python-format
-msgid "Password request on %(base_url)s"
-msgstr ""
-
 msgid "Request to change your password"
 msgstr ""
 
 msgid "That link has either expired or is not valid."
 msgstr ""
 
+#, python-format
+msgid ""
+"There was recently a request to change the password on your account.\n"
+"If you requested this password change, please set a new password by "
+"following\n"
+"the link below:\n"
+"\n"
+"%(resetlink)s\n"
+"\n"
+"If you do not want to change your password, you may ignore this message. "
+"The\n"
+"link expires in %(limit)s minutes.\n"
+"\n"
+"See you soon on %(base_url)s !\n"
+msgstr ""
+
 msgid "This Fpasswd"
 msgstr ""
 
@@ -72,7 +62,7 @@ msgstr ""
 msgid "You already changed your password. This link has expired."
 msgstr ""
 
-msgid "You have already ask for a new password."
+msgid "You have already asked for a new password."
 msgstr ""
 
 msgid "Your password has been changed !"
@@ -100,18 +90,6 @@ msgstr ""
 msgid "incorrect captcha value"
 msgstr ""
 
-msgid "log in"
-msgstr ""
-
-msgid "login"
-msgstr ""
-
-msgid "login or email"
-msgstr ""
-
-msgid "password"
-msgstr ""
-
 msgid "passwords are different"
 msgstr ""
 
@@ -138,5 +116,5 @@ msgstr ""
 msgid "unable to check captcha, please try again"
 msgstr ""
 
-msgid "your email"
+msgid "your email address"
 msgstr ""

i18n/fr.po

 msgid ""
 msgstr ""
 "Project-Id-Version: cubicweb 3.5.11\n"
-"PO-Revision-Date: 2008-03-28 18:14+0100\n"
+"PO-Revision-Date: 2010-02-04 10:38+0100\n"
 "Last-Translator: Logilab Team <contact@logilab.fr>\n"
 "Language-Team: fr <contact@logilab.fr>\n"
 "MIME-Version: 1.0\n"
@@ -10,6 +10,18 @@ msgstr ""
 "Generated-By: cubicweb-devtools\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+msgid ""
+"An email has been sent, follow instructions in there to change your password."
+msgstr ""
+"Un courriel contenant les instructions pour changer votre mot de passe vous "
+"a été envoyé."
+
+msgid "An error occured, this email address is unknown."
+msgstr "Cette adrese électronique est inconnue."
+
+msgid "Forgot your password ?"
+msgstr "Mot de passe oublié ?"
+
 # schema pot file, generated on 2010-01-21 16:19:37
 #
 # singular and plural forms for each entity type
@@ -19,128 +31,108 @@ msgstr ""
 msgid "Fpasswd_plural"
 msgstr ""
 
-msgid "This Fpasswd"
-msgstr ""
+msgid "Invalid link. Please try again."
+msgstr "Ce lien est incorrect."
 
 msgid "New Fpasswd"
 msgstr ""
 
-# subject and object forms for each relation type
-# (no object form for final or symetric relation types)
-msgid "has_fpasswd"
-msgstr ""
-
-msgctxt "CWUser"
-msgid "has_fpasswd"
-msgstr ""
-
-msgctxt "Fpasswd"
-msgid "has_fpasswd_object"
-msgstr ""
-
-msgid "has_fpasswd_object"
-msgstr ""
-
-msgid "revocation_date"
-msgstr ""
-
-msgctxt "Fpasswd"
-msgid "revocation_date"
-msgstr ""
-
-msgid "revocation_id"
-msgstr ""
+msgid "Request to change your password"
+msgstr "Demande de changement de mot de passe"
 
-msgctxt "Fpasswd"
-msgid "revocation_id"
-msgstr ""
+msgid "That link has either expired or is not valid."
+msgstr "Ce lien n'est pas valide ou a expiré"
 
-msgid "login or email"
+#, python-format
+msgid ""
+"There was recently a request to change the password on your account.\n"
+"If you requested this password change, please set a new password by "
+"following\n"
+"the link below:\n"
+"\n"
+"%(resetlink)s\n"
+"\n"
+"If you do not want to change your password, you may ignore this message. "
+"The\n"
+"link expires in %(limit)s minutes.\n"
+"\n"
+"See you soon on %(base_url)s !\n"
 msgstr ""
+"Une demande de changement de mot de passe vient d'être faite.\n"
+"Si vous avez effectivement fait cette demande, vous pouvez réinitialiser\n"
+"votre mot de passe en cliquant sur le lien suivant:\n"
+"\n"
+"%(resetlink)s\n"
+"\n"
+"Si vous ne voulez pas réinitialiser votre mot de passe, vous pouvez ignorer\n"
+"ce message.\n"
+"Ce lien expirera dans %(limit)s minutes.\n"
+"\n"
+"À bientôt sur %(base_url)s.\\n"
 
-msgid "login"
+msgid "This Fpasswd"
 msgstr ""
 
-msgid "password"
-msgstr ""
+msgid "Update your password:"
+msgstr "Réinitialisez votre mot de passe :"
 
-msgid "log in"
-msgstr ""
+msgid "You already changed your password. This link has expired."
+msgstr "Vous avez déjà changé votre de mot de passe, ce lien a expiré."
 
-msgid "Forgotten your password ?"
+msgid "You have already asked for a new password."
 msgstr ""
+"Vous avez déjà une demande de réinitialisation de mot de passe en cours."
 
-msgid "your email"
-msgstr ""
+msgid "Your password has been changed !"
+msgstr "Votre mot de passe a été changé."
 
 msgid "captcha"
-msgstr ""
+msgstr "image test"
 
-msgid "please copy the letters from the image"
-msgstr ""
-
-msgid "Forgot your password ?"
+# subject and object forms for each relation type
+# (no object form for final or symetric relation types)
+msgid "has_fpasswd"
 msgstr ""
 
-#, python-format
-msgid "Password request on %(base_url)s"
+msgctxt "CWUser"
+msgid "has_fpasswd"
 msgstr ""
 
-msgid "required attribute"
+msgctxt "Fpasswd"
+msgid "has_fpasswd_object"
 msgstr ""
 
-msgid "unable to check captcha, please try again"
+msgid "has_fpasswd_object"
 msgstr ""
 
 msgid "incorrect captcha value"
-msgstr ""
-
-msgid "Invalid link. Please try again."
-msgstr ""
-
-msgid "Update your password:"
-msgstr ""
+msgstr "mauvaise valeur pour l'image test"
 
 msgid "passwords are different"
-msgstr ""
+msgstr "les mots de passe sont différents"
 
-msgid "You have already ask for a new password."
-msgstr ""
+msgid "please copy the letters from the image"
+msgstr "recopiez le texte affiché dans l'image test"
 
-msgid "An error occured, this email is unknown."
-msgstr ""
+msgid "required attribute"
+msgstr "attribut requis"
 
-msgid "Request to change your password"
-msgstr ""
+msgid "revocation_date"
+msgstr "date de révocation"
 
-#, python-format
-msgid ""
-"\n"
-"        There was recently a request to change the password on your "
-"account.\n"
-"        If you requested this password change, please set a new password by "
-"following\n"
-"        the link below:\n"
-"\n"
-"        %(url)s\n"
-"\n"
-"        If you do not want to change your password, you may ignore this "
-"message. The\n"
-"        link expires in %(limit)d minutes.\n"
-"\n"
-"        See you soon on %(base_url)s !\n"
-"        "
+msgctxt "Fpasswd"
+msgid "revocation_date"
 msgstr ""
 
-msgid ""
-"An email has been sent, follow instructions in there to change your password."
+msgid "revocation_id"
 msgstr ""
 
-msgid "Your password has been changed !"
+msgctxt "Fpasswd"
+msgid "revocation_id"
 msgstr ""
 
-msgid "That link has either expired or is not valid."
-msgstr ""
+msgid "unable to check captcha, please try again"
+msgstr "impossible de vérifier l'image test, essayez à nouveau"
 
-msgid "You already changed your password. This link has expired."
-msgstr ""
+msgid "your email address"
+msgstr "votre adresse électronique"

views.py

@@ -33,7 +33,7 @@ class LogFormTemplateForgotPassword(basetemplates.LogFormTemplate):
         super(LogFormTemplateForgotPassword, self).login_form(id)
         self.req.add_css('cubes.forgotpwd.css')
         self.w(u'<p style="text-align:center"><a href="%s">%s</a></p>' % (
-            self.build_url('forgottenpassword'), self.req._('Forgotten your password ?')))
+            self.build_url('forgottenpassword'), self.req._('Forgot your password ?')))
 
 # First form, send an email
 # -------------------------
@@ -46,7 +46,7 @@ class ForgottenPasswordForm(forms.FieldsForm):
     def action(self):
         return self.req.build_url(u'forgottenpassword_sendmail')
 
-    use_email = ff.StringField(widget=wdg.TextInput(), required=True, label=_(u'your email'))
+    use_email = ff.StringField(widget=wdg.TextInput(), required=True, label=_(u'your email address'))
     captcha = ff.StringField(widget=CaptchaWidget(), required=True,
                              label=_('captcha'),
                              help=_('please copy the letters from the image'))
@@ -62,8 +62,6 @@ class ForgottenPasswordFormView(form.FormViewMixIn, StartupView):
 class ForgottenPasswordSendMailController(controller.Controller):
     id = 'forgottenpassword_sendmail'
 
-    subject = _(u'Password request on %(base_url)s')
-
     def publish(self, rset=None):
         data = self.checked_data()
         try: