diff options
| -rw-r--r-- | app/models/user.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 6e1e21481..773e6db9d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -96,12 +96,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 |