diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-02-29 18:38:44 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-02-29 18:38:44 +0000 |
| commit | efed04b6346b5eab4e01af66f9928275521ac30b (patch) | |
| tree | f57a0dfe4d2d865794f094624e982dfa789e98b6 /docs | |
| parent | 2dbb08e5dc7fe97d912855de530713a4ff7e42c0 (diff) | |
Fixed #5603 -- Allow customization of the language cookie name. Thanks, moe.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7185 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/i18n.txt | 5 | ||||
| -rw-r--r-- | docs/settings.txt | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/docs/i18n.txt b/docs/i18n.txt index 78404d4503..bb6cf74ded 100644 --- a/docs/i18n.txt +++ b/docs/i18n.txt @@ -547,7 +547,7 @@ following this algorithm: * First, it looks for a ``django_language`` key in the the current user's `session`_. - * Failing that, it looks for a cookie called ``django_language``. + * Failing that, it looks for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting (the default name is: ``django_language``). * Failing that, it looks at the ``Accept-Language`` HTTP header. This header is sent by your browser and tells the server which language(s) you prefer, in order by priority. Django tries each language in the header @@ -719,7 +719,8 @@ Activate this view by adding the following line to your URLconf:: The view expects to be called via the ``POST`` method, with a ``language`` parameter set in request. If session support is enabled, the view saves the language choice in the user's session. Otherwise, it saves the -language choice in a ``django_language`` cookie. +language choice in a cookie that is by default named ``django_language`` +(the name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting). After setting the language choice, Django redirects the user, following this algorithm: diff --git a/docs/settings.txt b/docs/settings.txt index 8478e0ce96..ace893f1b5 100644 --- a/docs/settings.txt +++ b/docs/settings.txt @@ -579,6 +579,16 @@ in standard language format. For example, U.S. English is ``"en-us"``. See the .. _internationalization docs: ../i18n/ +LANGUAGE_COOKIE_NAME +-------------------- + +Default: ``'django_language'`` + +The name of the cookie to use for the language cookie. This can be whatever +you want (but should be different from SESSION_COOKIE_NAME). See the +`internationalization docs`_ for details. + + LANGUAGES --------- @@ -822,8 +832,8 @@ SESSION_COOKIE_NAME Default: ``'sessionid'`` -The name of the cookie to use for sessions. This can be whatever you want. -See the `session docs`_. +The name of the cookie to use for sessions. This can be whatever you want (but +should be different from ``LANGUAGE_COOKIE_NAME``). See the `session docs`_. SESSION_COOKIE_PATH ------------------- |