Django

Code

Show
Ignore:
Timestamp:
07/13/08 09:31:09 (6 months ago)
Author:
jbronn
Message:

gis: Merged revisions 7837-7838,7842-7852,7856-7869,7871,7876-7877,7882-7891,7900-7917 via svnmerge from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/gis

    • Property svnmerge-integrated changed from /django/trunk:1-7835 to /django/trunk:1-7917

  • django/branches/gis/django/core/context_processors.py

    r6394 r7918  
    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