Home Explore Help
Sign In
RISCI_ATOM
/
mastodon
mirror of https://github.com/tootsuite/mastodon.git
1
0
Fork 0
Files Issues 8 Wiki
Browse Source

Fix rails mailer preview not honouring locale (#28418)

Matt Jankowski 5 months ago
parent
476d1237d4
commit
7cfc078198
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      app/mailers/application_mailer.rb
  2. 1 1
      app/mailers/user_mailer.rb

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

+ 1 - 1
app/mailers/user_mailer.rb
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