mirror of
https://gitlab2.federez.net/re2o/re2o
synced 2024-11-07 02:16:26 +00:00
add translations for users/
This commit is contained in:
Laouen Fernet
parent
69d80fcdb0
commit
1c28c2d1bc
29 changed files with 507 additions and 505 deletions
|
|
@ -381,7 +381,7 @@ class AdherentCreationForm(AdherentForm):
|
|||
+ "using the forgotten password button on the "\
|
||||
+ "login page or contacting support.")
|
||||
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
|
||||
gtu_check = forms.BooleanField(required=True)
|
||||
|
|
@ -439,7 +439,7 @@ class ClubForm(FormRevMixin, FieldPermissionFormMixin, ModelForm):
|
|||
self.fields['surname'].label = _("Name")
|
||||
self.fields['school'].label = _("School")
|
||||
self.fields['comment'].label = _("Comment")
|
||||
self.fields['email'].label = _("Email Address")
|
||||
self.fields['email'].label = _("Email address")
|
||||
if 'room' in self.fields:
|
||||
self.fields['room'].label = _("Room")
|
||||
self.fields['room'].empty_label = _("No room")
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
20
users/migrations/0080_auto_20190108_1726.py
Normal file
20
users/migrations/0080_auto_20190108_1726.py
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
# -*- 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,
|
|||
STATE_ARCHIVE = 2
|
||||
STATE_NOT_YET_ACTIVE = 3
|
||||
STATES = (
|
||||
(0, 'STATE_ACTIVE'),
|
||||
(1, 'STATE_DISABLED'),
|
||||
(2, 'STATE_ARCHIVE'),
|
||||
(3, 'STATE_NOT_YET_ACTIVE'),
|
||||
(0, _("Active")),
|
||||
(1, _("Disabled")),
|
||||
(2, _("Archived")),
|
||||
(3, _("Not yet active")),
|
||||
)
|
||||
|
||||
surname = models.CharField(max_length=255)
|
||||
|
|
@ -356,7 +356,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
|
|||
""" Renvoie le nom complet de l'user formaté nom/prénom"""
|
||||
name = self.name
|
||||
if name:
|
||||
return '%s %s' % (name, self.surname)
|
||||
return "%s %s" % (name, self.surname)
|
||||
else:
|
||||
return self.surname
|
||||
|
||||
|
|
@ -510,7 +510,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
|
|||
)['total'] or 0
|
||||
somme_credit = Vente.objects.filter(
|
||||
facture__in=Facture.objects.filter(user=self, valid=True),
|
||||
name="solde"
|
||||
name='solde'
|
||||
).aggregate(
|
||||
total=models.Sum(
|
||||
models.F('prix')*models.F('number'),
|
||||
|
|
@ -681,7 +681,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
|
|||
),
|
||||
'expire_in': str(
|
||||
GeneralOption.get_cached_value('req_expire_hrs')
|
||||
) + ' heures',
|
||||
) + ' hours',
|
||||
}
|
||||
send_mail(
|
||||
'Changement de mot de passe du %(name)s / Password renewal for '
|
||||
|
|
@ -723,7 +723,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
|
|||
self.notif_auto_newmachine(interface_cible)
|
||||
except Exception as error:
|
||||
return False, traceback.format_exc()
|
||||
return interface_cible, "Ok"
|
||||
return interface_cible, _("OK")
|
||||
|
||||
def notif_auto_newmachine(self, interface):
|
||||
"""Notification mail lorsque une machine est automatiquement
|
||||
|
|
@ -1024,7 +1024,7 @@ class User(RevMixin, FieldPermissionModelMixin, AbstractBaseUser,
|
|||
if (EMailAddress.objects
|
||||
.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):
|
||||
raise ValidationError(_("There is neither a local email address nor an external"
|
||||
" email address for this user.")
|
||||
|
|
@ -1068,7 +1068,7 @@ class Adherent(User):
|
|||
if self.gpg_fingerprint:
|
||||
gpg_fingerprint = self.gpg_fingerprint.replace(' ', '').upper()
|
||||
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
|
||||
|
||||
@classmethod
|
||||
|
|
@ -1461,7 +1461,7 @@ class Ban(RevMixin, AclMixin, models.Model):
|
|||
'asso_name': AssoOption.get_cached_value('name'),
|
||||
})
|
||||
send_mail(
|
||||
'Deconnexion disciplinaire',
|
||||
'Déconnexion disciplinaire / Disciplinary disconnection',
|
||||
template.render(context),
|
||||
GeneralOption.get_cached_value('email_from'),
|
||||
[self.user.email],
|
||||
|
|
|
|||
|
|
@ -27,19 +27,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% load i18n %}
|
||||
|
||||
{% if ban_list.paginator %}
|
||||
{% include "pagination.html" with list=ban_list %}
|
||||
{% include 'pagination.html' with list=ban_list %}
|
||||
{% endif %}
|
||||
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
{% 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>
|
||||
{% 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 %}
|
||||
<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>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% else %}
|
||||
<tr>
|
||||
{% 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.date_start }}</td>
|
||||
<td>{{ ban.date_end }}</td>
|
||||
|
|
@ -67,6 +67,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</table>
|
||||
|
||||
{% if ban_list.paginator %}
|
||||
{% include "pagination.html" with list=ban_list %}
|
||||
{% include 'pagination.html' with list=ban_list %}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% load i18n %}
|
||||
|
||||
{% if clubs_list.paginator %}
|
||||
{% include "pagination.html" with list=clubs_list %}
|
||||
{% include 'pagination.html' with list=clubs_list %}
|
||||
{% endif %}
|
||||
|
||||
{% load acl %}
|
||||
|
|
@ -34,11 +34,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<thead>
|
||||
<tr>
|
||||
{% 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 %}
|
||||
<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 %}
|
||||
<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 "Internet access" %}</th>
|
||||
<th>{% trans "Profile" %}</th>
|
||||
|
|
@ -58,7 +58,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% endif %}
|
||||
</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>
|
||||
</a>
|
||||
</td>
|
||||
|
|
@ -68,6 +68,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</table>
|
||||
|
||||
{% if clubs_list.paginator %}
|
||||
{% include "pagination.html" with list=clubs_list %}
|
||||
{% include 'pagination.html' with list=clubs_list %}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% load logs_extra %}
|
||||
|
||||
{% if emailaddress_list.paginator %}
|
||||
{% include "pagination.html" with list=emailaddress_list %}
|
||||
{% include 'pagination.html' with list=emailaddress_list %}
|
||||
{% endif %}
|
||||
|
||||
<table class="table table-striped">
|
||||
|
|
@ -53,6 +53,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</table>
|
||||
|
||||
{% if emailaddress_list.paginator %}
|
||||
{% include "pagination.html" with list=emailaddress_list %}
|
||||
{% include 'pagination.html' with list=emailaddress_list %}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -41,16 +41,16 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
<div class="panel-collapse collapse" id="collapse_superuser">
|
||||
<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 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-content">
|
||||
<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>
|
||||
</button>
|
||||
<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.,
|
|||
</div>
|
||||
|
||||
{% 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-content">
|
||||
<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>
|
||||
</button>
|
||||
<h4 class="modal-title" id="myModalLabel">
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
<div class="table-responsive">
|
||||
{% if school_list.paginator %}
|
||||
{% include "pagination.html" with list=school_list %}
|
||||
{% include 'pagination.html' with list=school_list %}
|
||||
{% endif %}
|
||||
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
{% 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>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -53,7 +53,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</table>
|
||||
|
||||
{% if school_list.paginator %}
|
||||
{% include "pagination.html" with list=school_list %}
|
||||
{% include 'pagination.html' with list=school_list %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -26,20 +26,20 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
<div class="table-responsive">
|
||||
{% if users_list.paginator %}
|
||||
{% include "pagination.html" with list=users_list %}
|
||||
{% include 'pagination.html' with list=users_list %}
|
||||
{% endif %}
|
||||
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
{% 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 %}
|
||||
<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 %}
|
||||
<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 %}
|
||||
<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 "Internet access" %}</th>
|
||||
<th>{% trans "Profile" %}</th>
|
||||
|
|
@ -60,7 +60,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% endif %}
|
||||
</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>
|
||||
</a>
|
||||
</td>
|
||||
|
|
@ -69,7 +69,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</table>
|
||||
|
||||
{% if users_list.paginator %}
|
||||
{% include "pagination.html" with list=users_list %}
|
||||
{% include 'pagination.html' with list=users_list %}
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% load i18n %}
|
||||
|
||||
{% if white_list.paginator %}
|
||||
{% include "pagination.html" with list=white_list %}
|
||||
{% include 'pagination.html' with list=white_list %}
|
||||
{% endif %}
|
||||
{% load acl %}
|
||||
{% load logs_extra %}
|
||||
|
|
@ -34,12 +34,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<thead>
|
||||
<tr>
|
||||
{% 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>
|
||||
{% 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 %}
|
||||
<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>
|
||||
</tr>
|
||||
</thead>
|
||||
|
|
@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% else %}
|
||||
<tr>
|
||||
{% 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.date_start }}</td>
|
||||
<td>{{ whitelist.date_end }}</td>
|
||||
|
|
@ -67,6 +67,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</table>
|
||||
|
||||
{% if white_list.paginator %}
|
||||
{% include "pagination.html" with list=white_list %}
|
||||
{% include 'pagination.html' with list=white_list %}
|
||||
{% endif %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "machines/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% load bootstrap3 %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{% trans "Deletion of objects" %}{% endblock %}
|
||||
{% block title %}{% trans "Deletion of users" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% block content %}
|
||||
<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 />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% block content %}
|
||||
<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 />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% block content %}
|
||||
<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 />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -30,6 +30,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% block content %}
|
||||
<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 %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -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>
|
||||
<br />
|
||||
<br />
|
||||
{% include "users/aff_listright.html" %}
|
||||
{% include 'users/aff_listright.html' %}
|
||||
{% endblock %}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% block content %}
|
||||
<h2>{% trans "Rights" %}</h2>
|
||||
{% include "users/aff_rights.html" %}
|
||||
{% include 'users/aff_rights.html' %}
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -31,13 +31,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% block content %}
|
||||
<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 %}
|
||||
<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 %}
|
||||
<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>
|
||||
{% include "users/aff_schools.html" with school_list=school_list %}
|
||||
{% include 'users/aff_schools.html' with school_list=school_list %}
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -35,7 +35,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% can_create ServiceUser %}
|
||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:new-serviceuser' %}"><i class="fa fa-plus"></i>{% trans " Add a service user" %}</a>
|
||||
{% acl_end %}
|
||||
{% include "users/aff_serviceusers.html" with serviceusers_list=serviceusers_list %}
|
||||
{% include 'users/aff_serviceusers.html' with serviceusers_list=serviceusers_list %}
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -34,7 +34,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% can_create ListShell %}
|
||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'users:add-shell' %}"><i class="fa fa-plus"></i>{% trans " Add a shell" %}</a>
|
||||
{% acl_end %}
|
||||
{% include "users/aff_shell.html" with shell_list=shell_list %}
|
||||
{% include 'users/aff_shell.html' with shell_list=shell_list %}
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -30,7 +30,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
|
||||
{% block content %}
|
||||
<h2>{% trans "Whitelists" %}</h2>
|
||||
{% include "users/aff_whitelists.html" with white_list=white_list %}
|
||||
{% include 'users/aff_whitelists.html' with white_list=white_list %}
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -37,7 +37,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</form>
|
||||
|
||||
<h3>{% blocktrans %}The following users will be archived ({{ to_archive_list|length }}):{% endblocktrans %}</h3>
|
||||
{% include "users/aff_users.html" with users_list=to_archive_list %}
|
||||
{% include 'users/aff_users.html' with users_list=to_archive_list %}
|
||||
<br />
|
||||
<br />
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -45,7 +45,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<div class="panel panel-danger">
|
||||
<div class="panel-heading dashboard">{% trans "Your account has been banned" %}</div>
|
||||
<div class="panel-body dashboard">
|
||||
<i class="text-danger">{% blocktrans with end_ban=users.end_ban|date:"SHORT_DATE_FORMAT" %}End of the ban: {{ end_ban }}{% endblocktrans %}</i>
|
||||
<i class="text-danger">{% blocktrans with end_ban_date=users.end_ban|date:"SHORT_DATE_FORMAT" %}End of the ban: {{ end_ban_date }}{% endblocktrans %}</i>
|
||||
</div>
|
||||
</div>
|
||||
{% elif not users.has_access %}
|
||||
|
|
@ -63,7 +63,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
{% else %}
|
||||
<div class="panel panel-success">
|
||||
<div class="panel-heading dashboard">{% blocktrans with end_connection=users.end_access|date:"SHORT_DATE_FORMAT" %}Connection (until {{ end_connection }} ){% endblocktrans %}</div>
|
||||
<div class="panel-heading dashboard">{% blocktrans with end_connection_date=users.end_access|date:"SHORT_DATE_FORMAT" %}Connection (until {{ end_connection_date }} ){% endblocktrans %}</div>
|
||||
<div class="panel-body dashboard">
|
||||
{% can_create Facture %}
|
||||
<a class="btn btn-success btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}">
|
||||
|
|
@ -163,7 +163,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<dd>{% trans "Mailing disabled" %}</dd>
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<dt>{% trans "Firt name" %}</dt>
|
||||
<dt>{% trans "First name" %}</dt>
|
||||
<dd>{{ users.name }}</dd>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
|
@ -252,7 +252,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% elif users.state == 2 %}
|
||||
<dd><i class="text-danger">{% trans "Archived" %}</i></dd>
|
||||
{% elif users.state == 3 %}
|
||||
<dd><i class="text-danger">{% trans "Not yet Member" %}</i></dd>
|
||||
<dd><i class="text-danger">{% trans "Not yet member" %}</i></dd>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
|
|
@ -260,8 +260,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<dt>{% trans "Internet access" %}</dt>
|
||||
{% if users.has_access == True %}
|
||||
<dd><i class="text-success">
|
||||
{% blocktrans with end_access=users.end_access %}Active
|
||||
(until {{ end_access }}){% endblocktrans %}</i></dd>
|
||||
{% blocktrans with end_access=users.end_access %}Active (until {{ end_access }}){% endblocktrans %}</i></dd>
|
||||
{% else %}
|
||||
<dd><i class="text-danger">{% trans "Disabled" %}</i></dd>
|
||||
{% endif %}
|
||||
|
|
@ -382,7 +381,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
<div class="panel-body">
|
||||
{% if machines_list %}
|
||||
{% include "machines/aff_machines.html" with machines_list=machines_list %}
|
||||
{% include 'machines/aff_machines.html' with machines_list=machines_list %}
|
||||
{% else %}
|
||||
<p>{% trans "No machine" %}</p>
|
||||
{% endif %}
|
||||
|
|
@ -402,7 +401,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% can_create Facture %}
|
||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:new-facture' users.id %}">
|
||||
<i class="fa fa-eur"></i>
|
||||
{% trans "Add as subscription" %}
|
||||
{% trans "Add a subscription" %}
|
||||
</a>
|
||||
{% if user_solde %}
|
||||
<a class="btn btn-primary btn-sm" role="button" href="{% url 'cotisations:credit-solde' users.id %}">
|
||||
|
|
@ -414,7 +413,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
<div class="panel-body">
|
||||
{% if facture_list %}
|
||||
{% include "cotisations/aff_cotisations.html" with facture_list=facture_list %}
|
||||
{% include 'cotisations/aff_cotisations.html' with facture_list=facture_list %}
|
||||
{% else %}
|
||||
<p>{% trans "No invoice" %}</p>
|
||||
{% endif %}
|
||||
|
|
@ -439,7 +438,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
<div class="panel-body">
|
||||
{% if ban_list %}
|
||||
{% include "users/aff_bans.html" with ban_list=ban_list %}
|
||||
{% include 'users/aff_bans.html' with ban_list=ban_list %}
|
||||
{% else %}
|
||||
<p>{% trans "No ban" %}</p>
|
||||
{% endif %}
|
||||
|
|
@ -464,7 +463,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
<div class="panel-body">
|
||||
{% if white_list %}
|
||||
{% include "users/aff_whitelists.html" with white_list=white_list %}
|
||||
{% include 'users/aff_whitelists.html' with white_list=white_list %}
|
||||
{% else %}
|
||||
<p>{% trans "No whitelist" %}</p>
|
||||
{% endif %}
|
||||
|
|
@ -509,7 +508,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</a>
|
||||
{% acl_end %}
|
||||
{% if emailaddress_list %}
|
||||
{% include "users/aff_emailaddress.html" with emailaddress_list=emailaddress_list %}
|
||||
{% include 'users/aff_emailaddress.html' with emailaddress_list=emailaddress_list %}
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -28,68 +28,68 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
{% block sidebar %}
|
||||
{% if request.user.is_authenticated%}
|
||||
{% can_create Club %}
|
||||
<a class="list-group-item list-group-item-success" href="{% url "users:new-club" %}">
|
||||
<a class="list-group-item list-group-item-success" href="{% url 'users:new-club' %}">
|
||||
<i class="fa fa-plus"></i>
|
||||
{% trans "Create a club or organisation" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_create Adherent %}
|
||||
<a class="list-group-item list-group-item-success" href="{% url "users:new-user" %}">
|
||||
<a class="list-group-item list-group-item-success" href="{% url 'users:new-user' %}">
|
||||
<i class="fa fa-user-plus"></i>
|
||||
{% trans "Create a user" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% endif %}
|
||||
{% can_view_all Club %}
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-clubs" %}">
|
||||
<a class="list-group-item list-group-item-info" href="{% url 'users:index-clubs' %}">
|
||||
<i class="fa fa-list-ul"></i>
|
||||
{% trans "Clubs and organisations" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_view_all Adherent %}
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index" %}">
|
||||
<a class="list-group-item list-group-item-info" href="{% url 'users:index' %}">
|
||||
<i class="fa fa-list-ul"></i>
|
||||
{% trans "Users" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_view_all Ban %}
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-ban" %}">
|
||||
<a class="list-group-item list-group-item-info" href="{% url 'users:index-ban' %}">
|
||||
<i class="fa fa-list-ul"></i>
|
||||
{% trans "Bans" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_view_all Whitelist %}
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-white" %}">
|
||||
<a class="list-group-item list-group-item-info" href="{% url 'users:index-white' %}">
|
||||
<i class="fa fa-list-ul"></i>
|
||||
{% trans "Whitelists" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_view_all School %}
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-school" %}">
|
||||
<a class="list-group-item list-group-item-info" href="{% url 'users:index-school' %}">
|
||||
<i class="fa fa-list-ul"></i>
|
||||
{% trans "Schools" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_view_all ListShell %}
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-shell" %}">
|
||||
<a class="list-group-item list-group-item-info" href="{% url 'users:index-shell' %}">
|
||||
<i class="fa fa-list-ul"></i>
|
||||
{% trans "Shells" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_view_all ListRight %}
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-listright" %}">
|
||||
<a class="list-group-item list-group-item-info" href="{% url 'users:index-listright' %}">
|
||||
<i class="fa fa-list-ul"></i>
|
||||
{% trans "Groups of rights" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_view_all ServiceUser %}
|
||||
<a class="list-group-item list-group-item-info" href="{% url "users:index-serviceusers" %}">
|
||||
<a class="list-group-item list-group-item-info" href="{% url 'users:index-serviceusers' %}">
|
||||
<i class="fa fa-list-ul"></i>
|
||||
{% trans "Service users" %}
|
||||
</a>
|
||||
{% acl_end %}
|
||||
{% can_change User state %}
|
||||
<a class="list-group-item list-group-item-danger" href="{% url "users:mass-archive" %}">
|
||||
<a class="list-group-item list-group-item-danger" href="{% url 'users:mass-archive' %}">
|
||||
<i class="fa fa-archive"></i>
|
||||
{% trans "Massively archive" %}
|
||||
</a>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "users/sidebar.html" %}
|
||||
{% extends 'users/sidebar.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
|
||||
|
|
@ -41,19 +41,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
<div class="row">
|
||||
<div class="col-sm-6 col-md-6">
|
||||
<div class="panel panel-success">
|
||||
<div class="panel-heading dashboard">{% blocktrans %}Connected from :{% endblocktrans %}</div>
|
||||
<div class="panel-heading dashboard">{% trans "Connected from:" %}</div>
|
||||
<div class="panel-body dashboard">
|
||||
<h5>{% blocktrans %}Room {% endblocktrans %} {{ port.room }}</h5>
|
||||
<h5>{% blocktrans %}Port {% endblocktrans %} {{ port }}</h5>
|
||||
<h5>{% blocktrans with room=port.room %}Room {{ room }}{% endblocktrans %}</h5>
|
||||
<h5>{% blocktrans %}Port {{ port }}{% endblocktrans %}</h5>
|
||||
<h3>{{ userform.register_room }} {{ userform.register_room.label }}</h3>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-6 col-md-6">
|
||||
<div class="panel panel-success">
|
||||
<div class="panel-heading dashboard">{% blocktrans %}Connected with device :{% endblocktrans %}</div>
|
||||
<div class="panel-heading dashboard">{% trans "Connected with device:" %}</div>
|
||||
<div class="panel-body dashboard">
|
||||
<h5>{% blocktrans %}Mac address {% endblocktrans %} {{ mac }}</h5>
|
||||
<h5>{% blocktrans %}MAC address {{ mac }}{% endblocktrans %}</h5>
|
||||
<h3>{{ userform.register_machine }} {{ userform.register_machine.label }}</h3>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -61,7 +61,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<center>{% bootstrap_button "Ok" button_type="submit" icon='ok' button_class='btn-success' %}</center>
|
||||
<center>{% bootstrap_button _("OK") button_type="submit" icon='ok' button_class='btn-success' %}</center>
|
||||
</form>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1093,7 +1093,7 @@ def initial_register(request):
|
|||
client_mac = request.GET.get('client_mac', None)
|
||||
u_form = InitialRegisterForm(request.POST or None, user=request.user, switch_ip=switch_ip, switch_port=switch_port, client_mac=client_mac)
|
||||
if not u_form.fields:
|
||||
messages.error(request, _("Incorrect URL, or already registered device"))
|
||||
messages.error(request, _("Incorrect URL, or already registered device."))
|
||||
return redirect(reverse(
|
||||
'users:profil',
|
||||
kwargs={'userid': str(request.user.id)}
|
||||
|
|
|
|||
Loading…
Reference in a new issue