Ticket #9439: 9439-log-missing-r10145.patch

trac/admin/console.py

@@ -169 +169 @@
         # fixup language according to env settings
         if has_babel:
             default = env.config.get('trac', 'default_language', '')
-            negotiated = get_negotiated_locale([LANG, default])
+            negotiated = get_negotiated_locale([LANG, default], env.log)
             if negotiated:
-                translation.activate(negotiated)
+                translation.activate(negotiated, env.path)
         
     ##
     ## Utility methods

trac/prefs/web_ui.py

@@ -106 +106 @@
         }
 
         if Locale:
-            locales = map(Locale.parse, get_available_locales())
+            locales = map(Locale.parse, get_available_locales(self.log))
             languages = sorted([(str(locale).replace('_','-'),
                                  locale.display_name) for locale in locales])
             data['locales'] = locales

trac/util/translation.py

@@ -143 +143 @@
                 locale_dir = pkg_resources.resource_filename('trac', 'locale')
             except pkg_resources.ExtractionError:
                 return # delay extraction
-            except KeyError:
-                return # No locale data in egg
+            except Exception:
+                return
             t = Translations.load(locale_dir, locale or 'en_US')
             if not t or t.__class__ is NullTranslations:
                 t = self._null_translations
@@ -325 +325 @@
     def get_translations():
         return translations
 
-    def get_available_locales():
+    def get_available_locales(log=None):
         """Return a list of locale identifiers of the locales for which
         translations are available.
         """
-        return [dirname for dirname
-                in pkg_resources.resource_listdir('trac', 'locale')
-                if '.' not in dirname]
+        try:
+            locales = [dirname for dirname
+                       in pkg_resources.resource_listdir('trac', 'locale')
+                       if '.' not in dirname]
+        except Exception:
+            locales = []
+        if not locales and log is not None:
+            log.warning("Locale data not found")
+        return locales
+                   
 
-    def get_negotiated_locale(preferred_locales):
+    def get_negotiated_locale(preferred_locales, log=None):
         def normalize(locale_ids):
             return [id.replace('_', '-') for id in locale_ids if id]
         return Locale.negotiate(normalize(preferred_locales),
-                                normalize(get_available_locales()), sep='-')
+                                normalize(get_available_locales(log)), sep='-')
         
     has_babel = True
 
@@ -368 +375 @@
     def get_translations():
         return translations
 
-    def get_available_locales():
+    def get_available_locales(log=None):
         return []
 
-    def get_negotiated_locale(preferred=None, default=None):
+    def get_negotiated_locale(preferred=None, log=None):
         return None

trac/web/main.py

@@ -308 +308 @@
             preferred = req.session.get('language')
             default = self.env.config.get('trac', 'default_language', '')
             negotiated = get_negotiated_locale([preferred, default] +
-                                               req.languages)
+                                               req.languages, self.log)
             self.log.debug("Negotiated locale: %s -> %s", preferred, negotiated)
             return negotiated