Skip to content

Commit

Permalink
Fixed bug when adding a new user:
Browse files Browse the repository at this point in the history
- Language returns the default locale if preferences is nil.
- Language setter retries mergin hashes setting `self.preferences = { }`.
  • Loading branch information
Francesc Esplugas committed Feb 19, 2010
1 parent c80ea53 commit 34d3504
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions lib/typus/user.rb
Expand Up @@ -106,11 +106,16 @@ def is_root?


def language def language
preferences[:locale] preferences[:locale]
rescue
I18n.default_locale.to_s
end end


def language=(locale) def language=(locale)
options = { :locale => locale } options = { :locale => locale }
self.preferences.merge!(options) self.preferences.merge!(options)
rescue
self.preferences = { }
retry
end end


protected protected
Expand Down

0 comments on commit 34d3504

Please sign in to comment.