--- a/src/hdabo/templates/registration/password_reset_email.html	Fri Mar 06 14:11:11 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-{% load i18n %}
-{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}:
-{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %}
-{% endblock %}

--- a/src/hdabo/urls.py	Fri Mar 06 14:11:11 2015 +0100
+++ b/src/hdabo/urls.py	Fri Mar 06 14:47:05 2015 +0100
@@ -18,7 +18,7 @@
 
     # Uncomment the next line to enable the admin:
     url(r'^accounts/', include(auth_url)),
-    url(r'^accounts/password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', auth_views.password_reset_confirm, name='auth_password_reset_confirm'),
+    url(r'^accounts/password/reset/confirm/(?P<uidb64>[0-9A-Za-z_\-]+)/(?P<token>.+)/$', auth_views.password_reset_confirm, name='auth_password_reset_confirm'),
     url(r'^accounts/', include('registration.backends.default.urls')),
     url(r'^logout/', 'django.contrib.auth.views.logout_then_login'),
     url(r'^admin/', include(admin.site.urls)),

Binary file src/hdalab/locale/de/LC_MESSAGES/django.mo has changed

--- a/src/hdalab/locale/de/LC_MESSAGES/django.po	Fri Mar 06 14:11:11 2015 +0100
+++ b/src/hdalab/locale/de/LC_MESSAGES/django.po	Fri Mar 06 14:47:05 2015 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 06:30-0600\n"
+"POT-Creation-Date: 2015-03-06 07:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -697,11 +697,6 @@
 msgid "Email with password reset instructions has been sent."
 msgstr ""
 
-#: templates/registration/password_reset_email.html:2
-#, python-format
-msgid "Reset password at %(site_name)s"
-msgstr ""
-
 #: templates/registration/password_reset_form.html:5
 msgid "Password reset"
 msgstr ""

Binary file src/hdalab/locale/en/LC_MESSAGES/django.mo has changed

--- a/src/hdalab/locale/en/LC_MESSAGES/django.po	Fri Mar 06 14:11:11 2015 +0100
+++ b/src/hdalab/locale/en/LC_MESSAGES/django.po	Fri Mar 06 14:47:05 2015 +0100
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 06:30-0600\n"
+"POT-Creation-Date: 2015-03-06 07:38-0600\n"
 "PO-Revision-Date: 2012-03-09 02:10+0200\n"
 "Last-Translator: Yves-Marie Haussonne <ymh.work@gmail.com>\n"
 "Language-Team: IRI\n"
@@ -285,7 +285,6 @@
 "d’entrée : pays, périodes historiques, disciplines artistiques et mots-clés. "
 "À la fois critères "
 
-
 #: templates/index.html:48
 msgid ""
 "de recherche et modes de visualisation des résultats, ces différentes "
@@ -303,15 +302,16 @@
 "Explorez 9 grands domaines artistiques à travers des arborescences enrichies "
 "de ressources du portail Histoire des Arts."
 msgstr ""
-"Explore 9 great artistic domains through trees of enriched resources from the "
-"portal \"Histoire des Arts\"."
+"Explore 9 great artistic domains through trees of enriched resources from "
+"the portal \"Histoire des Arts\"."
 
 #: templates/index.html:76
 msgid ""
 "Construisez votre carte de connaissances à partir des ressources Histoires "
 "des arts et Wikipedia."
 msgstr ""
-"Build your knowledge map from resources from \"Histoire des Arts\" and Wikipedia."
+"Build your knowledge map from resources from \"Histoire des Arts\" and "
+"Wikipedia."
 
 #: templates/index.html:91
 msgid "Bienvenue sur Histoire des arts‘Lab !"
@@ -725,11 +725,6 @@
 msgid "Email with password reset instructions has been sent."
 msgstr "Email with password reset instructions has been sent."
 
-#: templates/registration/password_reset_email.html:2
-#, python-format
-msgid "Reset password at %(site_name)s"
-msgstr "Reset password at %(site_name)s"
-
 #: templates/registration/password_reset_form.html:5
 msgid "Password reset"
 msgstr "Password reset"
@@ -774,6 +769,9 @@
 msgid "Period"
 msgstr "Period"
 
+#~ msgid "Reset password at %(site_name)s"
+#~ msgstr "Reset password at %(site_name)s"
+
 #~ msgid "Contact"
 #~ msgstr "Contact"
 

Binary file src/hdalab/locale/es/LC_MESSAGES/django.mo has changed

--- a/src/hdalab/locale/es/LC_MESSAGES/django.po	Fri Mar 06 14:11:11 2015 +0100
+++ b/src/hdalab/locale/es/LC_MESSAGES/django.po	Fri Mar 06 14:47:05 2015 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 06:30-0600\n"
+"POT-Creation-Date: 2015-03-06 07:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -720,11 +720,6 @@
 msgid "Email with password reset instructions has been sent."
 msgstr "Un correo con los pasos para reiniciar su contraseña ha sido enviado"
 
-#: templates/registration/password_reset_email.html:2
-#, python-format
-msgid "Reset password at %(site_name)s"
-msgstr "Reiniciar la contraseña de %(site_name)s"
-
 #: templates/registration/password_reset_form.html:5
 msgid "Password reset"
 msgstr "Reiniciar la Contraseña"
@@ -769,5 +764,8 @@
 msgid "Period"
 msgstr "Periodo"
 
+#~ msgid "Reset password at %(site_name)s"
+#~ msgstr "Reiniciar la contraseña de %(site_name)s"
+
 #~ msgid "Contact"
 #~ msgstr "Contactos"

Binary file src/hdalab/locale/fr/LC_MESSAGES/django.mo has changed

--- a/src/hdalab/locale/fr/LC_MESSAGES/django.po	Fri Mar 06 14:11:11 2015 +0100
+++ b/src/hdalab/locale/fr/LC_MESSAGES/django.po	Fri Mar 06 14:47:05 2015 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 06:30-0600\n"
+"POT-Creation-Date: 2015-03-06 07:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -730,11 +730,6 @@
 "L'email avec les instructions pour réinitialiser le mot de passe a été "
 "envoyé."
 
-#: templates/registration/password_reset_email.html:2
-#, python-format
-msgid "Reset password at %(site_name)s"
-msgstr "Réinitialiser le mot de passe sur %(site_name)s"
-
 #: templates/registration/password_reset_form.html:5
 msgid "Password reset"
 msgstr "Réinitialisation du mot de passe"
@@ -779,5 +774,8 @@
 msgid "Period"
 msgstr "Période"
 
+#~ msgid "Reset password at %(site_name)s"
+#~ msgstr "Réinitialiser le mot de passe sur %(site_name)s"
+
 #~ msgid "Contact"
 #~ msgstr "Contact"

Binary file src/hdalab/locale/it/LC_MESSAGES/django.mo has changed

--- a/src/hdalab/locale/it/LC_MESSAGES/django.po	Fri Mar 06 14:11:11 2015 +0100
+++ b/src/hdalab/locale/it/LC_MESSAGES/django.po	Fri Mar 06 14:47:05 2015 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 06:30-0600\n"
+"POT-Creation-Date: 2015-03-06 07:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -703,11 +703,6 @@
 msgid "Email with password reset instructions has been sent."
 msgstr ""
 
-#: templates/registration/password_reset_email.html:2
-#, python-format
-msgid "Reset password at %(site_name)s"
-msgstr ""
-
 #: templates/registration/password_reset_form.html:5
 msgid "Password reset"
 msgstr ""

Binary file src/hdalab/locale/ja/LC_MESSAGES/django.mo has changed

--- a/src/hdalab/locale/ja/LC_MESSAGES/django.po	Fri Mar 06 14:11:11 2015 +0100
+++ b/src/hdalab/locale/ja/LC_MESSAGES/django.po	Fri Mar 06 14:47:05 2015 +0100
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 06:30-0600\n"
+"POT-Creation-Date: 2015-03-06 07:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -704,11 +704,6 @@
 msgid "Email with password reset instructions has been sent."
 msgstr ""
 
-#: templates/registration/password_reset_email.html:2
-#, python-format
-msgid "Reset password at %(site_name)s"
-msgstr ""
-
 #: templates/registration/password_reset_form.html:5
 msgid "Password reset"
 msgstr ""

Binary file src/hdalab/locale/zh-tw/LC_MESSAGES/django.mo has changed

--- a/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po	Fri Mar 06 14:11:11 2015 +0100
+++ b/src/hdalab/locale/zh-tw/LC_MESSAGES/django.po	Fri Mar 06 14:47:05 2015 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-06 06:30-0600\n"
+"POT-Creation-Date: 2015-03-06 07:38-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -704,11 +704,6 @@
 msgid "Email with password reset instructions has been sent."
 msgstr ""
 
-#: templates/registration/password_reset_email.html:2
-#, python-format
-msgid "Reset password at %(site_name)s"
-msgstr ""
-
 #: templates/registration/password_reset_form.html:5
 msgid "Password reset"
 msgstr ""

--- a/src/hdalab/templates/registration/password_reset_email.html	Fri Mar 06 14:11:11 2015 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-{% load i18n %}
-{% blocktrans %}Reset password at {{ site_name }}{% endblocktrans %}:
-{% block reset_link %}
-{{ protocol }}://{{ domain }}{% url 'auth_password_reset_confirm' uidb36=uid token=token %}
-{% endblock %}