Changeset 1185

Timestamp:

11/11/05 17:34:08 (3 years ago)

Author:

hugo

Message:

fix a problem that masks errors in settings files for some users - in those cases you only got "INSTALLED_APPS not defined", but in reality your settings file was broken.

Files:

• django/trunk/django/bin/django-admin.py (modified) (2 diffs)

django/trunk/django/bin/django-admin.py

@@ -3 +3 @@
-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
-try:
-    from django.utils import translation
-    translation.activate('en-us')
-except:
-    pass
-
-ACTION_MAPPING = {
@@ -81 +73 @@
-    if not ACTION_MAPPING.has_key(action):
-        print_error("Your action, %r, was invalid." % action, sys.argv[0])
+
+    # switch to english, because django-admin creates database content
+    # like permissions, and those shouldn't contain any translations.
+    # But only do this if we should have a working settings file.
+    if action not in ('startproject', 'startapp'):
+        from django.utils import translation
+        translation.activate('en-us')
+
-    if action in ('createsuperuser', 'init', 'validate'):
-        ACTION_MAPPING[action]()