summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-03 03:19:14 +0000
committerMalcolm Tredinnick <malcolm.tredinnick@gmail.com>2007-10-03 03:19:14 +0000
commit291b81b4e3b869928b1b65dd892542b0ef3c7510 (patch)
treea2ad89c44e4d43404b45d8dc698588419efa8eb0
parentfa546d797e4b7c627c91ec3740b0f104aa30549d (diff)
Fixed #3955 -- Handled the case when there is no LOCALE_PATHS setting from [6349]. Thanks, Wang Chun and semenov.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6447 bcc190cf-cafb-0310-a4f2-bffc1f526a37
-rw-r--r--AUTHORS2
-rwxr-xr-xdjango/bin/compile-messages.py3
2 files changed, 3 insertions, 2 deletions
diff --git a/AUTHORS b/AUTHORS
index a6926b37b2..5af5c71f6e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -313,7 +313,7 @@ answer newbie questions, and generally made Django that much better:
Vlado <vlado@labath.org>
Milton Waddams
wam-djangobug@wamber.net
- wangchun <yaohua2000@gmail.com>
+ Wang Chun <wangchun@exoweb.net>
Filip Wasilewski <filip.wasilewski@gmail.com>
Dan Watson <http://theidioteque.net/>
Chris Wesseling <Chris.Wesseling@cwi.nl>
diff --git a/django/bin/compile-messages.py b/django/bin/compile-messages.py
index 2838cb8aa4..8693022644 100755
--- a/django/bin/compile-messages.py
+++ b/django/bin/compile-messages.py
@@ -14,7 +14,8 @@ def compile_messages(locale=None):
basedirs = [os.path.join('conf', 'locale'), 'locale']
if os.environ.get('DJANGO_SETTINGS_MODULE'):
from django.conf import settings
- basedirs += settings.LOCALE_PATHS
+ if hasattr(settings, 'LOCALE_PATHS'):
+ basedirs += settings.LOCALE_PATHS
# Gather existing directories.
basedirs = set(map(os.path.abspath, filter(os.path.isdir, basedirs)))