gearheads
/
mastodon
Archived
2
0
Fork 0
Code Releases 4 Activity

Fix confirmation email being sent to old address when changing it

gh/stable
Eugen Rochko 2016-12-23 00:43:03 +01:00
parent de9b6e3a6a
commit b191afcb5b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/components/locales/en.jsx
View File

@ -22,6 +22,7 @@ const en = {
"account.follows": "Follows", "account.follows": "Follows",
"account.followers": "Followers", "account.followers": "Followers",
"account.follows_you": "Follows you", "account.follows_you": "Follows you",
"account.requested": "Awaiting approval",
"getting_started.heading": "Getting started", "getting_started.heading": "Getting started",
"getting_started.about_addressing": "You can follow people if you know their username and the domain they are on by entering an e-mail-esque address into the search form.", "getting_started.about_addressing": "You can follow people if you know their username and the domain they are on by entering an e-mail-esque address into the search form.",
"getting_started.about_shortcuts": "If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.", "getting_started.about_shortcuts": "If the target user is on the same domain as you, just the username will work. The same rule applies to mentioning people in statuses.",

2
app/mailers/user_mailer.rb
View File

@ -9,7 +9,7 @@ class UserMailer < Devise::Mailer
@token = token @token = token
I18n.with_locale(@resource.locale || I18n.default_locale) do I18n.with_locale(@resource.locale || I18n.default_locale) do
mail to: @resource.email mail to: @resource.unconfirmed_email.blank? ? @resource.email : @resource.unconfirmed_email
end end
end end