[soc2010/app-loading] ignore the classname of custom apps when executing management commands

arthurk · arthurk · commit 9cf522e69322 · 2010-08-10T01:16:51.000Z
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
@@ -156,7 +156,13 @@ def _merge(path):
                 res = _merge(localepath)
 
         for appname in settings.INSTALLED_APPS:
-            app = import_module(appname)
+            try:
+                app = import_module(appname)
+            except ImportError:
+                if not '.' in appname:
+                    raise
+                appname, app_classname = appname.rsplit('.', 1)
+                app = import_module(appname)
             apppath = os.path.join(os.path.dirname(app.__file__), 'locale')
 
             if os.path.isdir(apppath):
