From b8b76e64cadd7796bc0f0be6ebfe47d75cdc56f3 Mon Sep 17 00:00:00 2001 From: Luc Donnet Date: Wed, 4 Feb 2015 10:41:46 +0100 Subject: Use devise secret key now for token (invitation, confirmation...) --- app/views/devise/mailer/confirmation_instructions.fr.html.erb | 2 +- app/views/devise/mailer/confirmation_instructions.html.erb | 2 +- app/views/devise/mailer/reset_password_instructions.fr.html.erb | 2 +- app/views/devise/mailer/reset_password_instructions.html.erb | 2 +- app/views/devise/mailer/unlock_instructions.html.erb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'app/views/devise') diff --git a/app/views/devise/mailer/confirmation_instructions.fr.html.erb b/app/views/devise/mailer/confirmation_instructions.fr.html.erb index 035ee5af5..a719299ff 100644 --- a/app/views/devise/mailer/confirmation_instructions.fr.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.fr.html.erb @@ -2,5 +2,5 @@

Vous pouvez confirmer votre compte email en cliquant sur le lien suivant:

-

<%= link_to 'Confirmer mon compte', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

+

<%= link_to 'Confirmer mon compte', confirmation_url(@resource, :confirmation_token => @token) %>

diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index a5c4585e8..99fd7b743 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -2,4 +2,4 @@

You can confirm your account email through the link below:

-

<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %>

+

<%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %>

diff --git a/app/views/devise/mailer/reset_password_instructions.fr.html.erb b/app/views/devise/mailer/reset_password_instructions.fr.html.erb index a69d10ae5..7074a4c70 100644 --- a/app/views/devise/mailer/reset_password_instructions.fr.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.fr.html.erb @@ -2,7 +2,7 @@

Une demande de changement de mot de passe a été reçue, vous pouvez modifier votre mot de passe en suivant le lien ci-dessous.

-

<%= link_to 'Modifier mon mot de passe', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>

+

<%= link_to 'Modifier mon mot de passe', edit_password_url(@resource, :reset_password_token => @token) %>

Si vous ne souhaitez pas modifier votre mot de passe, ignorez ce message.

Votre mot de passe est conservé jusqu'à ce que vous suiviez le lien ci-dessus et que vous définissiez un nouveau mot de passe.

diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb index ae9e888ab..8489e53d8 100644 --- a/app/views/devise/mailer/reset_password_instructions.html.erb +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -2,7 +2,7 @@

Someone has requested a link to change your password, and you can do this through the link below.

-

<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %>

+

<%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %>

If you didn't request this, please ignore this email.

Your password won't change until you access the link above and create a new one.

diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb index 2263c2195..06ecbe409 100644 --- a/app/views/devise/mailer/unlock_instructions.html.erb +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -4,4 +4,4 @@

Click the link below to unlock your account:

-

<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @resource.unlock_token) %>

+

<%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %>

-- cgit v1.2.3