cybrespace/mastodon
4
3
Fork 3
Code Issues 7 Pull requests Releases Activity

Use instance name in email notifications instead of "Mastodon" (#3763)

Browse source 
* Use instance name in "password changed" mail

instead of "Mastodon".

Fixes tootsuite#2620.

* Use instance name in password reset mail

instead of "Mastodon".
This commit is contained in:
Midgard 2017-06-27 14:22:36 +02:00 • committed by Eugen Rochko
parent da9317fa56
commit 16d0aed403
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/user_mailer/password_change.en.html.erb
View file

@ -1,3 +1,3 @@
<p>Hello <%= @resource.email %>!</p> <p>Hello <%= @resource.email %>!</p>
<p>We're contacting you to notify you that your password on Mastodon has been changed.</p> <p>We're contacting you to notify you that your password on <%= @instance %> has been changed.</p>

2
app/views/user_mailer/password_change.en.text.erb
View file

@ -1,3 +1,3 @@
Hello <%= @resource.email %>! Hello <%= @resource.email %>!
We're contacting you to notify you that your password on Mastodon has been changed. We're contacting you to notify you that your password on <%= @instance %> has been changed.

2
app/views/user_mailer/reset_password_instructions.en.html.erb
View file

@ -1,6 +1,6 @@
<p>Hello <%= @resource.email %>!</p> <p>Hello <%= @resource.email %>!</p>
<p>Someone has requested a link to change your password on Mastodon. You can do this through the link below.</p> <p>Someone has requested a link to change your password on <%= @instance %>. You can do this through the link below.</p>
<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p> <p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>

2
app/views/user_mailer/reset_password_instructions.en.text.erb
View file

@ -1,6 +1,6 @@
Hello <%= @resource.email %>! Hello <%= @resource.email %>!
Someone has requested a link to change your password on Mastodon. You can do this through the link below. Someone has requested a link to change your password on <%= @instance %>. You can do this through the link below.
<%= edit_password_url(@resource, reset_password_token: @token) %> <%= edit_password_url(@resource, reset_password_token: @token) %>