summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Koziel <arthur@arthurkoziel.com>2010-08-10 01:16:51 +0000
committerArthur Koziel <arthur@arthurkoziel.com>2010-08-10 01:16:51 +0000
commit9cf522e6932213b75742f7be70153a27492c4424 (patch)
tree112580606b78a27d6b0e3e6c9e9073f27a013aa1
parent9f8478ff31298d6f77b47aafd5cd654f856798e6 (diff)
downloaddjango-9cf522e6932213b75742f7be70153a27492c4424.tar.gz
[soc2010/app-loading] ignore the classname of custom apps when executing management commands
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13569 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--django/utils/translation/trans_real.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py
index b528f8e586..017b99a8ca 100644
--- a/django/utils/translation/trans_real.py
+++ b/django/utils/translation/trans_real.py
@@ -156,7 +156,13 @@ def translation(language):
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):