tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rails mailer preview not honouring locale (#28418)

Browse Source
This commit is contained in:
Matt Jankowski authored and GitHub committed 2023-12-18 21:49:17 +00:00
1 parent 476d1237d4
commit 7cfc078198
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/mailers/application_mailer.rb
+1 -1
View File
@@ -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!
app/mailers/user_mailer.rb
+1 -1
View File
@@ -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