Commit 16ca0252 by David Baumgold

Clarify USE_I18N settings

@jzoldak showed me that setting `USE_I18N = DEBUG` didn't actually accomplish
what I had hoped it would -- changing DEBUG didn't also change USE_I18N.
This pull request accomplishes what I was trying to accomplish, without being
quite so clever about it.
parent 4879b06c
......@@ -79,6 +79,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',)
......
......@@ -221,7 +221,7 @@ 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
USE_I18N = False
USE_L10N = True
# Localization strings (e.g. django.po) are under this directory
......
......@@ -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",
......
......@@ -102,6 +102,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'
......
......@@ -458,7 +458,7 @@ 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
USE_I18N = False
USE_L10N = True
# Localization strings (e.g. django.po) are under this directory
......
......@@ -16,6 +16,7 @@ from .common import *
from logsettings import get_logger_config
DEBUG = True
USE_I18N = True
TEMPLATE_DEBUG = True
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment