Ticket #3955: bugfix_for_r6349.diff

django/bin/compile-messages.py

@@ -14 +14 @@
     basedirs = [os.path.join('conf', 'locale'), 'locale']
     if os.environ.get('DJANGO_SETTINGS_MODULE'):
         from django.conf import settings
-        basedirs += settings.LOCALE_PATHS
+        if os.environ.get('LOCALE_PATHS'):
+            basedirs += settings.LOCALE_PATHS
 
     # Gather existing directories.
     basedirs = set(map(os.path.abspath, filter(os.path.isdir, basedirs)))

AUTHORS

@@ -311 +311 @@
     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>