newforms-admin: Merged from trunk up to [6775].

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6777 bcc190cf-cafb-0310-a4f2-bffc1f526a37

AUTHORS

@@ -72,6 +72,7 @@ answer newbie questions, and generally made Django that much better:
     Jonathan Buchanan <jonathan.buchanan@gmail.com>
     Trevor Caira <trevor@caira.com>
     Ricardo Javier Cárdenes Medina <ricardo.cardenes@gmail.com>
+    Graham Carlyle <graham.carlyle@maplecroft.net>
     Antonio Cavedoni <http://cavedoni.com/>
     C8E
     cedric@terramater.net
@@ -101,6 +102,7 @@ answer newbie questions, and generally made Django that much better:
     Alex Dedul
     deric@monowerks.com
     Max Derkachev <mderk@yandex.ru>
+    Rajesh Dhawan <rajesh.dhawan@gmail.com>
     Sander Dijkhuis <sander.dijkhuis@gmail.com>
     Jordan Dimov <s3x3y1@gmail.com>
     dne@mayonnaise.net
@@ -189,6 +191,7 @@ answer newbie questions, and generally made Django that much better:
     krzysiek.pawlik@silvermedia.pl
     Joseph Kocherhans
     konrad@gwu.edu
+    knox <christobzr@gmail.com>
     kurtiss@meetro.com
     lakin.wecker@gmail.com
     Nick Lane <nick.lane.au@gmail.com>
@@ -278,6 +281,7 @@ answer newbie questions, and generally made Django that much better:
     Vinay Sajip <vinay_sajip@yahoo.co.uk>
     David Schein
     scott@staplefish.com
+    Ilya Semenov <semenov@inetss.com>
     serbaut@gmail.com
     John Shaffer <jshaffer2112@gmail.com>
     Pete Shinners <pete@shinners.org>

README

@@ -34,4 +34,3 @@ To contribute to Django:
 
     * Check out http://www.djangoproject.com/community/ for information
       about getting involved.
-

django/bin/compile-messages.py

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

django/conf/global_settings.py

@@ -90,6 +90,8 @@
 # to load the internationalization machinery.
 USE_I18N = True
 
+LOCALE_PATHS = ()
+
 # Not-necessarily-technical managers of the site. They get broken link
 # notifications and other various e-mails.
 MANAGERS = ADMINS