Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1269 from edx/db/clarify-debug

Browse Source 
Clarify USE_I18N settings
This commit is contained in:
David Baumgold
2013-10-09 13:55:30 -07:00
parent d42a350784 cbaa3089ba
commit 838f4df6b5
6 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cms/envs/acceptance.py
View File

@@ -82,6 +82,11 @@ DATABASES = {
# Use the auto_auth workflow for creating users and logging them in
MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True
# HACK
# Setting this flag to false causes imports to not load correctly in the lettuce python files
# We do not yet understand why this occurs. Setting this to true is a stopgap measure
USE_I18N = True
# Include the lettuce app for acceptance testing, including the 'harvest' django-admin command
INSTALLED_APPS += ('lettuce.django',)
LETTUCE_APPS = ('contentstore',)

10
cms/envs/common.py
View File

@@ -218,10 +218,12 @@ STATICFILES_DIRS = [
TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html
# We want i18n to be turned off in production, at least until we have full
# localizations. It's disconcerting for everything on the page to be in English
# except for one or two strings like "login" which are correctly localized.
USE_I18N = DEBUG
# We want i18n to be turned off in production, at least until we have full localizations.
# Thus we want the Django translation engine to be disabled. Otherwise even without
# localization files, if the user's browser is set to a language other than us-en,
# strings like "login" and "password" will be translated and the rest of the page will be
# in English, which is confusing.
USE_I18N = False
USE_L10N = True
# Localization strings (e.g. django.po) are under this directory

1
cms/envs/dev.py
View File

@@ -9,6 +9,7 @@ from .common import *
from logsettings import get_logger_config
DEBUG = True
USE_I18N = True
TEMPLATE_DEBUG = DEBUG
LOGGING = get_logger_config(ENV_ROOT / "log",
logging_env="dev",

5
lms/envs/acceptance.py
View File

@@ -109,6 +109,11 @@ CC_PROCESSOR['CyberSource']['MERCHANT_ID'] = "edx"
CC_PROCESSOR['CyberSource']['SERIAL_NUMBER'] = "0123456789012345678901"
CC_PROCESSOR['CyberSource']['PURCHASE_ENDPOINT'] = "/shoppingcart/payment_fake"
# HACK
# Setting this flag to false causes imports to not load correctly in the lettuce python files
# We do not yet understand why this occurs. Setting this to true is a stopgap measure
USE_I18N = True
MITX_FEATURES['ENABLE_FEEDBACK_SUBMISSION'] = True
FEEDBACK_SUBMISSION_EMAIL = 'dummy@example.com'

10
lms/envs/common.py
View File

@@ -455,10 +455,12 @@ FAVICON_PATH = 'images/favicon.ico'
TIME_ZONE = 'America/New_York' # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
LANGUAGE_CODE = 'en' # http://www.i18nguy.com/unicode/language-identifiers.html
# We want i18n to be turned off in production, at least until we have full
# localizations. It's disconcerting for everything on the page to be in English
# except for one or two strings like "login" which are correctly localized.
USE_I18N = DEBUG
# We want i18n to be turned off in production, at least until we have full localizations.
# Thus we want the Django translation engine to be disabled. Otherwise even without
# localization files, if the user's browser is set to a language other than us-en,
# strings like "login" and "password" will be translated and the rest of the page will be
# in English, which is confusing.
USE_I18N = False
USE_L10N = True
# Localization strings (e.g. django.po) are under this directory

1
lms/envs/dev.py
View File

@@ -16,6 +16,7 @@ from .common import *
from logsettings import get_logger_config
DEBUG = True
USE_I18N = True
TEMPLATE_DEBUG = True