Verified Commit 7f94eb61 authored by erdnaxe's avatar erdnaxe 🎇

Rename pseudo to username

parent 93db3fbb
Pipeline #1165 passed with stage
in 2 minutes and 59 seconds
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-12 15:20+0200\n"
"POT-Creation-Date: 2019-04-24 09:44+0200\n"
"PO-Revision-Date: 2019-01-07 01:37+0100\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
......
......@@ -583,7 +583,7 @@ class UserSerializer(NamespacedHMSerializer):
class Meta:
model = users.User
fields = ('surname', 'pseudo', 'email', 'local_email_redirect',
fields = ('surname', 'username', 'email', 'local_email_redirect',
'local_email_enabled', 'school', 'shell', 'comment',
'state', 'registered', 'telephone', 'solde', 'access',
'end_access', 'uid', 'class_name', 'api_url')
......@@ -601,7 +601,7 @@ class ClubSerializer(NamespacedHMSerializer):
class Meta:
model = users.Club
fields = ('name', 'pseudo', 'email', 'local_email_redirect',
fields = ('name', 'username', 'email', 'local_email_redirect',
'local_email_enabled', 'school', 'shell', 'comment',
'state', 'registered', 'telephone', 'solde', 'room',
'access', 'end_access', 'administrators', 'members',
......@@ -619,7 +619,7 @@ class AdherentSerializer(NamespacedHMSerializer):
class Meta:
model = users.Adherent
fields = ('name', 'surname', 'pseudo', 'email', 'local_email_redirect',
fields = ('name', 'surname', 'username', 'email', 'local_email_redirect',
'local_email_enabled', 'school', 'shell', 'comment',
'state', 'registered', 'telephone', 'room', 'solde',
'access', 'end_access', 'uid', 'api_url', 'gid')
......@@ -635,7 +635,7 @@ class BasicUserSerializer(NamespacedHMSerializer):
class Meta:
model = users.User
fields = ('pseudo', 'uid', 'gid')
fields = ('username', 'uid', 'gid')
class ServiceUserSerializer(NamespacedHMSerializer):
......@@ -644,7 +644,7 @@ class ServiceUserSerializer(NamespacedHMSerializer):
class Meta:
model = users.ServiceUser
fields = ('pseudo', 'access_group', 'comment', 'api_url')
fields = ('username', 'access_group', 'comment', 'api_url')
class SchoolSerializer(NamespacedHMSerializer):
......@@ -701,7 +701,7 @@ class WhitelistSerializer(NamespacedHMSerializer):
class EMailAddressSerializer(NamespacedHMSerializer):
"""Serialize `users.models.EMailAddress` objects.
"""
user = serializers.CharField(source='user.pseudo', read_only=True)
user = serializers.CharField(source='user.username', read_only=True)
class Meta:
model = users.EMailAddress
......@@ -1077,7 +1077,7 @@ class MailingMemberSerializer(UserSerializer):
"""
class Meta(UserSerializer.Meta):
fields = ('name', 'pseudo', 'get_mail')
fields = ('name', 'username', 'get_mail')
class MailingSerializer(ClubSerializer):
......
......@@ -245,7 +245,7 @@ class APIEndpointsTestCase(APITestCase):
password="password",
last_login=datetime.datetime.now(datetime.timezone.utc),
surname="users_adherent_1",
pseudo="usersadherent1",
username="usersadherent1",
email="users_adherent_1@example.net",
school=cls.users_school_1, # Dep users.School
shell=cls.users_listshell_1, # Dep users.ListShell
......@@ -499,7 +499,7 @@ class APIEndpointsTestCase(APITestCase):
password="password",
last_login=datetime.datetime.now(datetime.timezone.utc),
surname="users_club_1",
pseudo="usersclub1",
username="usersclub1",
email="users_club_1@example.net",
school=cls.users_school_1, # Dep users.School
shell=cls.users_listshell_1, # Dep users.ListShell
......@@ -522,7 +522,7 @@ class APIEndpointsTestCase(APITestCase):
cls.users_serviceuser_1 = users.ServiceUser.objects.create(
password="password",
last_login=datetime.datetime.now(datetime.timezone.utc),
pseudo="usersserviceuser1",
username="usersserviceuser1",
access_group=users.ServiceUser.ACCESS[0][0],
comment="users ServiceUser 1"
)
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-12 15:20+0200\n"
"POT-Creation-Date: 2019-04-24 09:44+0200\n"
"PO-Revision-Date: 2018-03-31 16:09+0002\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language: fr_FR\n"
......@@ -566,7 +566,7 @@ msgid "no"
msgstr "non"
#: cotisations/payment_methods/note_kfet/forms.py:17
msgid "pseudo note"
msgid "username note"
msgstr "pseudo note"
#: cotisations/payment_methods/note_kfet/forms.py:20
......@@ -743,7 +743,7 @@ msgstr "Modifier la facture"
#: cotisations/templates/cotisations/edit_facture.html:45
#: cotisations/templates/cotisations/facture.html:62
#: cotisations/templates/cotisations/index_article.html:30
#: cotisations/templates/cotisations/index_article.html:29
msgid "Articles"
msgstr "Articles"
......@@ -769,41 +769,41 @@ msgstr "Ajouter un article supplémentaire"
msgid "Total price: <span id=\"total_price\">0,00</span> €"
msgstr "Prix total : <span id=\"total_price\">0,00</span> €"
#: cotisations/templates/cotisations/index.html:29
#: cotisations/templates/cotisations/index.html:28
#: cotisations/templates/cotisations/sidebar.html:40
msgid "Invoices"
msgstr "Factures"
#: cotisations/templates/cotisations/index.html:32
#: cotisations/templates/cotisations/index.html:31
msgid "Subscriptions"
msgstr "Cotisations"
#: cotisations/templates/cotisations/index_article.html:33
#: cotisations/templates/cotisations/index_article.html:32
msgid "List of article types"
msgstr "Liste des types d'article"
#: cotisations/templates/cotisations/index_article.html:36
#: cotisations/templates/cotisations/index_article.html:35
msgid "Add an article type"
msgstr "Ajouter un type d'article"
#: cotisations/templates/cotisations/index_article.html:40
#: cotisations/templates/cotisations/index_article.html:39
msgid "Delete one or several article types"
msgstr "Supprimer un ou plusieurs types d'article"
#: cotisations/templates/cotisations/index_banque.html:30
#: cotisations/templates/cotisations/index_banque.html:29
#: cotisations/templates/cotisations/sidebar.html:60
msgid "Banks"
msgstr "Banques"
#: cotisations/templates/cotisations/index_banque.html:33
#: cotisations/templates/cotisations/index_banque.html:32
msgid "List of banks"
msgstr "Liste des banques"
#: cotisations/templates/cotisations/index_banque.html:36
#: cotisations/templates/cotisations/index_banque.html:35
msgid "Add a bank"
msgstr "Ajouter une banque"
#: cotisations/templates/cotisations/index_banque.html:40
#: cotisations/templates/cotisations/index_banque.html:39
msgid "Delete one or several banks"
msgstr "Supprimer une ou plusieurs banques"
......@@ -825,20 +825,20 @@ msgstr "Factures personnalisées"
msgid "List of custom invoices"
msgstr "Liste des factures personnalisées"
#: cotisations/templates/cotisations/index_paiement.html:30
#: cotisations/templates/cotisations/index_paiement.html:29
#: cotisations/templates/cotisations/sidebar.html:65
msgid "Payment methods"
msgstr "Moyens de paiement"
#: cotisations/templates/cotisations/index_paiement.html:33
#: cotisations/templates/cotisations/index_paiement.html:32
msgid "List of payment methods"
msgstr "Liste des moyens de paiement"
#: cotisations/templates/cotisations/index_paiement.html:36
#: cotisations/templates/cotisations/index_paiement.html:35
msgid "Add a payment method"
msgstr "Ajouter un moyen de paiement"
#: cotisations/templates/cotisations/index_paiement.html:40
#: cotisations/templates/cotisations/index_paiement.html:39
msgid "Delete one or several payment methods"
msgstr "Supprimer un ou plusieurs moyens de paiement"
......
......@@ -778,7 +778,7 @@ class Paiement(RevMixin, AclMixin, models.Model):
request,
_("The subscription of %(member_name)s was extended to"
" %(end_date)s.") % {
'member_name': invoice.user.pseudo,
'member_name': invoice.user.username,
'end_date': invoice.user.end_adhesion()
}
)
......
......@@ -47,7 +47,7 @@ def accept_payment(request, factureid):
request,
_("The subscription of %(member_name)s was extended to"
" %(end_date)s.") % {
'member_name': invoice.user.pseudo,
'member_name': invoice.user.username,
'end_date': invoice.user.end_adhesion()
}
)
......
......@@ -14,7 +14,7 @@ class NoteCredentialForm(forms.Form):
object.
"""
login = forms.CharField(
label=_("pseudo note")
label=_("username note")
)
password = forms.CharField(
label=_("Password"),
......
......@@ -49,9 +49,9 @@ def note_payment(request, facture, factureid):
))
noteform = NoteCredentialForm(request.POST or None)
if noteform.is_valid():
pseudo = noteform.cleaned_data['login']
username = noteform.cleaned_data['login']
password = noteform.cleaned_data['password']
result, sock, err = login(payment_method.server, payment_method.port, pseudo, password)
result, sock, err = login(payment_method.server, payment_method.port, username, password)
if not result:
messages.error(request, err)
return form(
......
......@@ -275,7 +275,7 @@ def check_user_machine_and_register(nas_type, username, mac_address):
Renvoie le mot de passe ntlm de l'user si tout est ok
Utilise pour les authentifications en 802.1X"""
interface = Interface.objects.filter(mac_address=mac_address).first()
user = User.objects.filter(pseudo__iexact=username).first()
user = User.objects.filter(username__iexact=username).first()
if not user:
return (False, u"User inconnu", '')
if not user.has_access():
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-12 15:20+0200\n"
"POT-Creation-Date: 2019-04-24 09:44+0200\n"
"PO-Revision-Date: 2018-06-23 16:01+0200\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
......@@ -119,11 +119,11 @@ msgstr "+%(duration)s mois"
msgid "%(username)s has edited an interface of"
msgstr "%(username)s a modifié une interface de"
#: logs/templates/logs/delete.html:29
#: logs/templates/logs/delete.html:28
msgid "Deletion of actions"
msgstr "Suppression d'actions"
#: logs/templates/logs/delete.html:35
#: logs/templates/logs/delete.html:33
#, python-format
msgid ""
"Warning: are you sure you want to delete this action %(objet_name)s "
......@@ -132,18 +132,18 @@ msgstr ""
"Attention: voulez-vous vraiment supprimer cette action %(objet_name)s "
"( %(objet)s ) ?"
#: logs/templates/logs/delete.html:36
#: logs/templates/logs/delete.html:35
msgid "Confirm"
msgstr "Confirmer"
#: logs/templates/logs/index.html:29 logs/templates/logs/stats_general.html:29
#: logs/templates/logs/stats_logs.html:29
#: logs/templates/logs/stats_models.html:29
#: logs/templates/logs/stats_users.html:29
#: logs/templates/logs/index.html:28 logs/templates/logs/stats_general.html:28
#: logs/templates/logs/stats_logs.html:28
#: logs/templates/logs/stats_models.html:28
#: logs/templates/logs/stats_users.html:28
msgid "Statistics"
msgstr "Statistiques"
#: logs/templates/logs/index.html:32 logs/templates/logs/stats_logs.html:32
#: logs/templates/logs/index.html:31 logs/templates/logs/stats_logs.html:31
#: logs/views.py:404
msgid "Actions performed"
msgstr "Actions effectuées"
......@@ -172,15 +172,15 @@ msgstr "Actions de câblage"
msgid "Users"
msgstr "Utilisateurs"
#: logs/templates/logs/stats_general.html:32
#: logs/templates/logs/stats_general.html:31
msgid "General statistics"
msgstr "Statistiques générales"
#: logs/templates/logs/stats_models.html:32
#: logs/templates/logs/stats_models.html:31
msgid "Database statistics"
msgstr "Statistiques sur la base de données"
#: logs/templates/logs/stats_users.html:32
#: logs/templates/logs/stats_users.html:31
msgid "Statistics about users"
msgstr "Statistiques sur les utilisateurs"
......
......@@ -80,7 +80,7 @@ class InterfaceAdmin(VersionAdmin):
inlines = (DomainInline, Ipv6ListInline)
filter_horizontal = ('port_lists',)
search_fields = ('domain__name', 'mac_address', 'ipv4__ipv4',
'machine__name', 'machine__user__pseudo',
'machine__name', 'machine__user__username',
'machine__user__surname')
# TODO(erdnaxe): we need to split alias and domain
......@@ -105,7 +105,7 @@ class MachineAdmin(VersionAdmin):
list_filter = ('active',)
inlines = (InterfaceInline, SshFpInline)
empty_value_display = _('- no name -')
search_fields = ('name', 'user__pseudo', 'user__surname')
search_fields = ('name', 'user__username', 'user__surname')
@admin.register(MachineType)
......@@ -158,7 +158,7 @@ class OuverturePortListAdmin(VersionAdmin):
@admin.register(Role)
class RoleAdmin(VersionAdmin):
"""Admin view of a Role object"""
list_display = ('role_type', 'specific_role', 'servers')
list_display = ('role_type', 'specific_role')
filter_horizontal = ('servers',)
# TODO(erdnaxe): investigate why it was buggy before switching to admin
# TODO(erdnaxe): print machines on change list like in edit mode
......@@ -180,8 +180,7 @@ class ServiceLinkInline(admin.TabularInline):
@admin.register(Service)
class ServiceAdmin(VersionAdmin):
"""Admin view of a Service object"""
list_display = ('service_type', 'min_time_regen', 'regular_time_regen',
'servers')
list_display = ('service_type', 'min_time_regen', 'regular_time_regen')
inlines = (ServiceLinkInline,)
# TODO(erdnaxe): print machines on change list like in edit mode
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-14 08:49+0200\n"
"POT-Creation-Date: 2019-04-24 09:44+0200\n"
"PO-Revision-Date: 2018-06-23 16:35+0200\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
......@@ -19,7 +19,7 @@ msgstr ""
msgid "You don't have the right to view this application."
msgstr "Vous n'avez pas le droit de voir cette application."
#: machines/admin.py:104
#: machines/admin.py:107
msgid "- no name -"
msgstr "- sans nom -"
......@@ -1032,11 +1032,11 @@ msgstr "Algorithme utilisé"
msgid "Comment"
msgstr "Commentaire"
#: machines/templates/machines/delete.html:29
#: machines/templates/machines/delete.html:28
msgid "Deletion of machines"
msgstr "Suppression de machines"
#: machines/templates/machines/delete.html:35
#: machines/templates/machines/delete.html:33
#, python-format
msgid ""
"Warning: are you sure you want to delete this object %(objet_name)s "
......@@ -1045,43 +1045,43 @@ msgstr ""
"Attention : voulez-vous vraiment supprimer cet objet %(objet_name)s "
"( %(objet)s ) ?"
#: machines/templates/machines/delete.html:36
#: machines/templates/machines/delete.html:35
msgid "Confirm"
msgstr "Confirmer"
#: machines/templates/machines/index.html:29
#: machines/templates/machines/index.html:32
#: machines/templates/machines/index_alias.html:29
#: machines/templates/machines/index_iptype.html:30
#: machines/templates/machines/index_ipv6.html:30
#: machines/templates/machines/index.html:28
#: machines/templates/machines/index.html:31
#: machines/templates/machines/index_alias.html:28
#: machines/templates/machines/index_iptype.html:28
#: machines/templates/machines/index_ipv6.html:29
#: machines/templates/machines/index_service.html:28
#: machines/templates/machines/index_sshfp.html:28
#: machines/templates/machines/index_sshfp.html:27
#: machines/templates/machines/machine.html:31
#: machines/templates/machines/sidebar.html:33
msgid "Machines"
msgstr "Machines"
#: machines/templates/machines/index_alias.html:32
#: machines/templates/machines/index_alias.html:31
msgid "List of the aliases of the interface"
msgstr "Liste des alias de l'interface"
#: machines/templates/machines/index_alias.html:34
#: machines/templates/machines/index_alias.html:33
msgid " Add an alias"
msgstr " Ajouter un alias"
#: machines/templates/machines/index_alias.html:36
#: machines/templates/machines/index_alias.html:35
msgid " Delete one or several aliases"
msgstr " Supprimer un ou plusieurs alias"
#: machines/templates/machines/index_iptype.html:33
#: machines/templates/machines/index_iptype.html:31
msgid "List of IP types"
msgstr "Liste des types d'IP"
#: machines/templates/machines/index_ipv6.html:33
#: machines/templates/machines/index_ipv6.html:32
msgid "List of the IPv6 addresses of the interface"
msgstr "Liste des adresses IPv6 de l'interface"
#: machines/templates/machines/index_ipv6.html:36
#: machines/templates/machines/index_ipv6.html:35
msgid " Add an IPv6 address"
msgstr " Ajouter une adresse IPv6"
......@@ -1093,11 +1093,11 @@ msgstr "Liste des services"
msgid "States of servers"
msgstr "États des serveurs"
#: machines/templates/machines/index_sshfp.html:31
#: machines/templates/machines/index_sshfp.html:30
msgid "SSH fingerprints"
msgstr "Empreintes SSH"
#: machines/templates/machines/index_sshfp.html:34
#: machines/templates/machines/index_sshfp.html:33
msgid " Add an SSH fingerprint"
msgstr " Ajouter une empreinte SSH"
......
......@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: 2.5\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2019-04-12 15:20+0200\n"
"POT-Creation-Date: 2019-04-24 09:44+0200\n"
"PO-Revision-Date: 2018-06-24 15:54+0200\n"
"Last-Translator: Laouen Fernet <laouen.fernet@supelec.fr>\n"
"Language-Team: \n"
......@@ -20,7 +20,7 @@ msgid "You don't have the right to view this application."
msgstr "Vous n'avez pas le droit de voir cette application."
#: preferences/forms.py:52
#: preferences/templates/preferences/display_preferences.html:142
#: preferences/templates/preferences/display_preferences.html:141
msgid "Telephone number required"
msgstr "Numéro de téléphone requis"
......@@ -37,7 +37,7 @@ msgid "All can create a member"
msgstr "Tous peuvent créer un adhérent"
#: preferences/forms.py:57
#: preferences/templates/preferences/display_preferences.html:120
#: preferences/templates/preferences/display_preferences.html:119
msgid "Self registration"
msgstr "Autoinscription"
......@@ -50,12 +50,12 @@ msgid "Possibility to set a password per machine"
msgstr "Possibilité de mettre un mot de passe par machine"
#: preferences/forms.py:76
#: preferences/templates/preferences/display_preferences.html:172
#: preferences/templates/preferences/display_preferences.html:171
msgid "Maximum number of interfaces allowed for a standard user"
msgstr "Nombre maximum d'interfaces autorisé pour un utilisateur standard"
#: preferences/forms.py:80
#: preferences/templates/preferences/display_preferences.html:176
#: preferences/templates/preferences/display_preferences.html:175
msgid "Maximum number of DNS aliases allowed for a standard user"
msgstr "Nombre maximum d'alias DNS autorisé pour un utilisateur standard"
......@@ -76,7 +76,7 @@ msgid "General message in English"
msgstr "Message général en anglais"
#: preferences/forms.py:132
#: preferences/templates/preferences/display_preferences.html:58
#: preferences/templates/preferences/display_preferences.html:57
msgid "Number of results displayed when searching"
msgstr "Nombre de résultats affichés lors de la recherche"
......@@ -89,29 +89,29 @@ msgid "Number of items per page, large size (e.g. machines)"
msgstr "Nombre d'éléments par page, taille importante (ex : machines)"
#: preferences/forms.py:141
#: preferences/templates/preferences/display_preferences.html:66
#: preferences/templates/preferences/display_preferences.html:65
msgid "Time before expiration of the reset password link (in hours)"
msgstr ""
"Temps avant expiration du lien de réinitialisation de mot de passe (en "
"heures)"
#: preferences/forms.py:144
#: preferences/templates/preferences/display_preferences.html:52
#: preferences/templates/preferences/display_preferences.html:51
msgid "Website name"
msgstr "Nom du site"
#: preferences/forms.py:145
#: preferences/templates/preferences/display_preferences.html:54
#: preferences/templates/preferences/display_preferences.html:53
msgid "Email address for automatic emailing"
msgstr "Adresse mail pour les mails automatiques"
#: preferences/forms.py:147
#: preferences/templates/preferences/display_preferences.html:76
#: preferences/templates/preferences/display_preferences.html:75
msgid "Summary of the General Terms of Use"
msgstr "Résumé des Conditions Générales d'Utilisation"
#: preferences/forms.py:149
#: preferences/templates/preferences/display_preferences.html:78
#: preferences/templates/preferences/display_preferences.html:77
msgid "General Terms of Use"
msgstr "Conditions Générales d'Utilisation"
......@@ -120,7 +120,7 @@ msgid "Organisation name"
msgstr "Nom de l'association"
#: preferences/forms.py:166
#: preferences/templates/preferences/display_preferences.html:323
#: preferences/templates/preferences/display_preferences.html:322
msgid "SIRET number"
msgstr "Numéro SIRET"
......@@ -133,17 +133,17 @@ msgid "Address (line 2)"
msgstr "Adresse (ligne 2)"
#: preferences/forms.py:169 preferences/models.py:437
#: preferences/templates/preferences/display_preferences.html:331
#: preferences/templates/preferences/display_preferences.html:330
msgid "Contact email address"
msgstr "Adresse mail de contact"
#: preferences/forms.py:170
#: preferences/templates/preferences/display_preferences.html:335
#: preferences/templates/preferences/display_preferences.html:334
msgid "Telephone number"
msgstr "Numéro de téléphone"
#: preferences/forms.py:171
#: preferences/templates/preferences/display_preferences.html:337
#: preferences/templates/preferences/display_preferences.html:336
msgid "Usual name"
msgstr "Nom d'usage"
......@@ -173,7 +173,7 @@ msgid "Twitter URL"
msgstr "URL du compte Twitter"
#: preferences/forms.py:211
#: preferences/templates/preferences/display_preferences.html:495
#: preferences/templates/preferences/display_preferences.html:494
msgid "Twitter account name"
msgstr "Nom du compte Twitter"
......@@ -188,7 +188,7 @@ msgstr "Veuillez choisir un VLAN."
#: preferences/forms.py:258
#: preferences/templates/preferences/aff_service.html:31
#: preferences/templates/preferences/display_preferences.html:321
#: preferences/templates/preferences/display_preferences.html:320
msgid "Name"
msgstr "Nom"
......@@ -294,7 +294,7 @@ msgid "Preset in 'VLAN for machines accepted by RADIUS'"
msgstr "Prédéfinie dans 'VLAN pour les machines acceptées par RADIUS'"
#: preferences/models.py:190
#: preferences/templates/preferences/display_preferences.html:246
#: preferences/templates/preferences/display_preferences.html:245
msgid "Web management, activated in case of automatic provision"
msgstr "Gestion web, activée en cas de provision automatique"
......@@ -306,17 +306,17 @@ msgstr ""
"réseau"
#: preferences/models.py:199
#: preferences/templates/preferences/display_preferences.html:248
#: preferences/templates/preferences/display_preferences.html:247
msgid "REST management, activated in case of automatic provision"
msgstr "Gestion REST, activée en cas de provision automatique"
#: preferences/models.py:206
#: preferences/templates/preferences/display_preferences.html:262
#: preferences/templates/preferences/display_preferences.html:261
msgid "IP range for the management of switches"
msgstr "Plage d'IP pour la gestion des commutateurs réseau"
#: preferences/models.py:212
#: preferences/templates/preferences/display_preferences.html:270
#: preferences/templates/preferences/display_preferences.html:269
msgid "Provision of configuration mode for switches"
msgstr "Mode de provision de configuration pour les commutateurs réseau"
......@@ -345,7 +345,7 @@ msgid "Default key for switches"
msgstr "Clé par défaut pour les commutateurs réseau"
#: preferences/models.py:312
#: preferences/templates/preferences/display_preferences.html:221
#: preferences/templates/preferences/display_preferences.html:220
msgid "RADIUS keys"
msgstr "clés RADIUS"
......@@ -447,7 +447,7 @@ msgid "Organisation"
msgstr "Association"
#: preferences/models.py:485
#: preferences/templates/preferences/display_preferences.html:347
#: preferences/templates/preferences/display_preferences.html:346
msgid "President of the association"
msgstr "Président de l'association"
......@@ -596,7 +596,7 @@ msgid "File"
msgstr ""
#: preferences/templates/preferences/aff_mailcontact.html:31
#: preferences/templates/preferences/display_preferences.html:327
#: preferences/templates/preferences/display_preferences.html:326
msgid "Address"
msgstr "Adresse"
......@@ -618,12 +618,12 @@ msgid "RADIUS key used by the swithes"
msgstr "Clé RADIUS utilisée par les commutateurs réseau"
#: preferences/templates/preferences/aff_radiusoptions.html:28
#: preferences/templates/preferences/display_preferences.html:204
#: preferences/templates/preferences/display_preferences.html:203
msgid "General policy for VLAN setting"
msgstr "Politique générale pour le placement sur un VLAN"
#: preferences/templates/preferences/aff_radiusoptions.html:30