diff --git a/logs/locale/fr/LC_MESSAGES/django.po b/logs/locale/fr/LC_MESSAGES/django.po
index f04f6bef..92dbb89b 100644
--- a/logs/locale/fr/LC_MESSAGES/django.po
+++ b/logs/locale/fr/LC_MESSAGES/django.po
@@ -244,6 +244,10 @@ msgid "Not yet active users"
msgstr "Utilisateurs pas encore actifs"
#: logs/views.py:264
+msgid "Waiting for email confirmation users"
+msgstr "Utilisateurs en attente de confirmation d'email"
+
+#: logs/views.py:273
msgid "Contributing members"
msgstr "Adhérents cotisants"
diff --git a/logs/views.py b/logs/views.py
index 99ecf37b..615fb69b 100644
--- a/logs/views.py
+++ b/logs/views.py
@@ -261,7 +261,7 @@ def stats_general(request):
Club.objects.filter(state=Club.STATE_NOT_YET_ACTIVE).count(),
],
"email_not_confirmed_users": [
- _("Email not yet confirmed users"),
+ _("Waiting for email confirmation users"),
User.objects.filter(state=User.STATE_EMAIL_NOT_YET_CONFIRMED).count(),
(
Adherent.objects.filter(
diff --git a/preferences/forms.py b/preferences/forms.py
index 2591b73b..b296c0d4 100644
--- a/preferences/forms.py
+++ b/preferences/forms.py
@@ -66,6 +66,7 @@ class EditOptionalUserForm(ModelForm):
self.fields["gpg_fingerprint"].label = _("GPG fingerprint")
self.fields["all_can_create_club"].label = _("All can create a club")
self.fields["all_can_create_adherent"].label = _("All can create a member")
+ self.fields["disable_emailnotyetconfirmed"].label = _("Delay before disabling accounts without a verified email")
self.fields["self_adhesion"].label = _("Self registration")
self.fields["shell_default"].label = _("Default shell")
self.fields["allow_set_password_during_user_creation"].label = _("Allow directly setting a password during account creation")
diff --git a/preferences/locale/fr/LC_MESSAGES/django.po b/preferences/locale/fr/LC_MESSAGES/django.po
index deb77b22..e7ac2e66 100644
--- a/preferences/locale/fr/LC_MESSAGES/django.po
+++ b/preferences/locale/fr/LC_MESSAGES/django.po
@@ -286,6 +286,14 @@ msgstr ""
"jours."
#: preferences/models.py:111
+msgid ""
+"Users with an email address not yet confirmed will be disabled after"
+" this number of days."
+msgstr ""
+"Les utilisateurs n'ayant pas confirmé leur addresse mail seront"
+" désactivés après ce nombre de jours"
+
+#: preferences/models.py:114
msgid "A new user can create their account on Re2o."
msgstr "Un nouvel utilisateur peut créer son compte sur Re2o."
@@ -1066,14 +1074,19 @@ msgstr "%(delete_notyetactive)s jours"
msgid "All users are active by default"
msgstr "Tous les utilisateurs sont actifs par défault"
-msgid "Allow directly entering a password during account creation"
-msgstr "Permettre le choix d'un mot de passe directement lors de la création du compte"
-
#: preferences/templates/preferences/display_preferences.html:130
msgid "Allow archived users to log in"
msgstr "Autoriser les utilisateurs archivés à se connecter"
#: preferences/templates/preferences/display_preferences.html:133
+msgid "Allow directly entering a password during account creation"
+msgstr "Permettre le choix d'un mot de passe directement lors de la création du compte"
+
+#: preferences/templates/preferences/display_preferences.html:136
+msgid "Delay before disabling accounts without a verified email"
+msgstr "Délai avant la désactivation des comptes sans adresse mail confirmé"
+
+#: preferences/templates/preferences/display_preferences.html:136
msgid "Users general permissions"
msgstr "Permissions générales des utilisateurs"
diff --git a/preferences/templates/preferences/display_preferences.html b/preferences/templates/preferences/display_preferences.html
index 6d7c656a..8eb75918 100644
--- a/preferences/templates/preferences/display_preferences.html
+++ b/preferences/templates/preferences/display_preferences.html
@@ -131,7 +131,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% trans "Allow directly entering a password during account creation" %} |
{{ useroptions.allow_set_password_during_user_creation|tick }} |
- {% trans "Disable email not yet confirmed users after" %} |
+ {% trans "Delay before disabling accounts without a verified email" %} |
{% blocktrans with disable_emailnotyetconfirmed=useroptions.disable_emailnotyetconfirmed %}{{ disable_emailnotyetconfirmed }} days{% endblocktrans %} |
diff --git a/search/locale/fr/LC_MESSAGES/django.po b/search/locale/fr/LC_MESSAGES/django.po
index ca0507ae..6da1a477 100644
--- a/search/locale/fr/LC_MESSAGES/django.po
+++ b/search/locale/fr/LC_MESSAGES/django.po
@@ -50,6 +50,10 @@ msgstr "Pas encore adhéré"
msgid "Fully archived"
msgstr "Complètement archivés"
+#: search/forms.py:38
+msgid "Waiting for email confirmation"
+msgstr "En attente de confirmation d'email"
+
#: search/forms.py:41
msgid "Users"
msgstr "Utilisateurs"
diff --git a/users/forms.py b/users/forms.py
index 24657fc2..da833203 100644
--- a/users/forms.py
+++ b/users/forms.py
@@ -409,6 +409,9 @@ class AdherentCreationForm(AdherentForm):
" your initial password by email. If you do not have"
" any means of accessing your emails, you can disable"
" this option to set your password immediatly."
+ " You will still receive an email to confirm your address."
+ " Failure to confirm your address will result in an"
+ " automatic suspension of your account until you do."
)
init_password_by_mail = forms.BooleanField(
diff --git a/users/locale/fr/LC_MESSAGES/django.po b/users/locale/fr/LC_MESSAGES/django.po
index 4d8794b6..1d6ec63b 100644
--- a/users/locale/fr/LC_MESSAGES/django.po
+++ b/users/locale/fr/LC_MESSAGES/django.po
@@ -163,11 +163,17 @@ msgid ""
" your initial password by email. If you do not have"
" any means of accessing your emails, you can disable"
" this option to set your password immediatly."
+" You will still receive an email to confirm your address."
+" Failure to confirm your address will result in an"
+" automatic suspension of your account until you do."
msgstr ""
"Si cette option est activée, vous recevrez un lien pour choisir"
" votre mot de passe par email. Si vous n'avez pas accès"
" à vos mails, vous pouvez désactiver cette option"
" pour immédiatement entrer votre mot de passe."
+" Vous recevrez tous de même un email de confirmation."
+" Si vous ne confirmez pas votre adresse dans les délais"
+" impartis, votre connexion sera automatiquement suspendue."
#: users/forms.py:442
msgid "Send password reset link by email."
@@ -961,6 +967,21 @@ msgstr ""
"débrancher et rebrancher votre câble Ethernet pour bénéficier d'une "
"connexion filaire."
+#: users/templates/users/confirm_email.html:35
+#, python-format
+msgid "Confirmation email"
+msgstr "Email de confirmation"
+
+#: users/templates/users/confirm_email.html:36
+#, python-format
+msgid "Confirm the email"
+msgstr "Confirmer l'email"
+
+#: users/templates/users/confirm_email.html:36
+#, python-format
+msgid "for %(name)s."
+msgstr "pour %(name)s."
+
#: users/templates/users/profil.html:36
#, python-format
msgid "Welcome %(name)s %(surname)s"
@@ -971,6 +992,25 @@ msgstr "Bienvenue %(name)s %(surname)s"
msgid "Profile of %(name)s %(surname)s"
msgstr "Profil de %(name)s %(surname)s"
+#: users/templates/users/profil.html:43
+#, python-format
+msgid ""
+"Please confirm your email address before %(confirm_before_date)s,"
+" or your account will be suspended."
+msgstr ""
+"Veuillez confirmer votre adresse mail avant le %(confirm_before_date)s,"
+" sous peine de suspension de votre compte."
+
+#: users/templates/users/profil.html:48
+#, python-format
+msgid "Didn't receive the email?"
+msgstr "Vous n'avez pas reçu le mail ?"
+
+#: users/templates/users/profil.html:53
+#, python-format
+msgid "Your account has been suspended."
+msgstr "Votre compte a été suspendu."
+
#: users/templates/users/profil.html:46
msgid "Your account has been banned."
msgstr "Votre compte a été banni."
@@ -1054,6 +1094,10 @@ msgstr "Envoi de mails désactivé"
msgid "Connected"
msgstr "Connecté"
+#: users/templates/users/profil.html:201
+msgid "Pending confirmation..."
+msgstr "En attente de confirmation..."
+
#: users/templates/users/profil.html:193
msgid "Pending connection..."
msgstr "Connexion en attente..."
@@ -1203,6 +1247,16 @@ msgstr ""
msgid "Add an email address"
msgstr "Ajouter une adresse mail"
+#: users/templates/users/resend_confirmation_email.html:35
+#, python-format
+msgid "Re-send confirmation email?"
+msgstr "Renvoyer l'email de confirmation ?"
+
+#: users/templates/users/resend_confirmation_email.html:36
+#, python-format
+msgid "The confirmation email will be sent to"
+msgstr "L'email de confirmation sera envoyé à"
+
#: users/templates/users/sidebar.html:33
msgid "Create a club or organisation"
msgstr "Créer un club ou une association"
@@ -1264,10 +1318,11 @@ msgstr "Adresse MAC %(mac)s"
#: users/views.py:131
#, python-format
-msgid "The user %s was created."
-msgstr "L'utilisateur %s a été créé."
+msgid "The user %s was created, a confirmation email was sent."
+msgstr ""
+"L'utilisateur %s a été créé, un mail de confirmation a été envoyé."
-#: users/views.py:127
+#: users/views.py:130
#, python-format
msgid "The user %s was created, an email to set the password was sent."
msgstr ""
@@ -1296,6 +1351,10 @@ msgstr "Le club a été modifié."
msgid "The user was edited."
msgstr "L'utilisateur a été modifié."
+#: users/views.py:229
+msgid "Sent a new confirmation email."
+msgstr "Un nouveau mail de confirmation a été envoyé."
+
#: users/views.py:225
msgid "The state was edited."
msgstr "L'état a été modifié."
@@ -1477,6 +1536,14 @@ msgstr ""
"Enregistrement réussi ! Veuillez débrancher et rebrancher votre câble "
"Ethernet pour avoir accès à Internet."
+#: users/views.py:1044
+msgid "The %s address was confirmed."
+msgstr "L'adresse mail %s a été confirmée."
+
+#: users/views.py:1068
+msgid "An email to confirm your address was sent."
+msgstr "Un mail pour confirmer votre adresse a été envoyé."
+
#: users/views.py:1072 users/views.py:1096 users/views.py:1111
msgid "The mailing list doesn't exist."
msgstr "La liste de diffusion n'existe pas."
diff --git a/users/templates/users/profil.html b/users/templates/users/profil.html
index 1e52d61a..1b1db462 100644
--- a/users/templates/users/profil.html
+++ b/users/templates/users/profil.html
@@ -50,7 +50,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% elif users.state == users.STATE_DISABLED %}
- {% blocktrans %}Your account has been disabled{% endblocktrans %}
+ {% blocktrans %}Your account has been suspended.{% endblocktrans %}
{% endif %}
diff --git a/users/views.py b/users/views.py
index 19d7d97f..36ddefbd 100644
--- a/users/views.py
+++ b/users/views.py
@@ -129,7 +129,7 @@ def new_user(request):
user.confirm_email_address_mail(request)
messages.success(
request,
- _("The user %s was created.")
+ _("The user %s was created, a confirmation email was sent.")
% user.pseudo,
)
else:
@@ -226,7 +226,7 @@ def edit_info(request, user, userid):
if user_form.should_send_confirmation_email:
user.confirm_email_address_mail(request)
- messages.success(request, _("Sent a new confirmation email"))
+ messages.success(request, _("Sent a new confirmation email."))
return redirect(reverse("users:profil", kwargs={"userid": str(userid)}))
return form(