users: Let locale attribute return the tornado locale

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 7c98d4bfcdb7c61d08128e11bf9b7c04ba97ca29..728d6d4d5c2cd72311e30b84e9ef80ee070a56c9 100644 (file)
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -412,10 +412,13 @@ class User(base.DataObject):
        def is_tester(self):
                return self.state == "tester"
 
+       def get_locale(self):
+               return tornado.locale.get(self.data.locale)
+
        def set_locale(self, locale):
                self._set_attribute("locale", locale)
 
-       locale = property(lambda s: s.data.locale, set_locale)
+       locale = property(get_locale, set_locale)
 
        def get_timezone(self, tz=None):
                if tz is None:
@@ -554,7 +557,7 @@ class UserEmail(base.DataObject):
                logging.debug("Sending email address activation mail to %s" % self.email)
 
                # Get the saved locale from the user.
-               _ = tornado.locale.get(self.user.locale).translate
+               _ = self.user.locale.translate
 
                subject = _("Email address Activation")
 

diff --git a/src/web/base.py b/src/web/base.py
index 3ff7fa4b054fe200e1d9cbe986d24a9f359a5a38..8a4b46e24c72a27c7cc6a910943305285c393e1d 100644 (file)
--- a/src/web/base.py
+++ b/src/web/base.py
@@ -34,13 +34,11 @@ class BaseHandler(tornado.web.RequestHandler):
                        return self.session.impersonated_user or self.session.user
 
        def get_user_locale(self):
-               # Get the locale from the user settings.
-               if self.current_user and self.current_user.locale:
-                       locale = tornado.locale.get(self.current_user.locale)
-                       if locale:
-                               return locale
+               # Get the locale from the user settings
+               if self.current_user:
+                       return self.current_user.locale
 
-               # If no locale was provided, we take what ever the browser requested.
+               # If no locale was provided, we take what ever the browser requested
                return self.get_browser_locale()
 
        @property