Django

Code

Changeset 6583

Show
Ignore:
Timestamp:
10/21/07 12:26:32 (9 months ago)
Author:
mtredinnick
Message:

Modified the test harness to respect the LANGUAGE_CODE setting. Also changed
Django's own test runner to always use 'en' for LANGUAGE_CODE when testing
core. Fixed #4709

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/test/utils.py

    r5981 r6583  
    77from django.test import signals 
    88from django.template import Template 
     9from django.utils.translation import deactivate 
    910 
    1011# The prefix to put on the default database name when creating 
    …… 
    4445        - Installing the instrumented test renderer 
    4546        - Diverting the email sending functions to a test buffer 
    46  
     47        - Setting the active locale to match the LANGUAGE_CODE setting. 
    4748    """ 
    4849    Template.original_render = Template.render 
    …… 
    5354 
    5455    mail.outbox = [] 
     56 
     57    deactivate() 
    5558 
    5659def teardown_test_environment(): 

  • django/trunk/tests/runtests.py

    r6186 r6583  
    9494    old_template_dirs = settings.TEMPLATE_DIRS 
    9595    old_use_i18n = settings.USE_I18N 
     96    old_language_code = settings.LANGUAGE_CODE 
    9697    old_middleware_classes = settings.MIDDLEWARE_CLASSES 
    9798 
    …… 
    101102    settings.TEMPLATE_DIRS = (os.path.join(os.path.dirname(__file__), TEST_TEMPLATE_DIR),) 
    102103    settings.USE_I18N = True 
     104    settings.LANGUAGE_CODE = 'en' 
    103105    settings.MIDDLEWARE_CLASSES = ( 
    104106        'django.contrib.sessions.middleware.SessionMiddleware', 
    …… 
    152154    settings.TEMPLATE_DIRS = old_template_dirs 
    153155    settings.USE_I18N = old_use_i18n 
     156    settings.LANGUAGE_CODE = old_language_code 
    154157    settings.MIDDLEWARE_CLASSES = old_middleware_classes 
    155158