Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
AO3-4301 I18n the password reset email (#2116)
* Reset password email * .html_safe is needed * Tidy subject up * Fix typo * Short locale keys and a bit of a test
- Loading branch information
Showing
5 changed files
with
16 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,7 @@ | ||
<% content_for :message do %> | ||
<%= style_bold(@user.login) %>, the following generated password has been created for you: <%= style_bold(@password) %> | ||
<p><%= t('.part1', user: style_bold(@user.login), password: style_bold(@password)).html_safe %></p> | ||
|
||
<p> | ||
After you log in using this generated password you will be asked to change your password to something you can remember. If you do not use this generated password within a week, it will expire, and you will have to request a new one. | ||
</p> | ||
<p><%= t '.part2' %></p> | ||
|
||
<p> | ||
If you did not request this password reset, you may ignore this email and your previous password will continue to work. | ||
</p> | ||
<p><%= t '.part3' %></p> | ||
<% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,8 @@ | ||
<% content_for :message do %> | ||
<%= @user.login %>, the following generated password has been created for you: <%= @password %> | ||
<%= t '.part1', user: @user.login, password: @password %> | ||
After you log in using this generated password you will be asked to change your password to something you can remember. If you do not use this generated password within a week, it will expire, and you will have to request a new one. | ||
<%= t '.part2' %> | ||
<%= t '.part3' %> | ||
If you did not request this password reset, you may ignore this email and your previous password will continue to work. | ||
<% end %> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters