From a5ce1c628860697225dc532fac818ece263ced72 Mon Sep 17 00:00:00 2001 From: Gregor Schmidt Date: Mon, 16 Apr 2018 11:25:40 +0200 Subject: [PATCH] Add note about validity of password-lost link --- app/views/mailer/lost_password.html.erb | 2 ++ app/views/mailer/lost_password.text.erb | 2 ++ config/locales/de.yml | 1 + config/locales/en.yml | 1 + 4 files changed, 6 insertions(+) diff --git a/app/views/mailer/lost_password.html.erb b/app/views/mailer/lost_password.html.erb index 9294bcfae..5ec7d0974 100644 --- a/app/views/mailer/lost_password.html.erb +++ b/app/views/mailer/lost_password.html.erb @@ -1,4 +1,6 @@

<%= l(:mail_body_lost_password) %>
<%= link_to @url, @url %>

+

<%= l(:mail_body_lost_password_validity) %>

+

<%= l(:field_login) %>: <%= @token.user.login %>

diff --git a/app/views/mailer/lost_password.text.erb b/app/views/mailer/lost_password.text.erb index f5000ed7e..005ae62f5 100644 --- a/app/views/mailer/lost_password.text.erb +++ b/app/views/mailer/lost_password.text.erb @@ -1,4 +1,6 @@ <%= l(:mail_body_lost_password) %> <%= @url %> +<%= l(:mail_body_lost_password_validity) %> + <%= l(:field_login) %>: <%= @token.user.login %> diff --git a/config/locales/de.yml b/config/locales/de.yml index 62def24c4..8de32ca60 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -836,6 +836,7 @@ de: mail_body_account_information: Ihre Konto-Informationen mail_body_account_information_external: "Sie können sich mit Ihrem Konto %{value} anmelden." mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Passwort zu ändern:' + mail_body_lost_password_validity: 'Bitte beachten Sie, dass mit Hilfe dieses Links das Passwort nur einmalig geändert werden kann.' mail_body_register: 'Um Ihr Konto zu aktivieren, benutzen Sie folgenden Link:' mail_body_reminder: "%{count} Tickets, die Ihnen zugewiesen sind, müssen in den nächsten %{days} Tagen abgegeben werden:" mail_body_wiki_content_added: "Die Wiki-Seite '%{id}' wurde von %{author} hinzugefügt." diff --git a/config/locales/en.yml b/config/locales/en.yml index d9095432b..c88726804 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -225,6 +225,7 @@ en: mail_subject_lost_password: "Your %{value} password" mail_body_lost_password: 'To change your password, click on the following link:' + mail_body_lost_password_validity: 'Please be aware that you may change the password only once using this link.' mail_subject_register: "Your %{value} account activation" mail_body_register: 'To activate your account, click on the following link:' mail_body_account_information_external: "You can use your %{value} account to log in." -- 2.14.1