small i18n fixes
This commit is contained in:
parent
1df1c20998
commit
0741d330d9
5 changed files with 13 additions and 12 deletions
|
@ -67,7 +67,7 @@ class ActivityTag(models.Model):
|
||||||
color_regex = RegexValidator(
|
color_regex = RegexValidator(
|
||||||
regex=r'^#(?:[0-9a-fA-F]{3}){1,2}$',
|
regex=r'^#(?:[0-9a-fA-F]{3}){1,2}$',
|
||||||
message=_("La chaîne de caractère rentrée n'est pas"
|
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(
|
color = models.CharField(
|
||||||
_('Couleur'),
|
_('Couleur'),
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Django==1.10.*
|
Django==1.11.*
|
||||||
Pillow==3.3.0
|
Pillow==3.3.0
|
||||||
psycopg2==2.6.2
|
psycopg2==2.6.2
|
||||||
django-bootstrap-form==3.2.1
|
django-bootstrap-form==3.2.1
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
{% extends "base.html" %}
|
{% extends "base.html" %}
|
||||||
|
|
||||||
{% block page_title %}{% trans "Erreur !" %}{% endblock %}
|
{% block page_title %}{% trans "Erreur !" %}{% endblock %}
|
||||||
|
|
|
@ -68,7 +68,7 @@
|
||||||
<i class="fa fa-user fa-fw fa-lg"></i> <i class="fa fa-caret-down"></i>
|
<i class="fa fa-user fa-fw fa-lg"></i> <i class="fa fa-caret-down"></i>
|
||||||
</a>
|
</a>
|
||||||
<ul class="dropdown-menu dropdown-user">
|
<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>
|
||||||
<li><a href="{% url "users:password_change" %}"><i class="fa fa-unlock-alt fa-fw"></i>{% trans "Changer de mot de passe" %}</a>
|
<li><a href="{% url "users:password_change" %}"><i class="fa fa-unlock-alt fa-fw"></i>{% trans "Changer de mot de passe" %}</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
from django.conf.urls import url
|
from django.conf.urls import url
|
||||||
from django.contrib.auth import views as auth_views
|
from django.contrib.auth import views as auth_views
|
||||||
from django.core.urlresolvers import reverse_lazy
|
from django.core.urlresolvers import reverse_lazy
|
||||||
|
from django.utils.translation import ugettext_lazy as _
|
||||||
from shared.views import Home
|
from shared.views import Home
|
||||||
from users.views import CreateUser
|
from users.views import CreateUser
|
||||||
|
|
||||||
|
@ -13,8 +14,8 @@ urlpatterns = [
|
||||||
auth_views.login,
|
auth_views.login,
|
||||||
{'template_name': 'users/login.html',
|
{'template_name': 'users/login.html',
|
||||||
'extra_context': {
|
'extra_context': {
|
||||||
'page_title': 'Connexion',
|
'page_title': _('Connexion'),
|
||||||
'button': 'Se connecter',
|
'button': _('Se connecter'),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
name='login',
|
name='login',
|
||||||
|
@ -29,8 +30,8 @@ urlpatterns = [
|
||||||
{'template_name': 'users/change_pass.html',
|
{'template_name': 'users/change_pass.html',
|
||||||
'post_change_redirect': reverse_lazy('shared:home'),
|
'post_change_redirect': reverse_lazy('shared:home'),
|
||||||
'extra_context': {
|
'extra_context': {
|
||||||
'page_title': 'Changement de mot de passe',
|
'page_title': _('Changement de mot de passe'),
|
||||||
'button': 'Modifier',
|
'button': _('Modifier'),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
name='password_change'),
|
name='password_change'),
|
||||||
|
@ -43,8 +44,8 @@ urlpatterns = [
|
||||||
'subject_template_name': 'subject_password_reset.txt',
|
'subject_template_name': 'subject_password_reset.txt',
|
||||||
'post_reset_redirect': reverse_lazy('users:password_reset_done'),
|
'post_reset_redirect': reverse_lazy('users:password_reset_done'),
|
||||||
'extra_context': {
|
'extra_context': {
|
||||||
'page_title': 'Demander un nouveau mot de passe',
|
'page_title': _('Demander un nouveau mot de passe'),
|
||||||
'button': 'Envoyer'
|
'button': _('Envoyer')
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
name='password_reset'),
|
name='password_reset'),
|
||||||
|
@ -62,8 +63,8 @@ urlpatterns = [
|
||||||
'user:password_reset_complete'
|
'user:password_reset_complete'
|
||||||
),
|
),
|
||||||
'extra_context': {
|
'extra_context': {
|
||||||
'page_title': 'Changer de mot de passe',
|
'page_title': _('Changer de mot de passe'),
|
||||||
'button': 'Changer'
|
'button': _('Changer')
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
name='password_reset_confirm'),
|
name='password_reset_confirm'),
|
||||||
|
|
Loading…
Reference in a new issue