From ff512bf834bae9dd3af9d0ef24070d210536e124 Mon Sep 17 00:00:00 2001
From: Go MAEDA <maeda@farend.jp>
Date: Tue, 24 Apr 2018 15:02:13 +0000
Subject: [PATCH] Add note about link validity to password lost email (#28561).

Patch by Gregor Schmidt.


git-svn-id: http://svn.redmine.org/redmine/trunk@17307 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 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 +
 config/locales/ja.yml                   | 1 +
 5 files changed, 7 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 @@
 <p><%= l(:mail_body_lost_password) %><br />
 <%= link_to @url, @url %></p>
 
+<p><%= l(:mail_body_lost_password_validity) %></p>
+
 <p><%= l(:field_login) %>: <b><%= @token.user.login %></b></p>
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 7d4a4582d..843433e8c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -837,6 +837,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 618ff3f2a..1c61c76ea 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."
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 4accf1da4..bde4a6d58 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -221,6 +221,7 @@ ja:
 
   mail_subject_lost_password: "%{value} パスワード再発行"
   mail_body_lost_password: 'パスワードを変更するには、以下のリンクをクリックしてください:'
+  mail_body_lost_password_validity: 'このリンクでパスワードを再設定できるのは1回だけです。ご注意ください。'
   mail_subject_register: "%{value} アカウント登録の確認"
   mail_body_register: 'アカウント登録を完了するには、以下のアドレスをクリックしてください:'
   mail_body_account_information_external: "%{value} アカウントを使ってにログインできます。"
-- 
2.39.5