Browse Source

i18n for devise mailer too

closed-social-glitch-2
Eugen Rochko 7 years ago
parent
commit
116ab27e08
9 changed files with 36 additions and 4 deletions
  1. +1
    -1
      app/mailers/application_mailer.rb
  2. +32
    -0
      app/mailers/user_mailer.rb
  3. +0
    -0
      app/views/user_mailer/confirmation_instructions.en.html.erb
  4. +0
    -0
      app/views/user_mailer/confirmation_instructions.en.text.erb
  5. +0
    -0
      app/views/user_mailer/password_change.en.html.erb
  6. +0
    -0
      app/views/user_mailer/password_change.en.text.erb
  7. +0
    -0
      app/views/user_mailer/reset_password_instructions.en.html.erb
  8. +0
    -0
      app/views/user_mailer/reset_password_instructions.en.text.erb
  9. +3
    -3
      config/initializers/devise.rb

+ 1
- 1
app/mailers/application_mailer.rb View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
class ApplicationMailer < ActionMailer::Base
default from: (ENV['SMTP_FROM_ADDRESS'] || 'notifications@localhost')
default from: ENV.fetch('SMTP_FROM_ADDRESS') { 'notifications@localhost' }
layout 'mailer'
end

+ 32
- 0
app/mailers/user_mailer.rb View 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

app/views/auth/mailer/confirmation_instructions.en.html.erb → app/views/user_mailer/confirmation_instructions.en.html.erb View File


app/views/auth/mailer/confirmation_instructions.en.text.erb → app/views/user_mailer/confirmation_instructions.en.text.erb View File


app/views/auth/mailer/password_change.en.html.erb → app/views/user_mailer/password_change.en.html.erb View File


app/views/auth/mailer/password_change.en.text.erb → app/views/user_mailer/password_change.en.text.erb View File


app/views/auth/mailer/reset_password_instructions.en.html.erb → app/views/user_mailer/reset_password_instructions.en.html.erb View File


app/views/auth/mailer/reset_password_instructions.en.text.erb → app/views/user_mailer/reset_password_instructions.en.text.erb View File


+ 3
- 3
config/initializers/devise.rb View File

@ -12,10 +12,10 @@ Devise.setup do |config|
# 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
# 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.
# config.mailer = 'Devise::Mailer'
config.mailer = 'UserMailer'
# ==> ORM configuration
# Load and configure the ORM. Supports :active_record (default) and
@ -102,7 +102,7 @@ Devise.setup do |config|
# config.pepper = '104d16705f794923e77c5e5167b52452d00646dc952a2d30b541c24086e647012c7b9625f253c51912e455981e503446772973d5f1638631196c819d7137fad4'
# 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
# A period that the user is allowed to access the website even without

Loading…
Cancel
Save