From 2b6c904dff94cddbb417c06b5852029418390b7b Mon Sep 17 00:00:00 2001 From: test test Date: Thu, 24 Jun 2021 11:13:12 +0200 Subject: [PATCH] Fix password reset issue Add translation for password reset --- teleforma/locale/en/LC_MESSAGES/django.mo | Bin 13187 -> 13146 bytes teleforma/locale/fr/LC_MESSAGES/django.mo | Bin 30813 -> 33620 bytes teleforma/locale/fr/LC_MESSAGES/django.po | 46 +++++++++--------- teleforma/templates/registration/login.html | 30 ------------ .../registration/password_reset_email.html | 2 +- teleforma/templates/teleforma/login.html | 2 +- teleforma/urls.py | 7 +-- 7 files changed, 27 insertions(+), 60 deletions(-) delete mode 100644 teleforma/templates/registration/login.html diff --git a/teleforma/locale/en/LC_MESSAGES/django.mo b/teleforma/locale/en/LC_MESSAGES/django.mo index a87753d7eb8377cff8b2cfcf83a7c6683002ae07..8595ef63756c97500b5dfab3554f82722c899dce 100644 GIT binary patch delta 2193 zcmXZeYiQP09Ki8^&h6Rev+dc`Ih|c>ZgaY=T>8e!pd{TOY!x!Fb%8Ax1wq3L)qKiI za0@b$5lDE!STDM%L{@A@2EM6GyMZZXNRi1ZCKc3L->?7QtIs*-f6n<`&NK1Z4W}P^ z=egp1*A+?9RF@>hNs??^m^y?vG2ewt@g&Z`g8C$xjTM-|`mhB(zZ^?&B^KctEXTE& z#rwiXu#owd`Xqn(;;k$gU@#m;5AH_~9>irhhNU=x)A2tva6v;FIE$`VqvvXI7A`{X zzZr|L9lhtyhJ5;AJqtM&HeeZUK`Ysg1-KKvU>8>6-tZ9GiBG~$(S*K=?`N@s`ET)k z3QaK6m?o0VGce#x^r8i5z@}Jl!6N22#`>+{?Xlhwc49UAy3qR`!x|hw3mHZO@5L&7 z4edbwNNhNU85TZ^4`0Xn59oy#V*WSU(rJs*%I2Wo8^h)3)7^#^a#zgPp-<9_Ch$1+ z5kGmJfvq3M3{IgLXPVNMSE89;iMH}u^a_98-!38*g#kdDc@O8A}L+JTY zoJIWP1Oo${#|Q8i^sPG$Ry9_$YLV!a_nPUy z6@1Ks6`w)_ej8puGoM5gt!PR2RihWwqCc_*ydM|iJvfMc_&xe#UDKK--i_YVix&E5 zEB*J!w~+-mZjTMS(F*sY3BDEI$FQ9FmuSL2q80s&?*9X`I2rTO>(b6tqlGl1iLXRE z)1GHwCTr0|y3h+Bj`e=@!l%#+cA$ZFqn#Q-6aN6q@C26Q+4z1DJwJt>%U+)*P!s0s z7#O$}4SWmw#_i~V&X{+j3G||wZ$?``fS!8>t!xN$I2`LE;X!o&hv@xB)Af9EoWXn+ zPNFRxM>kHOmHdUiS<%uop)#Dtd~P@&z3^(ZBaLXqE6_w&qlw*tcDf7g*n>FTzyD2_ z2TAfIy7B372n{@pR`@C!Xav3JZ8YH{XhNgt{*U7OaWsK1(0$*;{5v$xIn4O?f02O) zFQI|{K{G6DOXu^@zzf4>tYW?lXX0u!q4ijaJ?Q>T=o4;56B$Gk-HADT8S@4@z`(%o zqnRB;e@vgFnV*U8=gip-_D7M(AVw`3?vGwDh-#6I6$E4Jb=CLRbN%(X@B6v$>$>jid5+k( zdPl>VmQ=5KfOF$UJD2L5J2}R;3#Tye#u&cDbSx=!E*C2>1?QWKQ0JFn8a7}6H{oF1 zhJ$dIxgV36A1!p=`@qLoP=Zdg2X*i&>R=yE#C{B7e%QGr9E(a^f=V2>^(xf48qC4Z zQSnz}02@(pwue3cK?@5Z7WQBU9z_K_jRWyKDnK_5!7Ju%R41O8|Dp=|-<}7?I+w|O zC~993s_-ZVFzzu>!YP=7b5RMuu=Pc#jVo>a8*_uLC(I`NkbTXlct7A!>_Ap4rcxuRY>{-|3)Fy{^2+X!!|ERb*2h+kvdf2 z4XDmEdJI&_HdGQpc4=lCaP;B!=gfvEpH7j?b}buNx7 zV7lpj${@tTVpQTas8%(i4m8=k6;(hxs`4YK)_0)Joj?Wd!Vvb@dav1s+W!C*|B=7$ zxu*>BS$K(RX diff --git a/teleforma/locale/fr/LC_MESSAGES/django.mo b/teleforma/locale/fr/LC_MESSAGES/django.mo index ce0bfce23fe56263398cbe62b535969c27e7ff77..fca1f68b960221840c0d03efcbb1400a1e7c5444 100644 GIT binary patch literal 33620 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 Hh`0X&qQ9f= delta 12587 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 GkpBbMfqno0 diff --git a/teleforma/locale/fr/LC_MESSAGES/django.po b/teleforma/locale/fr/LC_MESSAGES/django.po index c14f23f0..94510e88 100644 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/LC_MESSAGES/django.po @@ -1427,7 +1427,7 @@ msgstr "Se connecter en tant que" #: templates/registration/login.html:9 templates/telemeta/login.html:19 msgid "Your username and password didn't match. Please try again." -msgstr "" +msgstr "Votre login et mot de passe ne correspondent pas. Veuillez réessayer." #: templates/registration/login.html:23 #, python-format @@ -3381,7 +3381,7 @@ msgstr "" #: templates/telemeta/registration/logged_out.html:8 msgid "Log in again" -msgstr "" +msgstr "Se reconnecter" #: templates/telemeta/registration/password_change_done.html:3 #: templates/telemeta/registration/password_change_form.html:4 @@ -3395,11 +3395,11 @@ msgstr "Déconnexion" #: templates/telemeta/registration/password_change_done.html:5 msgid "Password change successful" -msgstr "" +msgstr "Mot de passe modifié avec succès" #: templates/telemeta/registration/password_change_done.html:9 msgid "Your password was changed." -msgstr "" +msgstr "Votre mot de passe a été modifié." #: templates/telemeta/registration/password_change_form.html:6 msgid "Password change" @@ -3408,22 +3408,22 @@ msgstr "Modification de mot de passe" #: templates/telemeta/registration/password_change_form.html:14 msgid "Please correct the error below." msgid_plural "Please correct the errors below." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Veuillez corriger l'erreur ci-dessous." +msgstr[1] "Veuillez corriger les erreurs ci-dessous." #: templates/telemeta/registration/password_change_form.html:18 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." -msgstr "" +msgstr "Veuillez saisir votre ancien mot de passe pour des raisons de sécurité." #: templates/telemeta/registration/password_change_form.html:24 msgid "Old password" -msgstr "" +msgstr "Ancien mot de passe" #: templates/telemeta/registration/password_change_form.html:29 msgid "New password" -msgstr "" +msgstr "Nouveau mot de passe" #: templates/telemeta/registration/password_change_form.html:34 msgid "Password (again)" @@ -3432,39 +3432,39 @@ msgstr "Mot de passe (encore)" #: templates/telemeta/registration/password_change_form.html:42 #: templates/telemeta/registration/password_reset_confirm.html:20 msgid "Change my password" -msgstr "" +msgstr "Changer mon mot de passe" #: templates/telemeta/registration/password_reset_complete.html:7 msgid "Your password has been set. You may go ahead and log in now." -msgstr "" +msgstr "Votre mot de passe a été rédéfini. Vous pouvez désormais vous connecter." #: templates/telemeta/registration/password_reset_complete.html:10 msgid "Log in" -msgstr "" +msgstr "Se connecter" #: templates/telemeta/registration/password_reset_confirm.html:8 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." -msgstr "" +msgstr "Veuillez saisir votre nouveau mot de passe une seconde fois." #: templates/telemeta/registration/password_reset_confirm.html:14 msgid "New password:" -msgstr "" +msgstr "Nouveau mot de passe" #: templates/telemeta/registration/password_reset_confirm.html:16 msgid "Confirm password:" -msgstr "" +msgstr "Confirmez votre mot de passe:" #: templates/telemeta/registration/password_reset_confirm.html:24 msgid "Password reset unsuccessful" -msgstr "" +msgstr "Echec de la réinitialisation de mot de passe" #: templates/telemeta/registration/password_reset_confirm.html:25 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." -msgstr "" +msgstr "Le lien de réinitialisation de mot de passe est invalide. Probablement parce qu'il a déja été utilisé. Veuillez faire une nouvelle demande de changement de mot de passe." #: templates/telemeta/registration/password_reset_done.html:4 msgid "Password reset successful" @@ -3474,7 +3474,7 @@ msgstr "Demande de réinitialisation de mot de passe envoyée" msgid "" "We've e-mailed you instructions for setting your password to the e-mail " "address you submitted. You should be receiving it shortly." -msgstr "" +msgstr "Nous vous avons envoyé des instructions sur l'adresse mail que vous nous avez indiqué pour définir un nouveau mot de passe. Vous devriez le recevoir dans les prochaines minutes." #: templates/telemeta/registration/password_reset_email.html:3 msgid "You're receiving this e-mail because you requested a password reset" @@ -3489,25 +3489,25 @@ msgstr "de votre compte utilisateur du site %(site_name)s" #: templates/telemeta/registration/password_reset_email.html:6 msgid "Please go to the following page and choose a new password:" -msgstr "" +msgstr "Veuillez suivre ce lien et choisir un nouveau mot de passe:" #: templates/telemeta/registration/password_reset_email.html:10 msgid "Your username, in case you've forgotten:" -msgstr "" +msgstr "Votre login, au cas où vous l'auriez oublié:" #: templates/telemeta/registration/password_reset_form.html:7 msgid "" "Forgotten your password? Enter your e-mail address below, and we'll e-mail " "instructions for setting a new one." -msgstr "" +msgstr "Vous avez oubliez votre mot de passe ? Veuillez saisir votre adresse e-mail et nous vous enverrons un email avec les instructions pour définir un nouveau mot de passe." #: templates/telemeta/registration/password_reset_form.html:11 msgid "E-mail address:" -msgstr "" +msgstr "Adresse e-mail:" #: templates/telemeta/registration/password_reset_form.html:11 msgid "Reset my password" -msgstr "" +msgstr "Réinitialiser mon mot de passe" #: templatetags/telemeta_utils.py:259 #, python-format diff --git a/teleforma/templates/registration/login.html b/teleforma/templates/registration/login.html deleted file mode 100644 index a91624d0..00000000 --- a/teleforma/templates/registration/login.html +++ /dev/null @@ -1,30 +0,0 @@ -{% extends "registration/registration_base.html" %} -{% load i18n %} -{% block title %}{% trans "Login" %}{% endblock %} -{% block content %} -{% url 'auth_password_reset' as auth_pwd_reset_url %} -{% url 'registration_register' as register_url%} - -{% if form.errors %} -

{% blocktrans %}Your username and password didn't match. Please try again.{% endblocktrans %}

-{% endif %} - -
{% csrf_token %} - - - - - - - - - -
{% trans form.username.label_tag %}{{ form.username }}
{% trans form.password.label_tag %}{{ form.password }}
-

{% blocktrans %}Forgot your password? - Need an account?{% endblocktrans %}

- - - -
- -{% endblock %} diff --git a/teleforma/templates/registration/password_reset_email.html b/teleforma/templates/registration/password_reset_email.html index 5bf161f6..715e4fa9 100644 --- a/teleforma/templates/registration/password_reset_email.html +++ b/teleforma/templates/registration/password_reset_email.html @@ -5,7 +5,7 @@ {% trans "Please go to the following page and choose a new password:" %} {% block reset_link %} -{{ protocol }}://{{ domain }}{% url 'teleforma-password-reset-confirm' uidb36=uid token=token %} +{{ protocol }}://{{ domain }}{% url 'teleforma-password-reset-confirm' uidb64=uid token=token %} {% endblock %} {% trans "Your username, in case you've forgotten:" %} {{ user.username }} diff --git a/teleforma/templates/teleforma/login.html b/teleforma/templates/teleforma/login.html index ffff1209..4793ee28 100644 --- a/teleforma/templates/teleforma/login.html +++ b/teleforma/templates/teleforma/login.html @@ -26,7 +26,7 @@ $(document).ready(function() { {{ form.password }}

diff --git a/teleforma/urls.py b/teleforma/urls.py index e7ad4607..f59a909e 100644 --- a/teleforma/urls.py +++ b/teleforma/urls.py @@ -119,13 +119,10 @@ urlpatterns = [ email_template_name='registration/password_reset_email.html'), name="teleforma-password-reset"), url(r'^accounts/password_reset_done/$', PasswordResetDoneView.as_view( template_name='registration/password_reset_done.html'), name="password_reset_done"), - url(r'^accounts/password_reset_confirm/(?P[A-Za-z0-9._-]+)/(?P[A-Za-z0-9._-]+)/$', PasswordResetConfirmView.as_view( + path('accounts/password_reset_confirm///', PasswordResetConfirmView.as_view( template_name='registration/password_reset_confirm.html'), name="teleforma-password-reset-confirm"), url(r'^accounts/password_reset_complete/$', PasswordResetCompleteView.as_view(template_name='registration/password_reset_complete.html'), - name="teleforma-password-reset-complete"), - url(r'^accounts/password_reset_complete/$', PasswordResetCompleteView.as_view( - template_name='registration/password_reset_complete.html'), name="teleforma-password-reset-complete"), - + name="password_reset_complete"), # Help url(r'^help/$', HelpView.as_view(), name="teleforma-help"), -- 2.39.5