------------------------------------------------------------------------
r11690 | cboos | 2013-02-18 23:22:16 +0100 (Mon, 18 Feb 2013) | 11 lines

1.0.2dev: ... and a follow-up to r11689, as there were still 2 test failures.

The functional tests TestAdminMilestoneDue and
TestAdminMilestoneDetailDue would fail with an "Invalid Date" error
when the "en_US.mo" compiled catalog is missing.

In fact, we should always have 'en_US' in the list of available
translations, as it's the "source" language so it shouldn't matter if
we have the compiled catalog or not. Ensuring we always have it fixes
the tests.


Index: trac/util/translation.py
===================================================================
--- trac/util/translation.py	(revision 11689)
+++ trac/util/translation.py	(revision 11690)
@@ -339,11 +339,14 @@
                               directory is enough.
         """
         try:
-            return [dirname for dirname
-                    in pkg_resources.resource_listdir('trac', 'locale')
-                    if '.' not in dirname
-                    and (not check_catalog or pkg_resources.resource_exists(
+            locales = [dirname for dirname
+                       in pkg_resources.resource_listdir('trac', 'locale')
+                       if '.' not in dirname
+                       and (not check_catalog or pkg_resources.resource_exists(
                         'trac', 'locale/%s/LC_MESSAGES/messages.mo' % dirname))]
+            if 'en_US' not in locales:
+                locales.append('en_US')
+            return locales
         except Exception:
             return []
 

------------------------------------------------------------------------