| 1 | diff -r 7bb85b4d5184 django/core/management/base.py
|
|---|
| 2 | --- a/django/core/management/base.py Mon Dec 27 15:36:04 2010 +0100
|
|---|
| 3 | +++ b/django/core/management/base.py Fri Jan 14 18:08:19 2011 +0100
|
|---|
| 4 | @@ -204,16 +204,8 @@
|
|---|
| 5 | # But only do this if we can assume we have a working settings file,
|
|---|
| 6 | # because django.utils.translation requires settings.
|
|---|
| 7 | if self.can_import_settings:
|
|---|
| 8 | - try:
|
|---|
| 9 | - from django.utils import translation
|
|---|
| 10 | - translation.activate('en-us')
|
|---|
| 11 | - except ImportError, e:
|
|---|
| 12 | - # If settings should be available, but aren't,
|
|---|
| 13 | - # raise the error and quit.
|
|---|
| 14 | - sys.stderr.write(smart_str(self.style.ERROR('Error: %s\n' % e)))
|
|---|
| 15 | - sys.exit(1)
|
|---|
| 16 | + from django.utils import translation
|
|---|
| 17 | + translation.activate('en-us')
|
|---|
| 18 | try:
|
|---|
| 19 | self.stdout = options.get('stdout', sys.stdout)
|
|---|
| 20 | self.stderr = options.get('stderr', sys.stderr)
|
|---|