Ticket #9439: 9493-has_babel-False.2.patch

trac/util/translation.py

@@ -341 +341 @@
         
     has_babel = True
 
+    try:
+        locales = pkg_resources.resource_listdir('trac', 'locale')
+        # TODO: (optimization) early extraction of all locales
+    except pkg_resources.ExtractionError:
+        pass # delay extraction
+    except Exception:
+        has_babel = False # No locale data in egg
+
 except ImportError: # fall back on 0.11 behavior, i18n functions are no-ops
+    has_babel = None
+
+if not has_babel:
     gettext = _ = gettext_noop
     dgettext = dgettext_noop
     ngettext = ngettext_noop

trac/web/chrome.py

@@ -47 +47 @@
                            javascript_quote, exception_to_unicode
 from trac.util.datefmt import pretty_timedelta, format_datetime, format_date, \
                               format_time, from_utimestamp, http_date, utc
-from trac.util.translation import _
+from trac.util.translation import _, has_babel
 from trac.web.api import IRequestHandler, ITemplateStreamFilter, HTTPNotFound
 from trac.web.href import Href
 from trac.wiki import IWikiSyntaxProvider
@@ -374 +374 @@
     def get_system_info(self):
         import genshi
         yield 'Genshi', get_pkginfo(genshi).get('version')
-        try:
+        if has_babel is not None:
             import babel
-        except ImportError:
-            babel = None
-        if babel is not None:
-            yield 'Babel', get_pkginfo(babel).get('version')
+            babel_info = get_pkginfo(babel).get('version')
+            if has_babel is False: 
+                babel_info += " (Babel was installed after Trac, " \
+                    "no translations are available)" # Note: no i18n on purpose
+                self.log.warning("Babel: version %s", babel_info)
+            yield 'Babel', babel_info
 
     # IEnvironmentSetupParticipant methods