Merge pull request #4533 from Stanford-Online/kluo/i18n-support-theme

Add support for theme translations and LANGUAGE_DICT override
This commit is contained in:
Sarina Canelake
2014-07-24 08:59:26 -04:00
2 changed files with 4 additions and 0 deletions

View File

@@ -207,6 +207,7 @@ TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE)
# Translation overrides
LANGUAGES = ENV_TOKENS.get('LANGUAGES', LANGUAGES)
LANGUAGE_DICT = dict(LANGUAGES)
LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE)
USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N)

View File

@@ -76,6 +76,9 @@ def enable_theme():
(u'themes/{}'.format(settings.THEME_NAME), theme_root / 'static')
)
# Include theme locale path for django translations lookup
settings.LOCALE_PATHS = (theme_root / 'conf/locale',) + settings.LOCALE_PATHS
def enable_microsites():
"""