diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index 7826e9ba7d..c19e5c2353 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -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',) diff --git a/cms/envs/common.py b/cms/envs/common.py index b833129737..05a1b63f5f 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -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 diff --git a/cms/envs/dev.py b/cms/envs/dev.py index c1159aa0fb..f96506665a 100644 --- a/cms/envs/dev.py +++ b/cms/envs/dev.py @@ -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", diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 5c2a9596c1..ddc997a72d 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -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' diff --git a/lms/envs/common.py b/lms/envs/common.py index 73c18231e1..6a9be412e1 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -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 diff --git a/lms/envs/dev.py b/lms/envs/dev.py index 43b3ef5d15..4d46dc52e2 100644 --- a/lms/envs/dev.py +++ b/lms/envs/dev.py @@ -16,6 +16,7 @@ from .common import * from logsettings import get_logger_config DEBUG = True +USE_I18N = True TEMPLATE_DEBUG = True