From 16d0aed403485e5a98afd9cbf7e35bb929443731 Mon Sep 17 00:00:00 2001 From: Midgard <M1dgard@users.noreply.github.com> Date: Tue, 27 Jun 2017 14:22:36 +0200 Subject: [PATCH] Use instance name in email notifications instead of "Mastodon" (#3763) * Use instance name in "password changed" mail instead of "Mastodon". Fixes tootsuite#2620. * Use instance name in password reset mail instead of "Mastodon". --- app/views/user_mailer/password_change.en.html.erb | 2 +- app/views/user_mailer/password_change.en.text.erb | 2 +- app/views/user_mailer/reset_password_instructions.en.html.erb | 2 +- app/views/user_mailer/reset_password_instructions.en.text.erb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/user_mailer/password_change.en.html.erb b/app/views/user_mailer/password_change.en.html.erb index a1bc77463f..414e05a298 100644 --- a/app/views/user_mailer/password_change.en.html.erb +++ b/app/views/user_mailer/password_change.en.html.erb @@ -1,3 +1,3 @@ <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> diff --git a/app/views/user_mailer/password_change.en.text.erb b/app/views/user_mailer/password_change.en.text.erb index 27581e6043..3ae461c97a 100644 --- a/app/views/user_mailer/password_change.en.text.erb +++ b/app/views/user_mailer/password_change.en.text.erb @@ -1,3 +1,3 @@ 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. diff --git a/app/views/user_mailer/reset_password_instructions.en.html.erb b/app/views/user_mailer/reset_password_instructions.en.html.erb index 643b43319c..cfb129e224 100644 --- a/app/views/user_mailer/reset_password_instructions.en.html.erb +++ b/app/views/user_mailer/reset_password_instructions.en.html.erb @@ -1,6 +1,6 @@ <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> diff --git a/app/views/user_mailer/reset_password_instructions.en.text.erb b/app/views/user_mailer/reset_password_instructions.en.text.erb index fe73b0165c..7ed22dc2cd 100644 --- a/app/views/user_mailer/reset_password_instructions.en.text.erb +++ b/app/views/user_mailer/reset_password_instructions.en.text.erb @@ -1,6 +1,6 @@ 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) %> -- GitLab