Browse Source

Minor templates modifications

Fabs 10 years ago
parent
commit
4ac94a6c16

coin/members/templates/members/login.html → coin/members/templates/members/registration/login.html


+ 6 - 5
coin/members/templates/members/registration/password_reset_email.html

@@ -1,14 +1,15 @@
 {% load i18n %}{% autoescape off %}
-{% blocktrans %}You're receiving this email because you requested a password reset for your user account at {{ site_name }}.{% endblocktrans %}
+Bonjour,
+Vous recevez ce message en réponse à votre demande de réinitialisation de mot de passe de votre compte sur COIN.
 
-{% trans "Please go to the following page and choose a new password:" %}
+Merci de suivre le lien suivant afin de choisir un nouveau mot de passe :
 {% block reset_link %}
 {{ protocol }}://{{ domain }}{% url 'members:password_reset_confirm' uidb64=uid token=token %}
 {% endblock %}
-{% trans "Your username, in case you've forgotten:" %} {{ user.get_username }}
+Pour rappel, voici votre nom d'utilisateur : {{ user.get_username }}
 
-{% trans "Thanks for using our site!" %}
+Si vous n'êtes pas à l'initiative de cette demande, merci d'ignorer ce message.
 
-{% blocktrans %}The {{ site_name }} team{% endblocktrans %}
+L'équipe d'ILLYSE
 
 {% endautoescape %}

+ 3 - 0
coin/members/templates/members/registration/password_reset_subject.txt

@@ -0,0 +1,3 @@
+{% autoescape off %}
+Réinitialisation de votre mot de passe sur COIN
+{% endautoescape %}

+ 4 - 4
coin/members/urls.py

@@ -8,7 +8,7 @@ urlpatterns = patterns(
     '',
     url(r'^$', views.index, name='index'),
     url(r'^login/$', 'django.contrib.auth.views.login',
-        {'template_name': 'members/login.html'},
+        {'template_name': 'members/registration/login.html'},
         name = 'login'),
     url(r'^logout/$', 'django.contrib.auth.views.logout_then_login',
         name = 'logout'),
@@ -26,15 +26,15 @@ urlpatterns = patterns(
         'template_name':'members/registration/password_reset_form.html',
         'email_template_name':'members/registration/password_reset_email.html'},
         name = 'password_reset'),
-    url(r'^password_reset_done/$', 'django.contrib.auth.views.password_reset_done',
+    url(r'^password_reset/done/$', 'django.contrib.auth.views.password_reset_done',
         {'template_name':'members/registration/password_reset_done.html',
         'current_app':'members'},
         name = 'password_reset_done'),
-    url(r'^password_reset_confirm/(?P<uidb64>.+)/(?P<token>.+)$', 'django.contrib.auth.views.password_reset_confirm',
+    url(r'^password_reset/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})/$', 'django.contrib.auth.views.password_reset_confirm',
         {'post_reset_redirect':'members:password_reset_complete',
         'template_name':'members/registration/password_reset_confirm.html'},
         name = 'password_reset_confirm'),
-    url(r'^password_reset_complete/$', 'django.contrib.auth.views.password_reset_complete',
+    url(r'^password_reset/complete/$', 'django.contrib.auth.views.password_reset_complete',
         {'template_name':'members/registration/password_reset_complete.html'},
         name = 'password_reset_complete'),