From b6bd766d88aedfb924180091bebbe990b7b64564 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 26 Feb 2010 15:38:50 +0000 Subject: [1.1.X] Fixed #1480 -- Added the ability to use the system timezone. Thanks to Ramiro Morales for the patch. Backport of r12602 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12603 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- docs/ref/settings.txt | 54 ++++++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 20 deletions(-) (limited to 'docs/ref') diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt index 5c96960b85..8d8be2eaa1 100644 --- a/docs/ref/settings.txt +++ b/docs/ref/settings.txt @@ -1145,28 +1145,42 @@ TIME_ZONE Default: ``'America/Chicago'`` -A string representing the time zone for this installation. `See available choices`_. -(Note that list of available choices lists more than one on the same line; -you'll want to use just one of the choices for a given time zone. For instance, -one line says ``'Europe/London GB GB-Eire'``, but you should use the first bit -of that -- ``'Europe/London'`` -- as your ``TIME_ZONE`` setting.) - -Note that this is the time zone to which Django will convert all dates/times -- -not necessarily the timezone of the server. For example, one server may serve -multiple Django-powered sites, each with a separate time-zone setting. - -Normally, Django sets the ``os.environ['TZ']`` variable to the time zone you -specify in the ``TIME_ZONE`` setting. Thus, all your views and models will -automatically operate in the correct time zone. However, if you're manually -:ref:`manually configuring settings -`, Django will *not* touch the ``TZ`` -environment variable, and it'll be up to you to ensure your processes are -running in the correct environment. +.. versionchanged:: 1.2 + ``None`` was added as an allowed value. + +A string representing the time zone for this installation, or +``None``. `See available choices`_. (Note that list of available +choices lists more than one on the same line; you'll want to use just +one of the choices for a given time zone. For instance, one line says +``'Europe/London GB GB-Eire'``, but you should use the first bit of +that -- ``'Europe/London'`` -- as your ``TIME_ZONE`` setting.) + +Note that this is the time zone to which Django will convert all +dates/times -- not necessarily the timezone of the server. For +example, one server may serve multiple Django-powered sites, each with +a separate time-zone setting. + +Normally, Django sets the ``os.environ['TZ']`` variable to the time +zone you specify in the ``TIME_ZONE`` setting. Thus, all your views +and models will automatically operate in the correct time zone. +However, Django won't set the ``TZ`` environment variable under the +following conditions: + + * If you're using the manual configuration option as described in + :ref:`manually configuring settings + `, or + + * If you specify ``TIME_ZONE = None``. This will cause Django to fall + back to using the system timezone. + +If Django doesn't set the ``TZ`` environment variable, it's up to you +to ensure your processes are running in the correct environment. .. note:: - Django cannot reliably use alternate time zones in a Windows environment. - If you're running Django on Windows, this variable must be set to match the - system timezone. + Django cannot reliably use alternate time zones in a Windows + environment. If you're running Django on Windows, this variable + must be set to match the system timezone. + .. _See available choices: http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE -- cgit v1.3