mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-09 17:15:18 +00:00
Fix rails mailer preview not honouring locale (#28418)
This commit is contained in:
parent
476d1237d4
commit
7cfc078198
|
@ -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!
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue