1 files changed, 1 insertions, 6 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index 490587c39..bc04b5449 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -90,12 +90,7 @@ class User < ActiveRecord::Base
     end
 
     def get_locale
-        if !self.locale.nil?
-            locale = self.locale
-        else
-            locale = I18n.locale
-        end
-        return locale.to_s
+        (self.locale || I18n.locale).to_s
     end
 
     def visible_comments