users: Let locale attribute return the tornado locale

[pbs.git] / src / web / base.py

diff --git a/src/web/base.py b/src/web/base.py
index 5422c065770d41e96c131f99541d0cfd7c274c84..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
@@ -77,7 +75,6 @@ class BaseHandler(tornado.web.RequestHandler):
 
                ns.update({
                        "backend"         : self.backend,
-                       "bugtracker"      : self.backend.bugzilla,
                        "hostname"        : self.request.host,
                        "format_date"     : self.format_date,
                        "format_size"     : misc.format_size,