Fix rails mailer preview not honouring locale (#28418)

11 months ago · 7cfc078198
parent 476d1237d4
commit 7cfc078198
2 changed files with 2 additions and 2 deletions
--- a/app/mailers/application_mailer.rb
+++ b/app/mailers/application_mailer.rb
@ -12,7 +12,7 @@ class ApplicationMailer < ActionMailer::Base
  protected

  def locale_for_account(account, &block)
-    I18n.with_locale(account.user_locale || I18n.default_locale, &block)
+    I18n.with_locale(account.user_locale || I18n.locale || I18n.default_locale, &block)
  end

  def set_autoreply_headers!
--- a/app/mailers/user_mailer.rb
+++ b/app/mailers/user_mailer.rb
@ -202,6 +202,6 @@ class UserMailer < Devise::Mailer
  end

  def locale
-    @resource.locale.presence || I18n.default_locale
+    @resource.locale.presence || I18n.locale || I18n.default_locale
  end
 end