From dab0add4923cfef0fa89a37c5b100279503d301b Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Fri, 3 Jul 2020 14:20:51 +0200
Subject: [PATCH] Make conditional more concise

---
 app/services/user_locale_setter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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