mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-21 20:15:10 +01:00
i18n for devise mailer too
This commit is contained in:
parent
2c766bd4b4
commit
116ab27e08
@ -1,6 +1,6 @@
|
|||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class ApplicationMailer < ActionMailer::Base
|
class ApplicationMailer < ActionMailer::Base
|
||||||
default from: (ENV['SMTP_FROM_ADDRESS'] || 'notifications@localhost')
|
default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
|
||||||
layout 'mailer'
|
layout 'mailer'
|
||||||
end
|
end
|
||||||
|
32
app/mailers/user_mailer.rb
Normal file
32
app/mailers/user_mailer.rb
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
# frozen_string_literal: true
|
||||||
|
|
||||||
|
class UserMailer < Devise::Mailer
|
||||||
|
default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
|
||||||
|
layout 'mailer'
|
||||||
|
|
||||||
|
def confirmation_instructions(user, token)
|
||||||
|
@resource = user
|
||||||
|
@token = token
|
||||||
|
|
||||||
|
I18n.with_locale(@resource.locale || I18n.default_locale) do
|
||||||
|
mail to: @resource.email
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def reset_password_instructions(user, token)
|
||||||
|
@resource = user
|
||||||
|
@token = token
|
||||||
|
|
||||||
|
I18n.with_locale(@resource.locale || I18n.default_locale) do
|
||||||
|
mail to: @resource.email
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def password_change(user)
|
||||||
|
@resource = user
|
||||||
|
|
||||||
|
I18n.with_locale(@resource.locale || I18n.default_locale) do
|
||||||
|
mail to: @resource.email
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
@ -12,10 +12,10 @@ Devise.setup do |config|
|
|||||||
# Configure the e-mail address which will be shown in Devise::Mailer,
|
# Configure the e-mail address which will be shown in Devise::Mailer,
|
||||||
# note that it will be overwritten if you use your own mailer class
|
# note that it will be overwritten if you use your own mailer class
|
||||||
# with default "from" parameter.
|
# with default "from" parameter.
|
||||||
config.mailer_sender = ENV['SMTP_FROM_ADDRESS'] || 'notifications@localhost'
|
# config.mailer_sender = ENV['SMTP_FROM_ADDRESS'] || 'notifications@localhost'
|
||||||
|
|
||||||
# Configure the class responsible to send e-mails.
|
# Configure the class responsible to send e-mails.
|
||||||
# config.mailer = 'Devise::Mailer'
|
config.mailer = 'UserMailer'
|
||||||
|
|
||||||
# ==> ORM configuration
|
# ==> ORM configuration
|
||||||
# Load and configure the ORM. Supports :active_record (default) and
|
# Load and configure the ORM. Supports :active_record (default) and
|
||||||
@ -102,7 +102,7 @@ Devise.setup do |config|
|
|||||||
# config.pepper = '104d16705f794923e77c5e5167b52452d00646dc952a2d30b541c24086e647012c7b9625f253c51912e455981e503446772973d5f1638631196c819d7137fad4'
|
# config.pepper = '104d16705f794923e77c5e5167b52452d00646dc952a2d30b541c24086e647012c7b9625f253c51912e455981e503446772973d5f1638631196c819d7137fad4'
|
||||||
|
|
||||||
# Send a notification email when the user's password is changed
|
# Send a notification email when the user's password is changed
|
||||||
# config.send_password_change_notification = false
|
config.send_password_change_notification = true
|
||||||
|
|
||||||
# ==> Configuration for :confirmable
|
# ==> Configuration for :confirmable
|
||||||
# A period that the user is allowed to access the website even without
|
# A period that the user is allowed to access the website even without
|
||||||
|
Loading…
Reference in New Issue
Block a user