Django

Code

Changeset 7843

Show
Ignore:
Timestamp:
07/06/08 00:25:55 (2 months ago)
Author:
mtredinnick
Message:

Fixed #7072 -- More logical and robust language settings in the i18n context processor.

Analysis and patch from akaihola.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/context_processors.py

    r6356 r7843  
    3939 
    4040def i18n(request): 
     41    from django.utils import translation 
     42 
    4143    context_extras = {} 
    4244    context_extras['LANGUAGES'] = settings.LANGUAGES 
    43     if hasattr(request, 'LANGUAGE_CODE'): 
    44         context_extras['LANGUAGE_CODE'] = request.LANGUAGE_CODE 
    45     else: 
    46         context_extras['LANGUAGE_CODE'] = settings.LANGUAGE_CODE 
    47  
    48     from django.utils import translation 
     45    context_extras['LANGUAGE_CODE'] = translation.get_language() 
    4946    context_extras['LANGUAGE_BIDI'] = translation.get_language_bidi() 
    5047