From 0741d330d996075db186e30e2a8421a08a4a5250 Mon Sep 17 00:00:00 2001
From: Qwann <narmanli@clipper.ens.fr>
Date: Tue, 16 May 2017 20:20:38 +0200
Subject: [PATCH] small i18n fixes

---
 event/models.py                  |  2 +-
 requirements.txt                 |  2 +-
 shared/templates/base_error.html |  2 +-
 shared/templates/base_nav.html   |  2 +-
 users/urls.py                    | 17 +++++++++--------
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/event/models.py b/event/models.py
index 0570fe2..aaad757 100644
--- a/event/models.py
+++ b/event/models.py
@@ -67,7 +67,7 @@ class ActivityTag(models.Model):
     color_regex = RegexValidator(
                 regex=r'^#(?:[0-9a-fA-F]{3}){1,2}$',
                 message=_("La chaîne de caractère rentrée n'est pas"
-                          "une couleur en hexadécimal."),
+                          " une couleur en hexadécimal."),
                 )
     color = models.CharField(
                     _('Couleur'),
diff --git a/requirements.txt b/requirements.txt
index 73d7caa..2feecff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Django==1.10.*
+Django==1.11.*
 Pillow==3.3.0
 psycopg2==2.6.2
 django-bootstrap-form==3.2.1
diff --git a/shared/templates/base_error.html b/shared/templates/base_error.html
index aeefd25..88fb504 100644
--- a/shared/templates/base_error.html
+++ b/shared/templates/base_error.html
@@ -1,3 +1,3 @@
 {% extends "base.html" %}
 
-{% block page_title %}{% trans "Erreur !" %}{% endblock %}
+{% block page_title %}{% trans "Erreur&#8239;!" %}{% endblock %}
diff --git a/shared/templates/base_nav.html b/shared/templates/base_nav.html
index 4b26350..65a0f67 100644
--- a/shared/templates/base_nav.html
+++ b/shared/templates/base_nav.html
@@ -68,7 +68,7 @@
                         <i class="fa fa-user fa-fw fa-lg"></i> <i class="fa fa-caret-down"></i>
                     </a>
                     <ul class="dropdown-menu dropdown-user">
-                        <li><a href="#"><i class="fa fa-user fa-fw"></i>{% trans "Mon profile" %}</a>
+                        <li><a href="#"><i class="fa fa-user fa-fw"></i>{% trans "Mon profil" %}</a>
                         </li>
                         <li><a href="{% url "users:password_change" %}"><i class="fa fa-unlock-alt fa-fw"></i>{% trans "Changer de mot de passe" %}</a>
                         </li>
diff --git a/users/urls.py b/users/urls.py
index a80c300..6933001 100644
--- a/users/urls.py
+++ b/users/urls.py
@@ -1,6 +1,7 @@
 from django.conf.urls import url
 from django.contrib.auth import views as auth_views
 from django.core.urlresolvers import reverse_lazy
+from django.utils.translation import ugettext_lazy as _
 from shared.views import Home
 from users.views import CreateUser
 
@@ -13,8 +14,8 @@ urlpatterns = [
             auth_views.login,
             {'template_name': 'users/login.html',
              'extra_context': {
-                 'page_title': 'Connexion',
-                 'button': 'Se connecter',
+                 'page_title': _('Connexion'),
+                 'button': _('Se connecter'),
                  },
              },
             name='login',
@@ -29,8 +30,8 @@ urlpatterns = [
             {'template_name': 'users/change_pass.html',
                 'post_change_redirect': reverse_lazy('shared:home'),
              'extra_context': {
-                 'page_title': 'Changement de mot de passe',
-                 'button': 'Modifier',
+                 'page_title': _('Changement de mot de passe'),
+                 'button': _('Modifier'),
                  },
              },
             name='password_change'),
@@ -43,8 +44,8 @@ urlpatterns = [
              'subject_template_name': 'subject_password_reset.txt',
              'post_reset_redirect': reverse_lazy('users:password_reset_done'),
              'extra_context': {
-                 'page_title': 'Demander un nouveau mot de passe',
-                 'button': 'Envoyer'
+                 'page_title': _('Demander un nouveau mot de passe'),
+                 'button': _('Envoyer')
                  },
              },
             name='password_reset'),
@@ -62,8 +63,8 @@ urlpatterns = [
                  'user:password_reset_complete'
              ),
              'extra_context': {
-                 'page_title': 'Changer de mot de passe',
-                 'button': 'Changer'
+                 'page_title': _('Changer de mot de passe'),
+                 'button': _('Changer')
                  },
               },
             name='password_reset_confirm'),