Commit 1c28c2d1 authored by Laouen Fernet's avatar Laouen Fernet

add translations for users/

parent 69d80fcd
...@@ -381,7 +381,7 @@ class AdherentCreationForm(AdherentForm): ...@@ -381,7 +381,7 @@ class AdherentCreationForm(AdherentForm):
+ "using the forgotten password button on the "\ + "using the forgotten password button on the "\
+ "login page or contacting support.") + "login page or contacting support.")
former_user_check = forms.BooleanField(required=True, help_text=former_user_check_info) former_user_check = forms.BooleanField(required=True, help_text=former_user_check_info)
former_user_check.label = _("I certifie that I have not had an account before") former_user_check.label = _("I certify that I have not had an account before")
# Checkbox for GTU # Checkbox for GTU
gtu_check = forms.BooleanField(required=True) gtu_check = forms.BooleanField(required=True)
...@@ -439,7 +439,7 @@ class ClubForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): ...@@ -439,7 +439,7 @@ class ClubForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
self.fields['surname'].label = _("Name") self.fields['surname'].label = _("Name")
self.fields['school'].label = _("School") self.fields['school'].label = _("School")
self.fields['comment'].label = _("Comment") self.fields['comment'].label = _("Comment")
self.fields['email'].label = _("Email Address") self.fields['email'].label = _("Email address")
if 'room' in self.fields: if 'room' in self.fields:
self.fields['room'].label = _("Room") self.fields['room'].label = _("Room")
self.fields['room'].empty_label = _("No room") self.fields['room'].empty_label = _("No room")
......
This diff is collapsed.
# -*- coding: utf-8 -*-
# Generated by Django 1.10.7 on 2019-01-08 23:26
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('users', '0079_auto_20181228_2039'),
]
operations = [
migrations.AlterField(
model_name='user',
name='state',
field=models.IntegerField(choices=[(0, 'Active'), (1, 'Disabled'), (2, 'Archived'), (3, 'Not yet active')], default=3),
),
]
...@@ -189,10 +189,10 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, ...@@ -189,10 +189,10 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
STATE_ARCHIVE = 2 STATE_ARCHIVE = 2
STATE_NOT_YET_ACTIVE = 3 STATE_NOT_YET_ACTIVE = 3
STATES = ( STATES = (
(0, 'STATE_ACTIVE'), (0, _("Active")),
(1, 'STATE_DISABLED'), (1, _("Disabled")),
(2, 'STATE_ARCHIVE'), (2, _("Archived")),
(3, 'STATE_NOT_YET_ACTIVE'), (3, _("Not yet active")),
) )
surname = models.CharField(max_length=255) surname = models.CharField(max_length=255)
...@@ -356,7 +356,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, ...@@ -356,7 +356,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
""" Renvoie le nom complet de l'user formaté nom/prénom""" """ Renvoie le nom complet de l'user formaté nom/prénom"""
name = self.name name = self.name
if name: if name:
return '%s %s' % (name, self.surname) return "%s %s" % (name, self.surname)
else: else:
return self.surname return self.surname
...@@ -510,7 +510,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, ...@@ -510,7 +510,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
)['total'] or 0 )['total'] or 0
somme_credit = Vente.objects.filter( somme_credit = Vente.objects.filter(
facture__in=Facture.objects.filter(user=self, valid=True), facture__in=Facture.objects.filter(user=self, valid=True),
name="solde" name='solde'
).aggregate( ).aggregate(
total=models.Sum( total=models.Sum(
models.F('prix')*models.F('number'), models.F('prix')*models.F('number'),
...@@ -681,7 +681,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, ...@@ -681,7 +681,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
), ),
'expire_in': str( 'expire_in': str(
GeneralOption.get_cached_value('req_expire_hrs') GeneralOption.get_cached_value('req_expire_hrs')
) + ' heures', ) + ' hours',
} }
send_mail( send_mail(
'Changement de mot de passe du %(name)s / Password renewal for ' 'Changement de mot de passe du %(name)s / Password renewal for '
...@@ -723,7 +723,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, ...@@ -723,7 +723,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
self.notif_auto_newmachine(interface_cible) self.notif_auto_newmachine(interface_cible)
except Exception as error: except Exception as error:
return False, traceback.format_exc() return False, traceback.format_exc()
return interface_cible, "Ok" return interface_cible, _("OK")
def notif_auto_newmachine(self, interface): def notif_auto_newmachine(self, interface):
"""Notification mail lorsque une machine est automatiquement """Notification mail lorsque une machine est automatiquement
...@@ -1024,7 +1024,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser, ...@@ -1024,7 +1024,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
if (EMailAddress.objects if (EMailAddress.objects
.filter(local_part=self.pseudo.lower()).exclude(user_id=self.id) .filter(local_part=self.pseudo.lower()).exclude(user_id=self.id)
): ):
raise ValidationError("This pseudo is already in use.") raise ValidationError(_("This username is already used."))
if not self.local_email_enabled and not self.email and not (self.state == self.STATE_ARCHIVE): if not self.local_email_enabled and not self.email and not (self.state == self.STATE_ARCHIVE):
raise ValidationError(_("There is neither a local email address nor an external" raise ValidationError(_("There is neither a local email address nor an external"
" email address for this user.") " email address for this user.")
...@@ -1068,7 +1068,7 @@ class Adherent(User): ...@@ -1068,7 +1068,7 @@ class Adherent(User):
if self.gpg_fingerprint: if self.gpg_fingerprint:
gpg_fingerprint = self.gpg_fingerprint.replace(' ', '').upper() gpg_fingerprint = self.gpg_fingerprint.replace(' ', '').upper()
if not re.match("^[0-9A-F]{40}$", gpg_fingerprint): if not re.match("^[0-9A-F]{40}$", gpg_fingerprint):
raise ValidationError(_("A gpg fingerprint must contain 40 hexadecimal carracters")) raise ValidationError(_("A GPG fingerprint must contain 40 hexadecimal characters"))
self.gpg_fingerprint = gpg_fingerprint self.gpg_fingerprint = gpg_fingerprint
@classmethod @classmethod
...@@ -1461,7 +1461,7 @@ class Ban(RevMixin, AclMixin, models.Model): ...@@ -1461,7 +1461,7 @@ class Ban(RevMixin, AclMixin, models.Model):
'asso_name': AssoOption.get_cached_value('name'), 'asso_name': AssoOption.get_cached_value('name'),
}) })
send_mail( send_mail(
'Deconnexion disciplinaire', 'Déconnexion disciplinaire / Disciplinary disconnection',
template.render(context), template.render(context),
GeneralOption.get_cached_value('email_from'), GeneralOption.get_cached_value('email_from'),
[self.user.email], [self.user.email],
......
...@@ -27,19 +27,19 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -27,19 +27,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load i18n %} {% load i18n %}
{% if ban_list.paginator %} {% if ban_list.paginator %}
{% include "pagination.html" with list=ban_list %} {% include 'pagination.html' with list=ban_list %}
{% endif %} {% endif %}
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
{% trans "User" as tr_user %} {% trans "User" as tr_user %}
<th>{% include "buttons/sort.html" with prefix='ban' col="user" text=tr_user %}</th> <th>{% include 'buttons/sort.html' with prefix='ban' col="user" text=tr_user %}</th>
<th>{% trans "Reason" %}</th> <th>{% trans "Reason" %}</th>
{% trans "Start date" as tr_start %} {% trans "Start date" as tr_start %}
<th>{% include "buttons/sort.html" with prefix='ban' col="start" text=tr_start %}</th> <th>{% include 'buttons/sort.html' with prefix='ban' col="start" text=tr_start %}</th>
{% trans "End date" as tr_end %} {% trans "End date" as tr_end %}
<th>{% include "buttons/sort.html" with prefix='ban' col="end" text=tr_end %}</th> <th>{% include 'buttons/sort.html' with prefix='ban' col="end" text=tr_end %}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
...@@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% else %} {% else %}
<tr> <tr>
{% endif %} {% endif %}
<td><a href="{% url "users:profil" ban.user.id%}" class="btn btn-primary btn-sm" role="button"><i class="fa fa-user"></i> {{ ban.user }}</a></td> <td><a href="{% url 'users:profil' ban.user.id%}" class="btn btn-primary btn-sm" role="button"><i class="fa fa-user"></i> {{ ban.user }}</a></td>
<td>{{ ban.raison }}</td> <td>{{ ban.raison }}</td>
<td>{{ ban.date_start }}</td> <td>{{ ban.date_start }}</td>
<td>{{ ban.date_end }}</td> <td>{{ ban.date_end }}</td>
...@@ -67,6 +67,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -67,6 +67,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if ban_list.paginator %} {% if ban_list.paginator %}
{% include "pagination.html" with list=ban_list %} {% include 'pagination.html' with list=ban_list %}
{% endif %} {% endif %}
...@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load i18n %} {% load i18n %}
{% if clubs_list.paginator %} {% if clubs_list.paginator %}
{% include "pagination.html" with list=clubs_list %} {% include 'pagination.html' with list=clubs_list %}
{% endif %} {% endif %}
{% load acl %} {% load acl %}
...@@ -34,11 +34,11 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -34,11 +34,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<thead> <thead>
<tr> <tr>
{% trans "Name" as tr_name %} {% trans "Name" as tr_name %}
<th>{% include "buttons/sort.html" with prefix='club' col="surname" text=tr_name %}</th> <th>{% include 'buttons/sort.html' with prefix='club' col="surname" text=tr_name %}</th>
{% trans "Username" as tr_username %} {% trans "Username" as tr_username %}
<th>{% include "buttons/sort.html" with prefix='club' col="pseudo" text=tr_username %}</th> <th>{% include 'buttons/sort.html' with prefix='club' col="pseudo" text=tr_username %}</th>
{% trans "Room" as tr_room %} {% trans "Room" as tr_room %}
<th>{% include "buttons/sort.html" with prefix='club' col="room" text=tr_room %}</th> <th>{% include 'buttons/sort.html' with prefix='club' col="room" text=tr_room %}</th>
<th>{% trans "End of subscription on" %}</th> <th>{% trans "End of subscription on" %}</th>
<th>{% trans "Internet access" %}</th> <th>{% trans "Internet access" %}</th>
<th>{% trans "Profile" %}</th> <th>{% trans "Profile" %}</th>
...@@ -58,7 +58,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -58,7 +58,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %} {% endif %}
</td> </td>
<td> <td>
<a href="{% url "users:profil" club.id%}" class="btn btn-primary btn-sm" role="button"> <a href="{% url 'users:profil' club.id%}" class="btn btn-primary btn-sm" role="button">
<i class="fa fa-user"></i> <i class="fa fa-user"></i>
</a> </a>
</td> </td>
...@@ -68,6 +68,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -68,6 +68,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if clubs_list.paginator %} {% if clubs_list.paginator %}
{% include "pagination.html" with list=clubs_list %} {% include 'pagination.html' with list=clubs_list %}
{% endif %} {% endif %}
...@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load logs_extra %} {% load logs_extra %}
{% if emailaddress_list.paginator %} {% if emailaddress_list.paginator %}
{% include "pagination.html" with list=emailaddress_list %} {% include 'pagination.html' with list=emailaddress_list %}
{% endif %} {% endif %}
<table class="table table-striped"> <table class="table table-striped">
...@@ -53,6 +53,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -53,6 +53,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if emailaddress_list.paginator %} {% if emailaddress_list.paginator %}
{% include "pagination.html" with list=emailaddress_list %} {% include 'pagination.html' with list=emailaddress_list %}
{% endif %} {% endif %}
...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="panel-heading clearfix" data-toggle="collapse" data-target="#collapse_superuser"> <div class="panel-heading clearfix" data-toggle="collapse" data-target="#collapse_superuser">
<div class="pull-right"> <div class="pull-right">
<a type="button" class="btn btn-sm btn-default" data-toggle="modal" data-target="#modal_superuser"> <a type="button" class="btn btn-sm btn-default" data-toggle="modal" data-target="#modal_superuser">
{{superusers.count}} <i class="fa fa-user"></i> {{ superusers.count }} <i class="fa fa-user"></i>
</a> </a>
</div> </div>
<h4 class="text-danger"> <h4 class="text-danger">
...@@ -41,16 +41,16 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -41,16 +41,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</div> </div>
<div class="panel-collapse collapse" id="collapse_superuser"> <div class="panel-collapse collapse" id="collapse_superuser">
<div class="panel-body"> <div class="panel-body">
<h4 class="text-danger">{% trans "Total: All permissions" %}</h4> <h4 class="text-danger">{% trans "Total: all permissions" %}</h4>
</div> </div>
</div> </div>
</div> </div>
<div class="modal fade" id="modal_superuser" tabindex="-1" role="dialog" aria-labelledby="Users in Superuser"> <div class="modal fade" id="modal_superuser" tabindex="-1" role="dialog" aria-labelledby={% trans "Users in Superuser" %}>
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label={% trans "Close" %}>
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
</button> </button>
<h4 class="modal-title" id="myModalLabel">{% trans "Users in Superuser" %}</h4> <h4 class="modal-title" id="myModalLabel">{% trans "Users in Superuser" %}</h4>
...@@ -147,11 +147,11 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -147,11 +147,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</div> </div>
{% if users %} {% if users %}
<div class="modal fade" id="modal_{{right.id}}" tabindex="-1" role="dialog" aria-labelledby="Users"> <div class="modal fade" id="modal_{{right.id}}" tabindex="-1" role="dialog" aria-labelledby={% trans "Users" %}>
<div class="modal-dialog" role="document"> <div class="modal-dialog" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close" data-dismiss="modal" aria-label={% trans "Close" %}>
<i class="fa fa-times"></i> <i class="fa fa-times"></i>
</button> </button>
<h4 class="modal-title" id="myModalLabel"> <h4 class="modal-title" id="myModalLabel">
...@@ -192,7 +192,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -192,7 +192,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if not user.last_seen %} {% if not user.last_seen %}
<td class="text-danger">{% trans "Never" %}</td> <td class="text-danger">{% trans "Never" %}</td>
{% else %} {% else %}
<td class="text-success">{{user.last_seen}}</td> <td class="text-success">{{ user.last_seen }}</td>
{% endif %} {% endif %}
<td> <td>
<a class="btn btn-danger" role="button" href="{% url 'users:del-group' user.id right.id %}"> <a class="btn btn-danger" role="button" href="{% url 'users:del-group' user.id right.id %}">
......
...@@ -28,14 +28,14 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -28,14 +28,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="table-responsive"> <div class="table-responsive">
{% if school_list.paginator %} {% if school_list.paginator %}
{% include "pagination.html" with list=school_list %} {% include 'pagination.html' with list=school_list %}
{% endif %} {% endif %}
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
{% trans "School" as tr_school %} {% trans "School" as tr_school %}
<th>{% include "buttons/sort.html" with prefix='school' col='name' text=tr_school %}</th> <th>{% include 'buttons/sort.html' with prefix='school' col='name' text=tr_school %}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
...@@ -53,7 +53,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -53,7 +53,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if school_list.paginator %} {% if school_list.paginator %}
{% include "pagination.html" with list=school_list %} {% include 'pagination.html' with list=school_list %}
{% endif %} {% endif %}
</div> </div>
...@@ -26,20 +26,20 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -26,20 +26,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<div class="table-responsive"> <div class="table-responsive">
{% if users_list.paginator %} {% if users_list.paginator %}
{% include "pagination.html" with list=users_list %} {% include 'pagination.html' with list=users_list %}
{% endif %} {% endif %}
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
{% trans "Firt name" as tr_name %} {% trans "Firt name" as tr_name %}
<th>{% include "buttons/sort.html" with prefix='user' col="name" text=tr_name %}</th> <th>{% include 'buttons/sort.html' with prefix='user' col="name" text=tr_name %}</th>
{% trans "Surname" as tr_surname %} {% trans "Surname" as tr_surname %}
<th>{% include "buttons/sort.html" with prefix='user' col="surname" text=tr_surname %}</th> <th>{% include 'buttons/sort.html' with prefix='user' col="surname" text=tr_surname %}</th>
{% trans "Username" as tr_username %} {% trans "Username" as tr_username %}
<th>{% include "buttons/sort.html" with prefix='user' col="pseudo" text=tr_username %}</th> <th>{% include 'buttons/sort.html' with prefix='user' col="pseudo" text=tr_username %}</th>
{% trans "Room" as tr_room %} {% trans "Room" as tr_room %}
<th>{% include "buttons/sort.html" with prefix='user' col="room" text=tr_room %}</th> <th>{% include 'buttons/sort.html' with prefix='user' col="room" text=tr_room %}</th>
<th>{% trans "End of subscription on" %}</th> <th>{% trans "End of subscription on" %}</th>
<th>{% trans "Internet access" %}</th> <th>{% trans "Internet access" %}</th>
<th>{% trans "Profile" %}</th> <th>{% trans "Profile" %}</th>
...@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %} {% endif %}
</td> </td>
<td> <td>
<a href="{% url "users:profil" user.id%}" class="btn btn-primary btn-sm" role="button"> <a href="{% url 'users:profil' user.id%}" class="btn btn-primary btn-sm" role="button">
<i class="fa fa-user"></i> <i class="fa fa-user"></i>
</a> </a>
</td> </td>
...@@ -69,7 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -69,7 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if users_list.paginator %} {% if users_list.paginator %}
{% include "pagination.html" with list=users_list %} {% include 'pagination.html' with list=users_list %}
{% endif %} {% endif %}
</div> </div>
...@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load i18n %} {% load i18n %}
{% if white_list.paginator %} {% if white_list.paginator %}
{% include "pagination.html" with list=white_list %} {% include 'pagination.html' with list=white_list %}
{% endif %} {% endif %}
{% load acl %} {% load acl %}
{% load logs_extra %} {% load logs_extra %}
...@@ -34,12 +34,12 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -34,12 +34,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<thead> <thead>
<tr> <tr>
{% trans "User" as tr_user %} {% trans "User" as tr_user %}
<th>{% include "buttons/sort.html" with prefix='white' col="user" text=tr_user %}</th> <th>{% include 'buttons/sort.html' with prefix='white' col="user" text=tr_user %}</th>
<th>{% trans "Reason" %}</th> <th>{% trans "Reason" %}</th>
{% trans "Start date" as tr_start %} {% trans "Start date" as tr_start %}
<th>{% include "buttons/sort.html" with prefix='white' col="start" text=tr_start %}</th> <th>{% include 'buttons/sort.html' with prefix='white' col="start" text=tr_start %}</th>
{% trans "End date" as tr_end %} {% trans "End date" as tr_end %}
<th>{% include "buttons/sort.html" with prefix='white' col="end" text=tr_end %}</th> <th>{% include 'buttons/sort.html' with prefix='white' col="end" text=tr_end %}</th>
<th></th> <th></th>
</tr> </tr>
</thead> </thead>
...@@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% else %} {% else %}
<tr> <tr>
{% endif %} {% endif %}
<td><a href="{% url "users:profil" whitelist.user.id%}" class="btn btn-primary btn-sm" role="button"><i class="fa fa-user"></i> {{ whitelist.user }}</a></td> <td><a href="{% url 'users:profil' whitelist.user.id%}" class="btn btn-primary btn-sm" role="button"><i class="fa fa-user"></i> {{ whitelist.user }}</a></td>
<td>{{ whitelist.raison }}</td> <td>{{ whitelist.raison }}</td>
<td>{{ whitelist.date_start }}</td> <td>{{ whitelist.date_start }}</td>
<td>{{ whitelist.date_end }}</td> <td>{{ whitelist.date_end }}</td>
...@@ -67,6 +67,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -67,6 +67,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
</table> </table>
{% if white_list.paginator %} {% if white_list.paginator %}
{% include "pagination.html" with list=white_list %} {% include 'pagination.html' with list=white_list %}
{% endif %} {% endif %}
{% extends "machines/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
...@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% load bootstrap3 %} {% load bootstrap3 %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "Deletion of objects" %}{% endblock %} {% block title %}{% trans "Deletion of users" %}{% endblock %}
{% block content %} {% block content %}
......
{% extends "users/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>{% trans "Users" %}</h2> <h2>{% trans "Users" %}</h2>
{% include "users/aff_users.html" with users_list=users_list %} {% include 'users/aff_users.html' with users_list=users_list %}
<br /> <br />
<br /> <br />
<br /> <br />
......
{% extends "users/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>{% trans "Bans" %}</h2> <h2>{% trans "Bans" %}</h2>
{% include "users/aff_bans.html" with ban_list=ban_list %} {% include 'users/aff_bans.html' with ban_list=ban_list %}
<br /> <br />
<br /> <br />
<br /> <br />
......
{% extends "users/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>{% trans "Clubs" %}</h2> <h2>{% trans "Clubs" %}</h2>
{% include "users/aff_clubs.html" with clubs_list=clubs_list %} {% include 'users/aff_clubs.html' with clubs_list=clubs_list %}
<br /> <br />
<br /> <br />
<br /> <br />
......
{% extends "users/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
...@@ -30,6 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -30,6 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>{% trans "Local email accounts" %}</h2> <h2>{% trans "Local email accounts" %}</h2>
{% include "users/aff_emailaddress.html" with emailaddress_list=emailaddress_list %} {% include 'users/aff_emailaddress.html' with emailaddress_list=emailaddress_list %}
{% endblock %} {% endblock %}
{% extends "users/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
...@@ -37,6 +37,6 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -37,6 +37,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
<a class="btn btn-danger btn-sm" role="button" href="{% url 'users:del-listright' %}"><i class="fa fa-trash"></i>{% trans " Delete one or several groups of rights" %}</a> <a class="btn btn-danger btn-sm" role="button" href="{% url 'users:del-listright' %}"><i class="fa fa-trash"></i>{% trans " Delete one or several groups of rights" %}</a>
<br /> <br />
<br /> <br />
{% include "users/aff_listright.html" %} {% include 'users/aff_listright.html' %}
{% endblock %} {% endblock %}
{% extends "users/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>{% trans "Rights" %}</h2> <h2>{% trans "Rights" %}</h2>
{% include "users/aff_rights.html" %} {% include 'users/aff_rights.html' %}
<br /> <br />
<br /> <br />
<br /> <br />
......
{% extends "users/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il 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 se veut agnostique au réseau considéré, de manière à être installable en
...@@ -31,13 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc., ...@@ -31,13 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% block content %} {% block content %}
<h2>{% trans "List of schools" %}</h2> <h2>{% trans "List of schools" %}</h2>
<h5>{% trans "List of schools for created users." %}</h5> <h5>{% trans "List of schools for created users" %}</h5>
{% can_create School %} {% can_create School %}
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-school' %}"><i class="fa fa-plus"></i>{% trans " Add a school" %}</a> <a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-school' %}"><i class="fa fa-plus"></i>{% trans " Add a school" %}</a>
{% acl_end %} {% acl_end %}
<a class="btn btn-danger btn-sm" role="button" href="{% url 'users:del-school' %}"><i class="fa fa-trash"></i>{% trans " Delete one or several schools" %}</a> <a class="btn btn-danger btn-sm" role="button" href="{% url 'users:del-school' %}"><i class="fa fa-trash"></i>{% trans " Delete one or several schools" %}</a>
<hr> <hr>
{% include "users/aff_schools.html" with school_list=school_list %} {% include 'users/aff_schools.html' with school_list=school_list %}
<br /> <br />
<br /> <br />
<br /> <br />
......
{% extends "users/sidebar.html" %} {% extends 'users/sidebar.html' %}
{% comment %} {% comment %}
Re2o est un logiciel d'administration développé initiallement au rezometz. Il Re2o est un logiciel d'administration développé initiallement au rezometz. Il