Django

Code

Changeset 897

Show
Ignore:
Timestamp:
10/17/05 02:22:22 (3 years ago)
Author:
hugo
Message:

i18n: fixed settings and default settings files for i18n changes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/i18n/django/conf/global_settings.py

    r886 r897  
    2727# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes 
    2828# http://blogs.law.harvard.edu/tech/stories/storyReader$15 
    29 LANGUAGE_CODE = 'en-us' 
     29# Language codes need to be given in locale format, not in HTML language 
     30# format. So it's en_US and not en-us to store here. The HTML language 
     31# is stored in the request.LANGUAGE_CODE variable and will depend on the 
     32# users browser. 
     33LANGUAGE_CODE = 'en' 
    3034 
    3135# Languages we provide translations for out of the base. The 
    …… 
    3337# language. 
    3438LANGUAGES = ( 
    35     ('en-us', 'English'), 
     39    ('en', 'English'), 
    3640    ('de', 'Deutsch'), 
    3741    ('it', 'Italiano'), 

  • django/branches/i18n/django/conf/project_template/settings/admin.py

    r525 r897  
    1111    'django.middleware.admin.AdminUserRequired', 
    1212    'django.middleware.common.CommonMiddleware', 
     13    'django.middleware.locale.LocaleMiddleware', 
    1314) 
    1415 

  • django/branches/i18n/django/conf/project_template/settings/main.py

    r886 r897  
    99MANAGERS = ADMINS 
    1010 
    11 LANGUAGE_CODE = 'en-us' 
     11LANGUAGE_CODE = 'en_US' 
    1212 
    1313DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.