From dd6eff97d6edf58700ee803686891dc91a60cc6d Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Thu, 15 Sep 2022 16:30:07 +0200
Subject: [PATCH] close #513

---
 app/views/admin/layouts/application.html.erb | 3 ++-
 config/locales/en.yml                        | 5 +++++
 config/locales/fr.yml                        | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/layouts/application.html.erb b/app/views/admin/layouts/application.html.erb
index 425183182..f83b83682 100644
--- a/app/views/admin/layouts/application.html.erb
+++ b/app/views/admin/layouts/application.html.erb
@@ -36,7 +36,8 @@
             <% unless current_user.confirmed? %>
               <div class="alert alert-warning">
                 <div class="alert-message">
-                  <%= t('admin.users_alerts.pending_confirmation', duration: distance_of_time_in_words(Rails.configuration.devise.allow_unconfirmed_access_for)) %>
+                  <%= t('admin.users_alerts.pending_confirmation_html', duration: distance_of_time_in_words(Rails.configuration.devise.allow_unconfirmed_access_for)) %>
+                  <br>
                   <%= link_to t('devise.confirmations.new.resend_confirmation_instructions'), resend_user_confirmation_path, method: :post, class: 'alert-link' %>
                 </div>
               </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7f6a99253..1045278c1 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -106,7 +106,9 @@ en:
     successfully_removed_html: "<i>%{model}</i> was successfully removed."
     successfully_updated_html: "<i>%{model}</i> was successfully updated."
     users_alerts:
+      already_confirmed: "Your account has already been confirmed."
       not_locked_html: '<i>%{model}</i> was not locked.'
+      pending_confirmation_html: "Your account has not been <b>confirmed</b> yet.<br>You have received an e-mail with a confirmation link. If you don't confirm, your account will stop working after <b>%{duration}</b>."
       successfully_unlocked_html: "<i>%{model}</i> was successfully unlocked."
     will_be_published_html: "<i>%{model}</i> will soon be published."
   batch_selectable:
@@ -131,6 +133,9 @@ en:
         text_html: "Your two-factor authentication code for %{university} is: <br><br><b>%{code}</b><br><br>It will expire in %{duration}."
     omniauth_callbacks:
       failure: "Failed to sign in."
+    passwords:
+      new:
+        send_me_reset_password_instructions: Reset my password
     sessions:
       signed_in: ''
     shared:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index dd33b0f80..9343c22f7 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -108,8 +108,8 @@ fr:
     users_alerts:
       already_confirmed: "Votre compte est déjà confirmé."
       not_locked_html: "<i>%{model}</i> n'était pas verrouillé(e)."
+      pending_confirmation_html: "Votre compte n'a pas encore été <b>confirmé</b>.<br>Vous avez reçu un e-mail contenant un lien de confirmation. En l'absence de confirmation, votre compte cessera de fonctionner après <b>%{duration}</b>."
       successfully_unlocked_html: "<i>%{model}</i> a bien été déverrouillé(e)."
-      pending_confirmation: "Vous avez reçu un e-mail pour confirmer votre compte. Celui-ci est utilisable pendant %{duration}."
     will_be_published_html: "<i>%{model}</i> va bientôt être publié(e)."
   batch_selectable:
     title: Modifier la sélection
-- 
GitLab