From 1729d92f71694caad39d9ed3a31e1e287104e16f Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sat, 30 Aug 2008 20:17:58 +0000 Subject: [PATCH] Fixed #8702 -- Set up the initial locale correctly for the development server. Previously, "--noreload" wasn't picking up the default language setting. Thanks to arien and Karen Tracey for debugging this. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8749 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/management/commands/runserver.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/django/core/management/commands/runserver.py b/django/core/management/commands/runserver.py index 12808bcaad..16d75fd88b 100644 --- a/django/core/management/commands/runserver.py +++ b/django/core/management/commands/runserver.py @@ -43,11 +43,18 @@ class Command(BaseCommand): def inner_run(): from django.conf import settings + from django.utils import translation print "Validating models..." self.validate(display_num_errors=True) print "\nDjango version %s, using settings %r" % (django.get_version(), settings.SETTINGS_MODULE) print "Development server is running at http://%s:%s/" % (addr, port) print "Quit the server with %s." % quit_command + + # django.core.management.base forces the locale to en-us. We should + # set it up correctly for the first request (particularly important + # in the "--noreload" case). + translation.activate(settings.LANGUAGE_CODE) + try: path = admin_media_path or django.__path__[0] + '/contrib/admin/media' handler = AdminMediaHandler(WSGIHandler(), path) @@ -70,6 +77,7 @@ class Command(BaseCommand): if shutdown_message: print shutdown_message sys.exit(0) + if use_reloader: from django.utils import autoreload autoreload.main(inner_run)