From 615c20830fbff660de81dd59677bd7b2030992ec Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sat, 18 Aug 2018 10:27:41 +0200 Subject: [PATCH 1/7] jout d'un message sur la page des services --- re2o/templates/re2o/index.html | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/re2o/templates/re2o/index.html b/re2o/templates/re2o/index.html index 28adf055..db6eb119 100644 --- a/re2o/templates/re2o/index.html +++ b/re2o/templates/re2o/index.html @@ -30,7 +30,19 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block title %}{% trans "Home" %}{% endblock %} {% block content %} -

{% blocktrans %}Welcome to {{ name_website }}!{% endblocktrans %}

+ +
+
+

{% blocktrans %}Welcome to {{ name_website }} !{% endblocktrans %}

+
+
+{% if request.user.is_authenticated %} +Vous trouverez ci-dessous les principaux services proposés par le {{ assoname }}. Pour toute action concernant l'administration de votre adhésion/connexion ou de vos machines, rendez vous sur votre profil. +{% else %} +Pour bénéficier d'une connexion internet et profiter des services de l'association, connectez vous avec vos identifiants. Si vous n'avez pas de compte, créez en un. +{% endif %} +
+
{% for service_list in services_urls %} From dd79b866013865900b3cdf06b07679c2bd2e1f3c Mon Sep 17 00:00:00 2001 From: grisel-davy Date: Sat, 18 Aug 2018 13:10:36 +0200 Subject: [PATCH 2/7] Clarification mineur du AdherentForm --- users/forms.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/users/forms.py b/users/forms.py index f1b50652..fb70ec8b 100644 --- a/users/forms.py +++ b/users/forms.py @@ -316,6 +316,8 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): self.fields['room'].label = _("Room") self.fields['room'].empty_label = _("No room") self.fields['school'].empty_label = _("Select a school") + self.fields['shell'].empty_label = _("Shell par défaut") + self.fields['gpg_fingerprint'].widget.attrs['placeholder'] = _("Laissez vide si vous ne disposez pas de clef GPG") def clean_email(self): if not OptionalUser.objects.first().local_email_domain in self.cleaned_data.get('email'): @@ -334,9 +336,9 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): 'email', 'school', 'comment', + 'telephone', 'room', 'shell', - 'telephone', 'gpg_fingerprint' ] From c7f00a11974563b5c2af12cefe78352bcdc5243a Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Sat, 18 Aug 2018 23:51:14 +0200 Subject: [PATCH 3/7] More clear welcome page --- re2o/templates/re2o/index.html | 50 ++++++++++++++++++++++++++++------ 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/re2o/templates/re2o/index.html b/re2o/templates/re2o/index.html index db6eb119..b2d2944b 100644 --- a/re2o/templates/re2o/index.html +++ b/re2o/templates/re2o/index.html @@ -30,20 +30,52 @@ with this program; if not, write to the Free Software Foundation, Inc., {% block title %}{% trans "Home" %}{% endblock %} {% block content %} - -
-
-

{% blocktrans %}Welcome to {{ name_website }} !{% endblocktrans %}

+
+

{% blocktrans %}Welcome to {{ name_website }}{% endblocktrans %}

+
+{% if not request.user.is_authenticated %} +
+
+
+
+
+

Inscription

+

Si vous n'avez pas encore de compte et que vous souhaitez accéder à internet et aux services de l'association, créez votre espace personnel

+

Inscription

+
+
+
+
+
+
+
+
+

Indentification

+

Si avez déjà un compte, identifiez-vous. Vous pouvez gérer votre cotisation à l'association, vos machines, et l'ensemble de vos services

+

Identification

+
+
+
-
-{% if request.user.is_authenticated %} -Vous trouverez ci-dessous les principaux services proposés par le {{ assoname }}. Pour toute action concernant l'administration de votre adhésion/connexion ou de vos machines, rendez vous sur votre profil. {% else %} -Pour bénéficier d'une connexion internet et profiter des services de l'association, connectez vous avec vos identifiants. Si vous n'avez pas de compte, créez en un. -{% endif %} +
+
+
+
+
+

Mon profil

+

Pour gérer votre cotisation, vos machines et l'ensemble de vos services, accédez à votre profil

+

Accéder à mon profil

+
+
+
+{% endif %}
+
+

{% blocktrans %}Les services de l'association{% endblocktrans %}

+
{% for service_list in services_urls %}
From 7f021621aded21e95bf98e427c3aff22ee4a516d Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Thu, 23 Aug 2018 02:18:24 +0200 Subject: [PATCH 4/7] Marquage trad + fix si autoregister disabled --- re2o/templates/re2o/index.html | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/re2o/templates/re2o/index.html b/re2o/templates/re2o/index.html index b2d2944b..e87b2bb7 100644 --- a/re2o/templates/re2o/index.html +++ b/re2o/templates/re2o/index.html @@ -35,24 +35,26 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% if not request.user.is_authenticated %}
+{% if var_sa %}
-

Inscription

-

Si vous n'avez pas encore de compte et que vous souhaitez accéder à internet et aux services de l'association, créez votre espace personnel

-

Inscription

+

{% blocktrans %}Inscription{% endblocktrans %}

+

{% blocktrans %}Si vous n'avez pas encore de compte et que vous souhaitez accéder à internet et aux services de l'association, créez votre espace personnel{% endblocktrans %}

+

{% blocktrans %}Inscription{% endblocktrans %}

+{% endif %}
-

Indentification

-

Si avez déjà un compte, identifiez-vous. Vous pouvez gérer votre cotisation à l'association, vos machines, et l'ensemble de vos services

-

Identification

+

{% blocktrans %}Indentification{% endblocktrans %}

+

{% blocktrans %}Si avez déjà un compte, identifiez-vous. Vous pouvez gérer votre cotisation à l'association, vos machines, et l'ensemble de vos services{% endblocktrans %}

+

{% blocktrans %}Indentification{% endblocktrans %}

@@ -63,9 +65,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-

Mon profil

-

Pour gérer votre cotisation, vos machines et l'ensemble de vos services, accédez à votre profil

-

Accéder à mon profil

+

{% blocktrans %}Mon profil{% endblocktrans %}

+

{% blocktrans %}Pour gérer votre cotisation, vos machines et l'ensemble de vos services, accédez à votre profil{% endblocktrans %}

+

{% blocktrans %}Accéder à mon profil{% endblocktrans %}

From 547e6d0915c53efb12079300ce8283d16d1cc93a Mon Sep 17 00:00:00 2001 From: Gabriel Detraz Date: Thu, 23 Aug 2018 02:54:28 +0200 Subject: [PATCH 5/7] Prolongation de connexion avant expiration --- users/templates/users/profil.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 0d391551..09d499d0 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -49,7 +49,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% blocktrans with end_ban=users.end_ban|date:"SHORT_DATE_FORMAT" %}End of the ban: {{ end_ban }}{% endblocktrans %}
- {% elif not users.is_adherent %} + {% elif not users.has_access %}
{% trans "No connection" %}
@@ -64,9 +64,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% else %}
-
{% trans "Connection" %}
+
{% trans "Connection" %}{% blocktrans with end_connection=user.end_access|date:"SHORT_DATE_FORMAT" %} ( Until {{ end_connection }} ){% endblocktrans %}
- {% blocktrans with end_connection=user.end_adhesion|date:"SHORT_DATE_FORMAT" %}End of connection: {{ end_connection }}{% endblocktrans %} + {% can_create Facture %} + + {% trans "Extend my connection period" %} + + {% acl_end %}
{% endif %} @@ -89,7 +93,7 @@ with this program; if not, write to the Free Software Foundation, Inc., {% if nb_machines %}
- {% trans " Machines" %}{{ nb_machines }} + {% trans " Machines" %} {{ nb_machines }}
From aa2d6365e76cd83b1d5c19490ed701d318fbc13f Mon Sep 17 00:00:00 2001 From: Laouen Fernet Date: Thu, 23 Aug 2018 15:05:04 +0200 Subject: [PATCH 6/7] translation --- re2o/locale/fr/LC_MESSAGES/django.mo | Bin 4617 -> 5657 bytes re2o/locale/fr/LC_MESSAGES/django.po | 54 ++++- re2o/templates/re2o/index.html | 20 +- users/forms.py | 4 +- users/locale/fr/LC_MESSAGES/django.mo | Bin 25257 -> 25505 bytes users/locale/fr/LC_MESSAGES/django.po | 306 +++++++++++++------------- users/templates/users/profil.html | 4 +- 7 files changed, 220 insertions(+), 168 deletions(-) diff --git a/re2o/locale/fr/LC_MESSAGES/django.mo b/re2o/locale/fr/LC_MESSAGES/django.mo index 7e9e55c389615faa748b4e0bb05a7c64997fdd46..72cde11123bdec09725205a6db29b466a77770f5 100644 GIT binary patch delta 1925 zcma))TZkM*6ozZF8?!MRvzyi3#OPYlBoocd?B?Q&3Na6PSV@AK7`%Yk_SDR_&Qy=x zJrg&GjRr3Pg}@MS5mX3ySnzJwqM0S!pr^hHF!(_K5r#(+gve|0%k zbZvhGn4~Yp@x6J8{p(hrH0`Yl>Gv{1x`au)PDFX zdG-Kzzv4K#Cb!!UcVZXAJt=aZWw3>Xi?}rd|Au$LnYBvY4UfQ$ z@MS2{z5^%VhmfP{D=5lbfa2(na1#CrCGzo`@`yJ;vD*qYEWwnZ)FB2U@#7F@l?OM# zI+O#i!8hUC@GUs8PAP`!3>5p1q1b&6Z-!sH{fkf>yaJ_ues}XPkx%abZXEreWN?`U ziFhxkrPzEZ2Cu^@_&%J5UpQWcyO>W=2qNVpQ06CK37&&{;AM!wSz!Zp4}Fv_&TpfS zNd84Ci9#B+lSLr%;&9eP`U0I2$>fy9?Q|^z8gFFj%O?E9aZy9s9dv@uf)b@A7*Sg4 zXa{}#0Kd(2YOmjl{ZXE8nM$FFLZmd4RProM>O-pfR+)54gP)D<^L-P?x-qYtQCJP? zrt|CIC+Tce&xbAT)g$9o=JlM{Hrlh=^Zl@8lcKJNH67TpegY$(jfQ8vnvpY+j$6;h zeiSs5AhbFObuwpk7}Y!*#Gb4bbF+r$&jr@R+*{$Hx;t#5cHpNbE-U9lCA5WPxd(dQ zB-ugn@|b56c?j<$6nSsfCML4ZX1N1}SjX8jCN6592ovXdc+BdiiQ;gx_3BH(meql< zRtu~ItPU>8)O~O0uNCQ|rWV9Wl!c`ZyE}DQy(VULB)qOh|3eRP)J2y`yp*biRjuy2 z;nM@dyLRiH_uec`6S&(Yo75Rt}}JwqMVZ<_Yz% ml>T)jDrUj|w<7&Q{C8xz#(CPxo#JTPd2nn~_x$L-fqwv+Ags6m delta 887 zcmYk)O-K}B9LMqh?5;1n=1bdJns2kZg^`luOM*xtbm*XJWj5hw$a(!P9z*2)aa2s0aQ2#z*jBW`^$ei{YiN*e*Qh$O?m|>9mcR6okj`{%B z;X|aW&0y&}`|_9=)1R_~?4`?+TcKOasuwnY26G4B+9)KG^2 diff --git a/re2o/locale/fr/LC_MESSAGES/django.po b/re2o/locale/fr/LC_MESSAGES/django.po index 86ed6316..f54fdcc1 100644 --- a/re2o/locale/fr/LC_MESSAGES/django.po +++ b/re2o/locale/fr/LC_MESSAGES/django.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-15 16:11+0200\n" +"POT-Creation-Date: 2018-08-23 15:03+0200\n" "PO-Revision-Date: 2018-03-31 16:09+0002\n" "Last-Translator: Laouen Fernet \n" "Language-Team: \n" @@ -185,12 +185,56 @@ msgstr "Historique de %(object)s" msgid "Home" msgstr "Accueil" -#: templates/re2o/index.html:33 +#: templates/re2o/index.html:34 #, python-format -msgid "Welcome to %(name_website)s!" -msgstr "Bienvenue sur %(name_website)s !" +msgid "Welcome to %(name_website)s" +msgstr "Bienvenue sur %(name_website)s" -#: templates/re2o/index.html:47 +#: templates/re2o/index.html:43 templates/re2o/index.html:45 +msgid "Registration" +msgstr "Inscription" + +#: templates/re2o/index.html:44 +msgid "" +"If you don't have an account yet and you want to access the Internet and the " +"organisation's services, create your own personal account." +msgstr "" +"Si vous n'avez pas encore de compte et que vous voulez accéder à Internet et " +"aux services de l'association, créez votre espace personnel." + +#: templates/re2o/index.html:55 templates/re2o/index.html:57 +msgid "Logging in" +msgstr "Identification" + +#: templates/re2o/index.html:56 +msgid "" +"If you already have an account, log in. You can manage your subscription to " +"the organisation, your machines and all your services." +msgstr "" +"Si vous avez déjà un compte, identifiez-vous. Vous pouvez gérer votre " +"cotisation à l'association, vos machines et tous vos services." + +#: templates/re2o/index.html:68 +msgid "My profile" +msgstr "Mon profil" + +#: templates/re2o/index.html:69 +msgid "" +"To manage your subscription, your machines and all your services, access " +"your profile." +msgstr "" +"Pour gérer votre cotisation, vos machines et tous vos services, accéder à " +"votre profil." + +#: templates/re2o/index.html:70 +msgid "Access my profile" +msgstr "Accéder à mon profil" + +#: templates/re2o/index.html:79 +msgid "Services of the organisation" +msgstr "Serices de l'association" + +#: templates/re2o/index.html:93 msgid "Go there" msgstr "Accéder" diff --git a/re2o/templates/re2o/index.html b/re2o/templates/re2o/index.html index e87b2bb7..f7adacbc 100644 --- a/re2o/templates/re2o/index.html +++ b/re2o/templates/re2o/index.html @@ -40,9 +40,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-

{% blocktrans %}Inscription{% endblocktrans %}

-

{% blocktrans %}Si vous n'avez pas encore de compte et que vous souhaitez accéder à internet et aux services de l'association, créez votre espace personnel{% endblocktrans %}

-

{% blocktrans %}Inscription{% endblocktrans %}

+

{% trans "Registration" %}

+

{% trans "If you don't have an account yet and you want to access the Internet and the organisation's services, create your own personal account." %}

+

{% trans "Registration" %}

@@ -52,9 +52,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-

{% blocktrans %}Indentification{% endblocktrans %}

-

{% blocktrans %}Si avez déjà un compte, identifiez-vous. Vous pouvez gérer votre cotisation à l'association, vos machines, et l'ensemble de vos services{% endblocktrans %}

-

{% blocktrans %}Indentification{% endblocktrans %}

+

{% trans "Logging in" %}

+

{% trans "If you already have an account, log in. You can manage your subscription to the organisation, your machines and all your services." %}

+

{% trans "Logging in" %}

@@ -65,9 +65,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-

{% blocktrans %}Mon profil{% endblocktrans %}

-

{% blocktrans %}Pour gérer votre cotisation, vos machines et l'ensemble de vos services, accédez à votre profil{% endblocktrans %}

-

{% blocktrans %}Accéder à mon profil{% endblocktrans %}

+

{% trans "My profile" %}

+

{% trans "To manage your subscription, your machines and all your services, access your profile." %}

+

{% trans "Access my profile" %}

@@ -76,7 +76,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
-

{% blocktrans %}Les services de l'association{% endblocktrans %}

+

{% trans "Services of the organisation" %}

{% for service_list in services_urls %} diff --git a/users/forms.py b/users/forms.py index fb70ec8b..6af499bd 100644 --- a/users/forms.py +++ b/users/forms.py @@ -316,8 +316,8 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): self.fields['room'].label = _("Room") self.fields['room'].empty_label = _("No room") self.fields['school'].empty_label = _("Select a school") - self.fields['shell'].empty_label = _("Shell par défaut") - self.fields['gpg_fingerprint'].widget.attrs['placeholder'] = _("Laissez vide si vous ne disposez pas de clef GPG") + self.fields['shell'].empty_label = _("Default shell") + self.fields['gpg_fingerprint'].widget.attrs['placeholder'] = _("Leave empty if you don't have any GPG key.") def clean_email(self): if not OptionalUser.objects.first().local_email_domain in self.cleaned_data.get('email'): diff --git a/users/locale/fr/LC_MESSAGES/django.mo b/users/locale/fr/LC_MESSAGES/django.mo index ef4052cee9d92180376084d26911a13ad70e05f8..9391372760cb02dcc767caa08a1d0571089bd2f5 100644 GIT binary patch delta 7030 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 delta 6761 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 diff --git a/users/locale/fr/LC_MESSAGES/django.po b/users/locale/fr/LC_MESSAGES/django.po index 6c637db9..d1cb14c6 100644 --- a/users/locale/fr/LC_MESSAGES/django.po +++ b/users/locale/fr/LC_MESSAGES/django.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-18 13:36+0200\n" +"POT-Creation-Date: 2018-08-23 15:10+0200\n" "PO-Revision-Date: 2018-06-27 23:35+0200\n" "Last-Translator: Laouen Fernet \n" "Language-Team: \n" @@ -39,7 +39,7 @@ msgstr "Vous n'avez pas le droit de voir cette application." msgid "Current password" msgstr "Mot de passe actuel" -#: forms.py:75 forms.py:444 +#: forms.py:75 forms.py:446 msgid "New password" msgstr "Nouveau mot de passe" @@ -55,7 +55,7 @@ msgstr "Les nouveaux mots de passe ne correspondent pas." msgid "The current password is incorrect." msgstr "Le mot de passe actuel est incorrect." -#: forms.py:125 forms.py:178 models.py:1578 +#: forms.py:125 forms.py:178 models.py:1550 msgid "Password" msgstr "Mot de passe" @@ -83,8 +83,8 @@ msgstr "L'utilisateur est admin : %s" #: forms.py:284 templates/users/aff_clubs.html:38 #: templates/users/aff_listright.html:63 templates/users/aff_listright.html:168 -#: templates/users/aff_users.html:39 templates/users/profil.html:165 -#: templates/users/profil.html:279 templates/users/profil.html:298 +#: templates/users/aff_users.html:39 templates/users/profil.html:169 +#: templates/users/profil.html:283 templates/users/profil.html:302 msgid "Username" msgstr "Pseudo" @@ -94,111 +94,119 @@ msgstr "" "Impossible d'archiver des utilisateurs dont la date de fin de connexion est " "dans le futur." -#: forms.py:311 templates/users/profil.html:278 templates/users/profil.html:297 +#: forms.py:311 templates/users/profil.html:282 templates/users/profil.html:301 msgid "First name" msgstr "Prénom" #: forms.py:312 templates/users/aff_users.html:37 -#: templates/users/profil.html:161 templates/users/profil.html:277 -#: templates/users/profil.html:296 +#: templates/users/profil.html:165 templates/users/profil.html:281 +#: templates/users/profil.html:300 msgid "Surname" msgstr "Nom" -#: forms.py:313 models.py:1579 templates/users/aff_emailaddress.html:36 -#: templates/users/profil.html:167 +#: forms.py:313 models.py:1551 templates/users/aff_emailaddress.html:36 +#: templates/users/profil.html:171 msgid "Email address" msgstr "Adresse mail" -#: forms.py:314 forms.py:382 forms.py:513 templates/users/aff_schools.html:37 -#: templates/users/profil.html:177 +#: forms.py:314 forms.py:384 forms.py:515 templates/users/aff_schools.html:37 +#: templates/users/profil.html:181 msgid "School" msgstr "Établissement" -#: forms.py:315 forms.py:383 models.py:1232 -#: templates/users/aff_serviceusers.html:34 templates/users/profil.html:179 +#: forms.py:315 forms.py:385 models.py:1204 +#: templates/users/aff_serviceusers.html:34 templates/users/profil.html:183 msgid "Comment" msgstr "Commentaire" -#: forms.py:316 forms.py:384 templates/users/aff_clubs.html:40 -#: templates/users/aff_users.html:41 templates/users/profil.html:171 +#: forms.py:316 forms.py:386 templates/users/aff_clubs.html:40 +#: templates/users/aff_users.html:41 templates/users/profil.html:175 msgid "Room" msgstr "Chambre" -#: forms.py:317 forms.py:385 +#: forms.py:317 forms.py:387 msgid "No room" msgstr "Pas de chambre" -#: forms.py:318 forms.py:386 +#: forms.py:318 forms.py:388 msgid "Select a school" msgstr "Sélectionnez un établissement" -#: forms.py:325 forms.py:653 +#: forms.py:319 +msgid "Default shell" +msgstr "Interface système par défaut" + +#: forms.py:320 +msgid "Leave empty if you don't have any GPG key." +msgstr "Laissez vide si vous n'avez pas de clé GPG." + +#: forms.py:327 forms.py:655 msgid "You can't use a {} address." msgstr "Vous ne pouvez pas utiliser une adresse {}." -#: forms.py:350 forms.py:408 +#: forms.py:352 forms.py:410 msgid "A valid telephone number is required." msgstr "Un numéro de téléphone valide est requis." -#: forms.py:361 +#: forms.py:363 msgid "Force the move?" msgstr "Forcer le déménagement ?" -#: forms.py:381 templates/users/aff_clubs.html:36 +#: forms.py:383 templates/users/aff_clubs.html:36 #: templates/users/aff_serviceusers.html:32 msgid "Name" msgstr "Nom" -#: forms.py:387 +#: forms.py:389 msgid "Use a mailing list" msgstr "Utiliser une liste de diffusion" -#: forms.py:501 templates/users/aff_listright.html:38 +#: forms.py:503 templates/users/aff_listright.html:38 msgid "Superuser" msgstr "Superutilisateur" -#: forms.py:525 +#: forms.py:527 msgid "Shell name" msgstr "Nom de l'interface système" -#: forms.py:544 +#: forms.py:546 msgid "Name of the group of rights" msgstr "Nom du groupe de droits" -#: forms.py:555 +#: forms.py:557 msgid "GID. Warning: this field must not be edited after creation." msgstr "GID. Attention : ce champ ne doit pas être modifié après création." -#: forms.py:563 +#: forms.py:565 msgid "Current groups of rights" msgstr "Groupes de droits actuels" -#: forms.py:580 +#: forms.py:582 msgid "Current schools" msgstr "Établissements actuels" -#: forms.py:598 forms.py:612 templates/users/aff_bans.html:41 +#: forms.py:600 forms.py:614 templates/users/aff_bans.html:41 #: templates/users/aff_whitelists.html:41 msgid "End date" msgstr "Date de fin" -#: forms.py:626 models.py:1776 +#: forms.py:628 models.py:1748 msgid "Local part of the email address" msgstr "Partie locale de l'adresse mail" -#: forms.py:627 +#: forms.py:629 msgid "Can't contain @" msgstr "Ne peut pas contenir @" -#: forms.py:642 +#: forms.py:644 msgid "Main email address" msgstr "Adresse mail principale" -#: forms.py:644 +#: forms.py:646 msgid "Redirect local emails" msgstr "Rediriger les mails locaux" -#: forms.py:646 +#: forms.py:648 msgid "Use local emails" msgstr "Utiliser les mails locaux" @@ -215,7 +223,7 @@ msgstr "Les utilisateurs doivent avoir un pseudo." msgid "Username should only contain [a-z0-9-]." msgstr "Le pseudo devrait seulement contenir [a-z0-9-]" -#: models.py:199 models.py:1223 +#: models.py:199 models.py:1195 msgid "Must only contain letters, numerals or dashes." msgstr "Doit seulement contenir des lettres, chiffres ou tirets." @@ -237,33 +245,33 @@ msgstr "Activer le compte mail local" msgid "Comment, school year" msgstr "Commentaire, promotion" -#: models.py:255 models.py:1033 models.py:1106 +#: models.py:255 msgid "Can change the password of a user" msgstr "Peut changer le mot de passe d'un utilisateur" -#: models.py:256 models.py:1034 models.py:1107 +#: models.py:256 msgid "Can edit the state of a user" msgstr "Peut changer l'état d'un utilisateur" -#: models.py:257 models.py:1035 models.py:1108 +#: models.py:257 msgid "Can force the move" msgstr "Peut forcer le déménagement" -#: models.py:258 models.py:1036 models.py:1109 +#: models.py:258 msgid "Can edit the shell of a user" msgstr "Peut modifier l'interface système d'un utilisateur" -#: models.py:260 models.py:1038 models.py:1111 +#: models.py:260 msgid "Can edit the groups of rights of a user (critical permission)" msgstr "" "Peut modifier les groupes de droits d'un utilisateur (permission critique)" -#: models.py:263 models.py:1041 models.py:1114 +#: models.py:263 msgid "Can edit all users, including those with rights." msgstr "" "Peut modifier tous les utilisateurs, y compris ceux possédant des droits." -#: models.py:265 models.py:1043 models.py:1116 +#: models.py:265 msgid "Can view a user object" msgstr "Peut voir un objet utilisateur" @@ -357,7 +365,7 @@ msgstr "Vous n'avez pas le droit de voir ce club." msgid "You don't have the right to view another user." msgstr "Vous n'avez pas le droit de voir un autre utilisateur." -#: models.py:956 models.py:1155 +#: models.py:956 models.py:1127 msgid "You don't have the right to view the list of users." msgstr "Vous n'avez pas le droit de voir la liste des utilisateurs." @@ -385,174 +393,174 @@ msgstr "" msgid "A GPG fingerprint must contain 40 hexadecimal characters." msgstr "Une empreinte GPG doit contenir 40 caractères hexadécimaux." -#: models.py:1045 +#: models.py:1031 msgid "member" msgstr "adhérent" -#: models.py:1046 +#: models.py:1032 msgid "members" msgstr "adhérents" -#: models.py:1075 +#: models.py:1061 msgid "You don't have the right to create a user." msgstr "Vous n'avez pas le droit de créer un utilisateur." -#: models.py:1118 +#: models.py:1090 msgid "club" msgstr "club" -#: models.py:1119 +#: models.py:1091 msgid "clubs" msgstr "clubs" -#: models.py:1137 +#: models.py:1109 msgid "You don't have the right to create a club." msgstr "Vous n'avez pas le droit de créer un club." -#: models.py:1242 +#: models.py:1214 msgid "Can view a service user object" msgstr "Peut voir un objet utilisateur service" -#: models.py:1244 +#: models.py:1216 msgid "service user" msgstr "utilisateur service" -#: models.py:1245 +#: models.py:1217 msgid "service users" msgstr "utilisateurs service" -#: models.py:1249 +#: models.py:1221 #, python-brace-format msgid "Service user <{name}>" msgstr "Utilisateur service <{name}>" -#: models.py:1311 +#: models.py:1283 msgid "Can view a school object" msgstr "Peut voir un objet établissement" -#: models.py:1313 +#: models.py:1285 msgid "school" msgstr "établissement" -#: models.py:1314 +#: models.py:1286 msgid "schools" msgstr "établissements" -#: models.py:1332 +#: models.py:1304 msgid "UNIX groups can only contain lower case letters." msgstr "Les groupes UNIX peuvent seulement contenir des lettres minuscules." -#: models.py:1338 +#: models.py:1310 msgid "Description" msgstr "Description" -#: models.py:1345 +#: models.py:1317 msgid "Can view a group of rights object" msgstr "Peut voir un objet groupe de droits" -#: models.py:1347 +#: models.py:1319 msgid "group of rights" msgstr "groupe de droits" -#: models.py:1348 +#: models.py:1320 msgid "groups of rights" msgstr "groupes de droits" -#: models.py:1395 +#: models.py:1367 msgid "Can view a shell object" msgstr "Peut voir un objet interface système" -#: models.py:1397 +#: models.py:1369 msgid "shell" msgstr "interface système" -#: models.py:1398 +#: models.py:1370 msgid "shells" msgstr "interfaces système" -#: models.py:1417 +#: models.py:1389 msgid "HARD (no access)" msgstr "HARD (pas d'accès)" -#: models.py:1418 +#: models.py:1390 msgid "SOFT (local access only)" msgstr "SOFT (accès local uniquement)" -#: models.py:1419 +#: models.py:1391 msgid "RESTRICTED (speed limitation)" msgstr "RESTRICTED (limitation de vitesse)" -#: models.py:1430 +#: models.py:1402 msgid "Can view a ban object" msgstr "Peut voir un objet bannissement" -#: models.py:1432 +#: models.py:1404 msgid "ban" msgstr "bannissement" -#: models.py:1433 +#: models.py:1405 msgid "bans" msgstr "bannissements" -#: models.py:1467 +#: models.py:1439 msgid "You don't have the right to view bans other than yours." msgstr "" "Vous n'avez pas le droit de voir des bannissements autres que les vôtres." -#: models.py:1515 +#: models.py:1487 msgid "Can view a whitelist object" msgstr "Peut voir un objet accès gracieux" -#: models.py:1517 +#: models.py:1489 msgid "whitelist (free of charge access)" msgstr "Accès gracieux" -#: models.py:1518 +#: models.py:1490 msgid "whitelists (free of charge access)" msgstr "Accès gracieux" -#: models.py:1534 +#: models.py:1506 msgid "You don't have the right to view whitelists other than yours." msgstr "" "Vous n'avez pas le droit de voir des accès gracieux autres que les vôtres." -#: models.py:1771 +#: models.py:1743 msgid "User of the local email account" msgstr "Utilisateur du compte mail local" -#: models.py:1781 +#: models.py:1753 msgid "Can view a local email account object" msgstr "Peut voir un objet compte mail local" -#: models.py:1783 +#: models.py:1755 msgid "local email account" msgstr "compte mail local" -#: models.py:1784 +#: models.py:1756 msgid "local email accounts" msgstr "comptes mail locaux" -#: models.py:1808 models.py:1831 models.py:1853 models.py:1875 +#: models.py:1780 models.py:1803 models.py:1825 models.py:1847 msgid "The local email accounts are not enabled." msgstr "Les comptes mail locaux ne sont pas activés." -#: models.py:1810 +#: models.py:1782 msgid "You don't have the right to add a local email account to another user." msgstr "" "Vous n'avez pas le droit d'ajouter un compte mail local à un autre " "utilisateur." -#: models.py:1813 +#: models.py:1785 msgid "You reached the limit of {} local email accounts." msgstr "Vous avez atteint la limite de {] comptes mail locaux." -#: models.py:1834 models.py:1878 +#: models.py:1806 models.py:1850 msgid "You don't have the right to edit another user's local email account." msgstr "" "Vous n'avez pas le droit de modifier le compte mail local d'un autre " "utilisateur." -#: models.py:1848 +#: models.py:1820 msgid "" "You can't delete a local email account whose local part is the same as the " "username." @@ -560,13 +568,13 @@ msgstr "" "Vous ne pouvez pas supprimer un compte mail local dont la partie locale est " "la même que le pseudo." -#: models.py:1856 +#: models.py:1828 msgid "You don't have the right to delete another user's local email account" msgstr "" "Vous n'avez pas le droit de supprimer le compte mail local d'un autre " "utilisateur." -#: models.py:1870 +#: models.py:1842 msgid "" "You can't edit a local email account whose local part is the same as the " "username." @@ -574,7 +582,7 @@ msgstr "" "Vous ne pouvez pas modifier un compte mail local dont la partie locale est " "la même que le pseudo." -#: models.py:1884 +#: models.py:1856 msgid "The local part must not contain @." msgstr "La partie locale ne doit pas contenir @." @@ -595,7 +603,7 @@ msgid "End of subscription on" msgstr "Fin de cotisation le" #: templates/users/aff_clubs.html:43 templates/users/aff_users.html:44 -#: templates/users/profil.html:218 +#: templates/users/profil.html:222 msgid "Internet access" msgstr "Accès Internet" @@ -605,17 +613,17 @@ msgid "Profile" msgstr "Profil" #: templates/users/aff_clubs.html:53 templates/users/aff_users.html:54 -#: templates/users/profil.html:193 +#: templates/users/profil.html:197 msgid "Not a member" msgstr "Non adhérent" #: templates/users/aff_clubs.html:55 templates/users/aff_users.html:57 -#: templates/users/profil.html:210 +#: templates/users/profil.html:214 msgid "Active" msgstr "Actif" #: templates/users/aff_clubs.html:57 templates/users/aff_users.html:59 -#: templates/users/profil.html:212 templates/users/profil.html:222 +#: templates/users/profil.html:216 templates/users/profil.html:226 msgid "Disabled" msgstr "Désactivé" @@ -682,11 +690,11 @@ msgstr "Utilisateurs dans %(right_name)s" msgid "Role" msgstr "Rôle" -#: templates/users/aff_shell.html:32 templates/users/profil.html:248 +#: templates/users/aff_shell.html:32 templates/users/profil.html:252 msgid "Shell" msgstr "Interface système" -#: templates/users/aff_users.html:35 templates/users/profil.html:158 +#: templates/users/aff_users.html:35 templates/users/profil.html:162 msgid "Firt name" msgstr "Prénom" @@ -718,7 +726,7 @@ msgstr "Confirmer" msgid "Users" msgstr "Utilisateurs" -#: templates/users/index_ban.html:32 templates/users/profil.html:373 +#: templates/users/index_ban.html:32 templates/users/profil.html:377 #: templates/users/sidebar.html:58 msgid "Bans" msgstr "Bannissements" @@ -789,7 +797,7 @@ msgstr "Liste des interaces système" msgid " Add a shell" msgstr " Ajouter une interface système" -#: templates/users/index_whitelist.html:32 templates/users/profil.html:398 +#: templates/users/index_whitelist.html:32 templates/users/profil.html:402 #: templates/users/sidebar.html:64 msgid "Whitelists" msgstr "Accès gracieux" @@ -841,196 +849,196 @@ msgstr "" "Demandez à quelqu'un ayant les droits appropriés de payer une connexion." #: templates/users/profil.html:67 -msgid "Connection" -msgstr "Connexion" - -#: templates/users/profil.html:69 #, python-format -msgid "End of connection: %(end_connection)s" -msgstr "Fin de connexion : %(end_connection)s" +msgid "Connection (until %(end_connection)s )" +msgstr "Connexion (jusqu'au %(end_connection)s)" -#: templates/users/profil.html:82 +#: templates/users/profil.html:71 +msgid "Extend the connection period" +msgstr "Étendre la durée de connexion" + +#: templates/users/profil.html:86 msgid "Refill the balance" msgstr "Recharger le solde" -#: templates/users/profil.html:92 +#: templates/users/profil.html:96 msgid " Machines" msgstr " Machines" -#: templates/users/profil.html:96 templates/users/profil.html:105 +#: templates/users/profil.html:100 templates/users/profil.html:109 msgid " Add a machine" msgstr " Ajouter une machine" -#: templates/users/profil.html:102 templates/users/profil.html:333 +#: templates/users/profil.html:106 templates/users/profil.html:337 msgid "No machine" msgstr "Pas de machine" -#: templates/users/profil.html:118 +#: templates/users/profil.html:122 msgid " Detailed information" msgstr " Informations détaillées" -#: templates/users/profil.html:125 +#: templates/users/profil.html:129 msgid "Edit" msgstr "Modifier" -#: templates/users/profil.html:129 views.py:282 views.py:1079 +#: templates/users/profil.html:133 views.py:282 views.py:1079 msgid "Change the password" msgstr "Changer le mot de passe" -#: templates/users/profil.html:134 +#: templates/users/profil.html:138 msgid "Change the state" msgstr "Changer l'état" -#: templates/users/profil.html:140 views.py:260 +#: templates/users/profil.html:144 views.py:260 msgid "Edit the groups" msgstr "Modifier les groupes" -#: templates/users/profil.html:151 +#: templates/users/profil.html:155 msgid "Mailing" msgstr "Envoi de mails" -#: templates/users/profil.html:155 +#: templates/users/profil.html:159 msgid "Mailing disabled" msgstr "Envoi de mails désactivé" -#: templates/users/profil.html:173 +#: templates/users/profil.html:177 msgid "Telephone number" msgstr "Numéro de téléphone" -#: templates/users/profil.html:183 +#: templates/users/profil.html:187 msgid "Registration date" msgstr "Date d'inscription" -#: templates/users/profil.html:185 +#: templates/users/profil.html:189 msgid "Last login" msgstr "Dernière connexion" -#: templates/users/profil.html:189 +#: templates/users/profil.html:193 msgid "End of membership" msgstr "Fin d'adhésion" -#: templates/users/profil.html:195 +#: templates/users/profil.html:199 msgid "Whitelist" msgstr "Accès gracieux" -#: templates/users/profil.html:199 templates/users/profil.html:228 +#: templates/users/profil.html:203 templates/users/profil.html:232 msgid "None" msgstr "Aucun" -#: templates/users/profil.html:202 +#: templates/users/profil.html:206 msgid "Ban" msgstr "Bannissement" -#: templates/users/profil.html:206 +#: templates/users/profil.html:210 msgid "Not banned" msgstr "Non banni" -#: templates/users/profil.html:208 +#: templates/users/profil.html:212 msgid "State" msgstr "État" -#: templates/users/profil.html:214 +#: templates/users/profil.html:218 msgid "Archived" msgstr "Archivé" -#: templates/users/profil.html:220 +#: templates/users/profil.html:224 #, python-format msgid "Active (until %(end_access)s)" msgstr "Actif (jusqu'au %(end_access)s)" -#: templates/users/profil.html:224 templates/users/sidebar.html:82 +#: templates/users/profil.html:228 templates/users/sidebar.html:82 msgid "Groups of rights" msgstr "Groupes de droits" -#: templates/users/profil.html:232 +#: templates/users/profil.html:236 msgid "Balance" msgstr "Solde" -#: templates/users/profil.html:237 +#: templates/users/profil.html:241 msgid "Refill" msgstr "Rechager" -#: templates/users/profil.html:242 +#: templates/users/profil.html:246 msgid "GPG fingerprint" msgstr "Empreinte GPG" -#: templates/users/profil.html:261 +#: templates/users/profil.html:265 msgid " Manage the club" msgstr " Gérer le club" -#: templates/users/profil.html:268 +#: templates/users/profil.html:272 msgid "Manage the admins and members" msgstr "Gérer les admins et les membres" -#: templates/users/profil.html:272 +#: templates/users/profil.html:276 msgid "Club admins" msgstr "Admins du clubs" -#: templates/users/profil.html:291 +#: templates/users/profil.html:295 msgid "Members" msgstr "Adhérents" -#: templates/users/profil.html:318 +#: templates/users/profil.html:322 msgid "Machines" msgstr "Machines" -#: templates/users/profil.html:326 +#: templates/users/profil.html:330 msgid "Add a machine" msgstr "Ajouter une machine" -#: templates/users/profil.html:342 +#: templates/users/profil.html:346 msgid "Subscriptions" msgstr "Cotisations" -#: templates/users/profil.html:350 +#: templates/users/profil.html:354 msgid "Add as subscription" msgstr "Ajouter une cotisation" -#: templates/users/profil.html:355 +#: templates/users/profil.html:359 msgid "Edit the balance" msgstr "Modifier le solde" -#: templates/users/profil.html:364 +#: templates/users/profil.html:368 msgid "No invoice" msgstr "Pas de facture" -#: templates/users/profil.html:381 views.py:384 +#: templates/users/profil.html:385 views.py:384 msgid "Add a ban" msgstr "Ajouter un bannissement" -#: templates/users/profil.html:389 +#: templates/users/profil.html:393 msgid "No ban" msgstr "Pas de bannissement" -#: templates/users/profil.html:406 +#: templates/users/profil.html:410 msgid "Grant a whitelist" msgstr "Donner un accès gracieux" -#: templates/users/profil.html:414 +#: templates/users/profil.html:418 msgid "No whitelist" msgstr "Pas d'accès gracieux" -#: templates/users/profil.html:422 +#: templates/users/profil.html:426 msgid " Email settings" msgstr " Paramètres mail" -#: templates/users/profil.html:429 +#: templates/users/profil.html:433 msgid " Edit email settings" msgstr " Modifier les paramètres mail" -#: templates/users/profil.html:438 templates/users/profil.html:464 +#: templates/users/profil.html:442 templates/users/profil.html:468 msgid "Contact email address" msgstr "Adresse mail de contact" -#: templates/users/profil.html:442 +#: templates/users/profil.html:446 msgid "Enable the local email account" msgstr "Activer le compte mail local" -#: templates/users/profil.html:444 +#: templates/users/profil.html:448 msgid "Enable the local email redirection" msgstr "Activer la redirection mail locale" -#: templates/users/profil.html:448 +#: templates/users/profil.html:452 msgid "" "The contact email address is the email address where we send emails to " "contact you. If you would like to use your external email address for that, " @@ -1042,7 +1050,7 @@ msgstr "" "cela, vous pouvez soit désactiver votre adresse mail locale soit activer la " "redirection des mails locaux." -#: templates/users/profil.html:453 +#: templates/users/profil.html:457 msgid " Add an email address" msgstr " Ajouter une adresse mail" diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html index 09d499d0..85db2a5f 100644 --- a/users/templates/users/profil.html +++ b/users/templates/users/profil.html @@ -64,11 +64,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% else %}
-
{% trans "Connection" %}{% blocktrans with end_connection=user.end_access|date:"SHORT_DATE_FORMAT" %} ( Until {{ end_connection }} ){% endblocktrans %}
+
{% blocktrans with end_connection=user.end_access|date:"SHORT_DATE_FORMAT" %}Connection (until {{ end_connection }} ){% endblocktrans %}
{% can_create Facture %} - {% trans "Extend my connection period" %} + {% trans "Extend the connection period" %} {% acl_end %}
From d574194ed75540d8002787438e693450e0bdd50e Mon Sep 17 00:00:00 2001 From: Laouen Fernet Date: Thu, 23 Aug 2018 15:38:36 +0200 Subject: [PATCH 7/7] fix bug with shell field for self registration --- users/forms.py | 3 +- users/locale/fr/LC_MESSAGES/django.mo | Bin 25505 -> 25505 bytes users/locale/fr/LC_MESSAGES/django.po | 56 +++++++++++++------------- 3 files changed, 30 insertions(+), 29 deletions(-) diff --git a/users/forms.py b/users/forms.py index 6af499bd..a3dcee57 100644 --- a/users/forms.py +++ b/users/forms.py @@ -316,8 +316,9 @@ class AdherentForm(FormRevMixin, FieldPermissionFormMixin, ModelForm): self.fields['room'].label = _("Room") self.fields['room'].empty_label = _("No room") self.fields['school'].empty_label = _("Select a school") - self.fields['shell'].empty_label = _("Default shell") self.fields['gpg_fingerprint'].widget.attrs['placeholder'] = _("Leave empty if you don't have any GPG key.") + if 'shell' in self.fields: + self.fields['shell'].empty_label = _("Default shell") def clean_email(self): if not OptionalUser.objects.first().local_email_domain in self.cleaned_data.get('email'): diff --git a/users/locale/fr/LC_MESSAGES/django.mo b/users/locale/fr/LC_MESSAGES/django.mo index 9391372760cb02dcc767caa08a1d0571089bd2f5..059a73fcf5ef3e75001f0cd01be085abfedcdafa 100644 GIT binary patch delta 17 YcmZ2@oN?iC#tjWtOvYxLo2=wD0YW7PUjP6A delta 17 YcmZ2@oN?iC#tjWtOoj%Vo2=wD0YUQyR{#J2 diff --git a/users/locale/fr/LC_MESSAGES/django.po b/users/locale/fr/LC_MESSAGES/django.po index d1cb14c6..d3ff0f4f 100644 --- a/users/locale/fr/LC_MESSAGES/django.po +++ b/users/locale/fr/LC_MESSAGES/django.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-23 15:10+0200\n" +"POT-Creation-Date: 2018-08-23 15:36+0200\n" "PO-Revision-Date: 2018-06-27 23:35+0200\n" "Last-Translator: Laouen Fernet \n" "Language-Team: \n" @@ -39,7 +39,7 @@ msgstr "Vous n'avez pas le droit de voir cette application." msgid "Current password" msgstr "Mot de passe actuel" -#: forms.py:75 forms.py:446 +#: forms.py:75 forms.py:447 msgid "New password" msgstr "Nouveau mot de passe" @@ -109,104 +109,104 @@ msgstr "Nom" msgid "Email address" msgstr "Adresse mail" -#: forms.py:314 forms.py:384 forms.py:515 templates/users/aff_schools.html:37 +#: forms.py:314 forms.py:385 forms.py:516 templates/users/aff_schools.html:37 #: templates/users/profil.html:181 msgid "School" msgstr "Établissement" -#: forms.py:315 forms.py:385 models.py:1204 +#: forms.py:315 forms.py:386 models.py:1204 #: templates/users/aff_serviceusers.html:34 templates/users/profil.html:183 msgid "Comment" msgstr "Commentaire" -#: forms.py:316 forms.py:386 templates/users/aff_clubs.html:40 +#: forms.py:316 forms.py:387 templates/users/aff_clubs.html:40 #: templates/users/aff_users.html:41 templates/users/profil.html:175 msgid "Room" msgstr "Chambre" -#: forms.py:317 forms.py:387 +#: forms.py:317 forms.py:388 msgid "No room" msgstr "Pas de chambre" -#: forms.py:318 forms.py:388 +#: forms.py:318 forms.py:389 msgid "Select a school" msgstr "Sélectionnez un établissement" #: forms.py:319 -msgid "Default shell" -msgstr "Interface système par défaut" - -#: forms.py:320 msgid "Leave empty if you don't have any GPG key." msgstr "Laissez vide si vous n'avez pas de clé GPG." -#: forms.py:327 forms.py:655 +#: forms.py:321 +msgid "Default shell" +msgstr "Interface système par défaut" + +#: forms.py:328 forms.py:656 msgid "You can't use a {} address." msgstr "Vous ne pouvez pas utiliser une adresse {}." -#: forms.py:352 forms.py:410 +#: forms.py:353 forms.py:411 msgid "A valid telephone number is required." msgstr "Un numéro de téléphone valide est requis." -#: forms.py:363 +#: forms.py:364 msgid "Force the move?" msgstr "Forcer le déménagement ?" -#: forms.py:383 templates/users/aff_clubs.html:36 +#: forms.py:384 templates/users/aff_clubs.html:36 #: templates/users/aff_serviceusers.html:32 msgid "Name" msgstr "Nom" -#: forms.py:389 +#: forms.py:390 msgid "Use a mailing list" msgstr "Utiliser une liste de diffusion" -#: forms.py:503 templates/users/aff_listright.html:38 +#: forms.py:504 templates/users/aff_listright.html:38 msgid "Superuser" msgstr "Superutilisateur" -#: forms.py:527 +#: forms.py:528 msgid "Shell name" msgstr "Nom de l'interface système" -#: forms.py:546 +#: forms.py:547 msgid "Name of the group of rights" msgstr "Nom du groupe de droits" -#: forms.py:557 +#: forms.py:558 msgid "GID. Warning: this field must not be edited after creation." msgstr "GID. Attention : ce champ ne doit pas être modifié après création." -#: forms.py:565 +#: forms.py:566 msgid "Current groups of rights" msgstr "Groupes de droits actuels" -#: forms.py:582 +#: forms.py:583 msgid "Current schools" msgstr "Établissements actuels" -#: forms.py:600 forms.py:614 templates/users/aff_bans.html:41 +#: forms.py:601 forms.py:615 templates/users/aff_bans.html:41 #: templates/users/aff_whitelists.html:41 msgid "End date" msgstr "Date de fin" -#: forms.py:628 models.py:1748 +#: forms.py:629 models.py:1748 msgid "Local part of the email address" msgstr "Partie locale de l'adresse mail" -#: forms.py:629 +#: forms.py:630 msgid "Can't contain @" msgstr "Ne peut pas contenir @" -#: forms.py:644 +#: forms.py:645 msgid "Main email address" msgstr "Adresse mail principale" -#: forms.py:646 +#: forms.py:647 msgid "Redirect local emails" msgstr "Rediriger les mails locaux" -#: forms.py:648 +#: forms.py:649 msgid "Use local emails" msgstr "Utiliser les mails locaux"