mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from vayan/feature/change-wording-in-mailer-view 

Update default devise wording to include reference to Mastodon
pull/6/head
Eugen 2016-10-06 09:59:00 +02:00 committed by GitHub
parent 9712d8ffb3 038a407b9e
commit 3298c7e1c8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/auth/mailer/confirmation_instructions.html.erb
View File

@ -1,5 +1,5 @@
<p>Welcome <%= @resource.email %>!</p> <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> <p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %></p>

2
app/views/auth/mailer/password_change.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 has been changed.</p> <p>We're contacting you to notify you that your password on Mastodon has been changed.</p>

2
app/views/auth/mailer/reset_password_instructions.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. 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> <p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %></p>

8
config/locales/devise.en.yml
View File

@ -18,13 +18,13 @@ en:
unconfirmed: "You have to confirm your email address before continuing." unconfirmed: "You have to confirm your email address before continuing."
mailer: mailer:
confirmation_instructions: confirmation_instructions:
subject: "Confirmation instructions" subject: "Mastodon: Confirmation instructions"
reset_password_instructions: reset_password_instructions:
subject: "Reset password instructions" subject: "Mastodon: Reset password instructions"
unlock_instructions: unlock_instructions:
subject: "Unlock instructions" subject: "Mastodon: Unlock instructions"
password_change: password_change:
subject: "Password Changed" subject: "Mastodon: Password Changed"
omniauth_callbacks: omniauth_callbacks:
failure: "Could not authenticate you from %{kind} because \"%{reason}\"." failure: "Could not authenticate you from %{kind} because \"%{reason}\"."
success: "Successfully authenticated from %{kind} account." success: "Successfully authenticated from %{kind} account."