Django

Code

Show
Ignore:
Timestamp:
07/06/08 10:23:24 (6 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7852].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7829 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7852

  • django/branches/newforms-admin/django/core/context_processors.py

    r6371 r7853  
    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