Ticket #8117: 8117-trac-admin-default_language.patch

trac/admin/console.py

@@ -21 +21 @@
 import sys
 import traceback
 
+try:
+    from babel import Locale
+except ImportError:
+    Locale = None
+
 from trac import __version__ as VERSION
 from trac.admin import AdminCommandError, AdminCommandManager
 from trac.core import TracError
@@ -148 +153 @@
     def env_check(self):
         if not self.__env:
             try:
-                self.__env = Environment(self.envname)
+                self._init_env()
             except:
                 return False
         return True
@@ -157 +162 @@
     def env(self):
         try:
             if not self.__env:
-                self.__env = Environment(self.envname)
+                self._init_env()
             return self.__env
         except Exception, e:
             printerr(_("Failed to open environment: %(err)s",
                        err=exception_to_unicode(e, traceback=True)))
             sys.exit(1)
 
+    def _init_env(self):
+        self.__env = env = Environment(self.envname)
+        # fixup language according to env settings
+        if Locale:
+            preferred = env.config.get('trac', 'default_language',
+                                       '').replace('_', '-')
+            if preferred:
+                available = [locale_id.replace('_', '-') for locale_id in
+                             translation.get_available_locales()]
+                negotiated = Locale.negotiate([preferred], available, sep='-')
+                translation.activate(negotiated)
+        
     ##
     ## Utility methods
     ##