diff --git a/app/services/user_locale_setter.rb b/app/services/user_locale_setter.rb index 3e0e5fdde4..6c97e268e2 100644 --- a/app/services/user_locale_setter.rb +++ b/app/services/user_locale_setter.rb @@ -21,7 +21,7 @@ class UserLocaleSetter end def self.valid_locale_for_user(user) - if user.present? && user.locale.present? && available_locale?(user.locale) + if user.andand.locale.present? && available_locale?(user.locale) user.locale else I18n.default_locale