Skip to content
Snippets Groups Projects
Commit d97bbdab authored by Arnaud Levy's avatar Arnaud Levy
Browse files

Fix #1103

parent 07189039
No related branches found
No related tags found
No related merge requests found
......@@ -3,15 +3,7 @@
<%= render "admin/layouts/themes/pure/hero" %>
<%= render 'application/notice' %>
<main class="container-fluid">
<% unless current_user.confirmed? %>
<div class="alert alert-warning">
<div class="alert-message">
<%= 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>
<% end %>
<%= render "admin/layouts/themes/pure/user_unconfirmed" %>
<div class="position-relative">
<%= yield %>
</div>
......
<% unless current_user.confirmed? %>
<div class="row">
<div class="col-xl-6">
<div class="alert alert-warning mb-4">
<div class="alert-message">
<%= 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>
</div>
</div>
<% end %>
......@@ -130,7 +130,7 @@ en:
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>."
pending_confirmation_html: "Your account has not been <b>confirmed</b> yet. 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:
......
......@@ -130,7 +130,7 @@ 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>."
pending_confirmation_html: "Votre compte n'a pas encore été <b>confirmé</b>. 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)."
will_be_published_html: "<i>%{model}</i> va bientôt être publié(e)."
batch_selectable:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment