mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix rails mailer preview not honouring locale (#28418)

pull/2537/head^2
Matt Jankowski 2023-12-18 16:49:17 -05:00 committed by GitHub
parent 476d1237d4
commit 7cfc078198
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/application_mailer.rb
View File

@ -12,7 +12,7 @@ class ApplicationMailer < ActionMailer::Base
protected protected
def locale_for_account(account, &block) 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 end
def set_autoreply_headers! def set_autoreply_headers!

2
app/mailers/user_mailer.rb
View File

@ -202,6 +202,6 @@ class UserMailer < Devise::Mailer
end end
def locale def locale
@resource.locale.presence || I18n.default_locale @resource.locale.presence || I18n.locale || I18n.default_locale
end end
end end