From 038a407b9e0eed53d58f04de2fbae21439d4b18b Mon Sep 17 00:00:00 2001
From: Yann Vaillant <yann@vaillant.im>
Date: Thu, 6 Oct 2016 07:45:07 +0200
Subject: [PATCH] Update default devise wording to include reference to
 Mastodon

Fix #68
---
 app/views/auth/mailer/confirmation_instructions.html.erb  | 2 +-
 app/views/auth/mailer/password_change.html.erb            | 2 +-
 .../auth/mailer/reset_password_instructions.html.erb      | 2 +-
 config/locales/devise.en.yml                              | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/views/auth/mailer/confirmation_instructions.html.erb b/app/views/auth/mailer/confirmation_instructions.html.erb
index ef17b288..69e9ff80 100644
--- a/app/views/auth/mailer/confirmation_instructions.html.erb
+++ b/app/views/auth/mailer/confirmation_instructions.html.erb
@@ -1,5 +1,5 @@
 <p>Welcome <%= @resource.email %>!</p>
 
-<p>You can confirm your account email through the link below:</p>
+<p>You can confirm your Mastodon account email through the link below:</p>
 
 <p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>
diff --git a/app/views/auth/mailer/password_change.html.erb b/app/views/auth/mailer/password_change.html.erb
index b41daf47..a1bc7746 100644
--- a/app/views/auth/mailer/password_change.html.erb
+++ b/app/views/auth/mailer/password_change.html.erb
@@ -1,3 +1,3 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>We're contacting you to notify you that your password has been changed.</p>
+<p>We're contacting you to notify you that your password on Mastodon has been changed.</p>
diff --git a/app/views/auth/mailer/reset_password_instructions.html.erb b/app/views/auth/mailer/reset_password_instructions.html.erb
index f667dc12..643b4331 100644
--- a/app/views/auth/mailer/reset_password_instructions.html.erb
+++ b/app/views/auth/mailer/reset_password_instructions.html.erb
@@ -1,6 +1,6 @@
 <p>Hello <%= @resource.email %>!</p>
 
-<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+<p>Someone has requested a link to change your password on Mastodon. 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/config/locales/devise.en.yml b/config/locales/devise.en.yml
index bd4c3ebc..22c0fa91 100644
--- a/config/locales/devise.en.yml
+++ b/config/locales/devise.en.yml
@@ -18,13 +18,13 @@ en:
       unconfirmed: "You have to confirm your email address before continuing."
     mailer:
       confirmation_instructions:
-        subject: "Confirmation instructions"
+        subject: "Mastodon: Confirmation instructions"
       reset_password_instructions:
-        subject: "Reset password instructions"
+        subject: "Mastodon: Reset password instructions"
       unlock_instructions:
-        subject: "Unlock instructions"
+        subject: "Mastodon: Unlock instructions"
       password_change:
-        subject: "Password Changed"
+        subject: "Mastodon: Password Changed"
     omniauth_callbacks:
       failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
       success: "Successfully authenticated from %{kind} account."