Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Edited settings.txt and i18n.txt changes from [7185]

git-svn-id: http://code.djangoproject.com/svn/django/trunk@7238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 2b8c2c49e796c06f0e3a4836936bcabb748b8211 1 parent b448b67
Adrian Holovaty authored March 13, 2008
7  docs/i18n.txt
@@ -547,7 +547,7 @@ following this algorithm:
547 547
 
548 548
     * First, it looks for a ``django_language`` key in the the current user's
549 549
       `session`_.
550  
-    * Failing that, it looks for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting (the default name is: ``django_language``).
  550
+    * Failing that, it looks for a cookie that is named according to your ``LANGUAGE_COOKIE_NAME`` setting. (The default name is ``django_language``, and this setting is new in the Django development version. In Django version 0.96 and before, the cookie's name is hard-coded to ``django_language``.)
551 551
     * Failing that, it looks at the ``Accept-Language`` HTTP header. This
552 552
       header is sent by your browser and tells the server which language(s) you
553 553
       prefer, in order by priority. Django tries each language in the header
@@ -719,8 +719,9 @@ Activate this view by adding the following line to your URLconf::
719 719
 The view expects to be called via the ``POST`` method, with a ``language``
720 720
 parameter set in request. If session support is enabled, the view
721 721
 saves the language choice in the user's session. Otherwise, it saves the
722  
-language choice in a cookie that is by default named ``django_language``
723  
-(the name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting).
  722
+language choice in a cookie that is by default named ``django_language``.
  723
+(The name can be changed through the ``LANGUAGE_COOKIE_NAME`` setting if you're
  724
+using the Django development version.)
724 725
 
725 726
 After setting the language choice, Django redirects the user, following this
726 727
 algorithm:
5  docs/settings.txt
@@ -582,13 +582,14 @@ in standard language format. For example, U.S. English is ``"en-us"``. See the
582 582
 LANGUAGE_COOKIE_NAME
583 583
 --------------------
584 584
 
  585
+**New in Django development version**
  586
+
585 587
 Default: ``'django_language'``
586 588
 
587 589
 The name of the cookie to use for the language cookie. This can be whatever
588  
-you want (but should be different from SESSION_COOKIE_NAME). See the
  590
+you want (but should be different from ``SESSION_COOKIE_NAME``). See the
589 591
 `internationalization docs`_ for details.
590 592
 
591  
-
592 593
 LANGUAGES
593 594
 ---------
594 595
 

0 notes on commit 2b8c2c4

Please sign in to comment.
Something went wrong with that request. Please try again.