diff --git a/templates/base.html b/templates/base.html
index 867be422..401ece70 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -96,14 +96,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Topology" %}
{% acl_end %}
{% can_view_app logs %}
- {% trans "Statistics" %}
+ {% trans "Statistics" %}
{% acl_end %}
{% can_view_app preferences %}
@@ -137,12 +137,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% else %}
{% can_view_any_app users machines cotisations %}
-
@@ -153,7 +153,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{{ request.user.pseudo|slice:":15" }}
@@ -200,7 +200,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
| {% trans "Internet access" %} |
{% if request_user.has_access %}
- {% blocktrans with request.user.end_access|date:"d b Y" as date %}Until {{ date }}{% endblocktrans %}
+ {% blocktrans with end_access_date=request.user.end_access|date:"d b Y" %}Until {{ end_access_date }}{% endblocktrans %}
{% else %}
{% trans "Disabled" %}
{% endif %}
@@ -210,15 +210,15 @@ with this program; if not, write to the Free Software Foundation, Inc.,
| {% trans "Membership" %} |
{% if request_user.is_adherent %}
- {% blocktrans with request_user.end_adhesion|date:"d b Y" as date %}Until {{ date }}{% endblocktrans %}
+ {% blocktrans with end_adhesion_date=request_user.end_adhesion|date:"d b Y" %}Until {{ end_adhesion_date }}{% endblocktrans %}
{% else %}
- {% trans "Not a member" %}
+ {% trans "Non member" %}
{% endif %}
|
{% for interface in interfaces|slice:":5" %}
- {{interface}}
+ {{ interface }}
{% endfor %}
{% if interfaces|length > 5 %}
-
+
{% trans "View my machines" %}
diff --git a/templates/locale/fr/LC_MESSAGES/django.po b/templates/locale/fr/LC_MESSAGES/django.po
index 75170dd3..2adc5854 100644
--- a/templates/locale/fr/LC_MESSAGES/django.po
+++ b/templates/locale/fr/LC_MESSAGES/django.po
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-15 16:10+0200\n"
+"POT-Creation-Date: 2019-01-08 23:59+0100\n"
"PO-Revision-Date: 2018-03-31 16:09+0002\n"
"Last-Translator: Laouen Fernet \n"
"Language-Team: \n"
@@ -38,116 +38,121 @@ msgstr "Site de gestion de réseau soutenu par FedeRez."
msgid "Home"
msgstr "Accueil"
-#: base.html:81
+#: base.html:80
msgid "Users"
msgstr "Utilisateurs"
-#: base.html:84
+#: base.html:83
msgid "Manage the users"
msgstr "Gérer les utilisateurs"
-#: base.html:85
+#: base.html:84
msgid "Manage the clubs"
msgstr "Gérer les clubs"
-#: base.html:88
+#: base.html:87
msgid "Manage the machines"
msgstr "Gérer les machines"
-#: base.html:91
+#: base.html:90
msgid "Manage the subscriptions"
msgstr "Gérer les cotisations"
-#: base.html:98
+#: base.html:97
msgid "Topology"
msgstr "Topologie"
-#: base.html:100
+#: base.html:99
msgid "Switches"
msgstr "Commutateurs réseau"
-#: base.html:101
+#: base.html:100
msgid "Access points"
msgstr "Points d'accès sans fil"
-#: base.html:102
+#: base.html:101
msgid "Rooms"
msgstr "Chambres"
-#: base.html:107
+#: base.html:106
msgid "Statistics"
msgstr "Statistiques"
-#: base.html:112
+#: base.html:111
msgid "Administration"
msgstr "Administration"
-#: base.html:112
+#: base.html:118
msgid "More information"
msgstr "Plus d'informations"
-#: base.html:114
+#: base.html:120
msgid "About"
msgstr "À propos"
-#: base.html:122
+#: base.html:121
msgid "Contact"
msgstr "Contact"
-#: base.html:129
+#: base.html:128
msgid "Sign up"
-msgstr "S'enregistrer"
+msgstr "S'inscrire"
-#: base.html:135 registration/login.html:30 registration/login.html:50
+#: base.html:134 registration/login.html:29 registration/login.html:36
msgid "Log in"
msgstr "Se connecter"
-#: base.html:143
+#: base.html:142
msgid "Search"
msgstr "Rechercher"
-#: base.html:157
+#: base.html:156
msgid "My profile"
msgstr "Mon profil"
-#: base.html:158
+#: base.html:157
msgid "Log out"
msgstr "Se déconnecter"
-#: base.html:194
+#: base.html:192
msgid "Username"
msgstr "Pseudo"
-#: base.html:198
+#: base.html:196
msgid "Room"
msgstr "Chambre"
-#: base.html:202
+#: base.html:200
msgid "Internet access"
msgstr "Accès Internet"
-#: base.html:205 base.html:215
+#: base.html:203
#, python-format
-msgid "Until %(date)s"
-msgstr "Jusqu'au %(date)s"
+msgid "Until %(end_access_date)s"
+msgstr "Jusqu'au %(end_access_date)s"
-#: base.html:207
+#: base.html:205
msgid "Disabled"
msgstr "Désactivé"
-#: base.html:212
+#: base.html:210
msgid "Membership"
msgstr "Adhésion"
-#: base.html:217
-msgid "Not a member"
+#: base.html:213
+#, python-format
+msgid "Until %(end_adhesion_date)s"
+msgstr "Jusqu'au %(end_adhesion_date)s"
+
+#: base.html:215
+msgid "Non member"
msgstr "Non adhérent"
-#: base.html:225
+#: base.html:223
msgid "View my profile"
msgstr "Voir mon profil"
-#: base.html:229
+#: base.html:228
msgid "You are not logged in."
msgstr "Vous n'êtes pas connecté."
@@ -180,11 +185,11 @@ msgstr "À propos de ce site"
#: base.html:267
msgid ""
-"This software is under the terms of the "
-"GPLv2 License."
+"This software is under the terms of the GPLv2 License."
msgstr ""
-"Ce logiciel est sous les termes de la licence "
-"GPLv2."
+"Ce logiciel est sous les termes de la licence GPLv2."
#: buttons/add.html:27
msgid "Add"
@@ -293,14 +298,22 @@ msgstr "Si vous n'avez aucune idée de ce que vous avez fait :"
msgid "Go back to a safe page"
msgstr "Retourner à une page sécurisée"
-#: registration/login.html:35
-msgid "Your username and password didn't match. Please try again."
-msgstr "Vos identifiants sont incorrects. Veuillez réessayer."
+#: pagination.html:34
+msgid "First"
+msgstr "Première page"
-#: registration/login.html:43
-msgid "Please log in to see this page."
-msgstr "Veuillez vous connecter pour voir cette page."
+#: pagination.html:40
+msgid "Previous"
+msgstr "Précédent"
-#: registration/login.html:53
+#: pagination.html:60
+msgid "Next"
+msgstr "Suivant"
+
+#: pagination.html:66
+msgid "Last"
+msgstr "Dernière page"
+
+#: registration/login.html:40
msgid "Forgotten password?"
msgstr "Mot de passe oublié ?"
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 234144c5..f4226d7d 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends 'base.html' %}
{% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il
se veut agnostique au réseau considéré, de manière à être installable en