mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity

i18n: fixed settings and default settings files for i18n changes

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/i18n@897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Georg Bauer 2005-10-17 07:22:22 +00:00
parent ed124dc0ad
commit fcb0aeb564
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/conf/global_settings.py
View File

@ -26,13 +26,17 @@ TIME_ZONE = 'America/Chicago'
# Language code for this installation. All choices can be found here: # Language code for this installation. All choices can be found here:
# http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes
# http://blogs.law.harvard.edu/tech/stories/storyReader$15 # http://blogs.law.harvard.edu/tech/stories/storyReader$15
LANGUAGE_CODE = 'en-us' # Language codes need to be given in locale format, not in HTML language
# format. So it's en_US and not en-us to store here. The HTML language
# is stored in the request.LANGUAGE_CODE variable and will depend on the
# users browser.
LANGUAGE_CODE = 'en'
# Languages we provide translations for out of the base. The # Languages we provide translations for out of the base. The
# language name should be the utf-8 encoded local name for the # language name should be the utf-8 encoded local name for the
# language. # language.
LANGUAGES = ( LANGUAGES = (
('en-us', 'English'), ('en', 'English'),
('de', 'Deutsch'), ('de', 'Deutsch'),
('it', 'Italiano'), ('it', 'Italiano'),
('sr', 'Srpski'), ('sr', 'Srpski'),

1
django/conf/project_template/settings/admin.py
View File

@ -10,6 +10,7 @@ MIDDLEWARE_CLASSES = (
'django.middleware.sessions.SessionMiddleware', 'django.middleware.sessions.SessionMiddleware',
'django.middleware.admin.AdminUserRequired', 'django.middleware.admin.AdminUserRequired',
'django.middleware.common.CommonMiddleware', 'django.middleware.common.CommonMiddleware',
'django.middleware.locale.LocaleMiddleware',
) )
# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a

2
django/conf/project_template/settings/main.py
View File

@ -8,7 +8,7 @@ ADMINS = (
MANAGERS = ADMINS MANAGERS = ADMINS
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = 'en_US'
DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'. DATABASE_ENGINE = 'postgresql' # 'postgresql', 'mysql', 'sqlite3' or 'ado_mssql'.
DATABASE_NAME = '' # Or path to database file if using sqlite3. DATABASE_NAME = '' # Or path to database file if using sqlite3.