Delegate Account#user_locale method and allow nil (#2927)

diff --git a/app/lib/language_detector.rb b/app/lib/language_detector.rb
index 8c1751beb8019f0f373e3fb544000dc1e809072f..ca5cb2591c8e595aa45c95e43f2dd3d5d3ef66c9 100644 (file)
--- a/app/lib/language_detector.rb
+++ b/app/lib/language_detector.rb
@@ -35,6 +35,6 @@ class LanguageDetector
   end
 
   def default_locale
-    account&.user&.locale || I18n.default_locale
+    account&.user_locale || I18n.default_locale
   end
 end

diff --git a/app/mailers/notification_mailer.rb b/app/mailers/notification_mailer.rb
index f308c403bfb28672fbaca2dd278e3d4e73b98294..a944db137fe64e0f25199738a322b20dc4e4aaa5 100644 (file)
--- a/app/mailers/notification_mailer.rb
+++ b/app/mailers/notification_mailer.rb
@@ -71,7 +71,7 @@ class NotificationMailer < ApplicationMailer
   private
 
   def locale_for_account(account)
-    I18n.with_locale(account.user.locale || I18n.default_locale) do
+    I18n.with_locale(account.user_locale || I18n.default_locale) do
       yield
     end
   end

diff --git a/app/models/account.rb b/app/models/account.rb
index a28dc967fca69e6ce6425d1fcb008ff42f61a8df..c2dc77d932b0775abb1d92cab64bdcd527edc46c 100644 (file)
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -111,6 +111,7 @@ class Account < ApplicationRecord
            :current_sign_in_ip,
            :current_sign_in_at,
            :confirmed?,
+           :locale,
            to: :user,
            prefix: true,
            allow_nil: true

diff --git a/spec/lib/language_detector_spec.rb b/spec/lib/language_detector_spec.rb
index bd4e65ef8e2e665eed8a19c273d5e2d701f2d97e..18ab5aee666cef551ad1b23ce4ef6827a9cf4844 100644 (file)
--- a/spec/lib/language_detector_spec.rb
+++ b/spec/lib/language_detector_spec.rb
@@ -43,16 +43,14 @@ describe LanguageDetector do
 
       describe 'with an account' do
         it 'uses the account locale when present' do
-          user    = double(:user, locale: 'fr')
-          account = double(:account, user: user)
+          account = double(user_locale: 'fr')
           result  = described_class.new('', account).to_iso_s
 
           expect(result).to eq :fr
         end
 
         it 'uses default locale when account is present but has no locale' do
-          user    = double(:user, locale: nil)
-          account = double(:accunt, user: user)
+          account = double(user_locale: nil)
           result  = described_class.new('', account).to_iso_s
 
           expect(result).to eq :en