Django

Code

Changeset 7238

Show
Ignore:
Timestamp:
03/13/08 15:26:08 (6 months ago)
Author:
adrian
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/docs/i18n.txt

    r7185 r7238  
    548548    * First, it looks for a ``django_language`` key in the the current user's 
    549549      `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``.) 
    551551    * Failing that, it looks at the ``Accept-Language`` HTTP header. This 
    552552      header is sent by your browser and tells the server which language(s) you 
    …… 
    720720parameter set in request. If session support is enabled, the view 
    721721saves 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). 
     722language 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 
     724using the Django development version.) 
    724725 
    725726After setting the language choice, Django redirects the user, following this 

  • django/trunk/docs/settings.txt

    r7185 r7238  
    583583-------------------- 
    584584 
     585**New in Django development version** 
     586 
    585587Default: ``'django_language'`` 
    586588 
    587589The 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 
     590you want (but should be different from ``SESSION_COOKIE_NAME``). See the 
    589591`internationalization docs`_ for details. 
    590  
    591592 
    592593LANGUAGES