Merge branch 'release/0.9'0.9

Conflicts:
    locale/cs/app.po
    locale/he_IL/app.po
    locale/id/app.po
    locale/it/app.po
    locale/ro_RO/app.po
    locale/uk/app.po

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