summaryrefslogtreecommitdiff
path: root/django/bin
diff options
context:
space:
mode:
authorGeorg Bauer <gb@hugo.westfalen.de>2005-10-27 22:34:06 +0000
committerGeorg Bauer <gb@hugo.westfalen.de>2005-10-27 22:34:06 +0000
commitde42aef09c4641b17fd10d8e7aeb825b9174095d (patch)
tree5aec058cc23d4f18ade746761a888733e949e8c8 /django/bin
parente8d46cb8f12302c55be9b5dfac96eec61caa72fd (diff)
fix for startproject requiring settings
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@1013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/bin')
-rwxr-xr-xdjango/bin/django-admin.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/django/bin/django-admin.py b/django/bin/django-admin.py
index 6af3552a35..6b927cbde0 100755
--- a/django/bin/django-admin.py
+++ b/django/bin/django-admin.py
@@ -1,12 +1,15 @@
#!/usr/bin/env python
from django.core import management
-from django.utils import translation
from optparse import OptionParser
import os, sys
# switch to english, because django-admin creates database content
# like permissions, and those shouldn't contain any translations
-translation.activate('en-us')
+try:
+ from django.utils import translation
+ translation.activate('en-us')
+except:
+ pass
ACTION_MAPPING = {
'adminindex': management.get_admin_index,