diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-04-24 11:12:54 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-04-24 11:12:54 +0100 |
| commit | a5975915975f5f2b815ec1a20e3bcfaf78831add (patch) | |
| tree | d09d671e79ae1d3e31cd9234ce835df33c2bd5ea /app/models/user.rb | |
| parent | a244afcb7b7185905a7a16b37ae585e239e963ea (diff) | |
| parent | d3aae5cc48c92473e06b2104bb9431305d5a92f0 (diff) | |
Merge branch 'release/0.9' into wdtk
Diffstat (limited to 'app/models/user.rb')
| -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 e6c666e47..612ac7fa2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -98,12 +98,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 |