diff options
| author | Robin Houston <robin@lenny.robin> | 2011-09-08 00:56:59 +0100 |
|---|---|---|
| committer | Robin Houston <robin@lenny.robin> | 2011-09-08 00:56:59 +0100 |
| commit | 6e0e5e5bed89ff2093e1cca3fa50310f678565fd (patch) | |
| tree | ae9a198a8134e90ab2a140d699ed6f3248f467cc /app/models/user.rb | |
| parent | e286a5a91e449ef01b5ce5f23654d1316bffaf53 (diff) | |
| parent | a9002cc8e749df6f5961acab8e3e61fd21987fc1 (diff) | |
Merge branch 'develop' of git@github.com:sebbacon/alaveteli into develop
Conflicts:
app/models/request_mailer.rb
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index fddb6b035..c3c3da6f7 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -96,6 +96,15 @@ class User < ActiveRecord::Base end end end + + def get_locale + if !self.locale.nil? + locale = self.locale + else + locale = I18n.locale + end + return locale.to_s + end def visible_comments self.comments.find(:all, :conditions => 'visible') |