From 9d9dac70d04eea7753fc430ee6668e4ff51f6346 Mon Sep 17 00:00:00 2001 From: Szczork Date: Tue, 15 Oct 2013 18:34:59 +0200 Subject: [PATCH 1/6] Translation overrides Usefull variables for translation --- lms/envs/aws.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index ee56c6490a33..26a3b8a4336c 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -163,8 +163,11 @@ # Marketing link overrides MKTG_URL_LINK_MAP.update(ENV_TOKENS.get('MKTG_URL_LINK_MAP', {})) -# Timezone overrides +# Timezone and translation overrides +LANGUAGES = ENV_TOKENS.get('LANGUAGES', ()) TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) +LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE) +USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N) # Additional installed apps for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []): From dd75a14d43d8d7eb1764dbf75dbf53d72ca925e6 Mon Sep 17 00:00:00 2001 From: Szczork Date: Sat, 19 Oct 2013 04:41:53 +0200 Subject: [PATCH 2/6] Translation-overrides --- AUTHORS | 1 + lms/envs/aws.py | 6 ++++-- lms/envs/common.py | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2f4d7efeadd5..42c8351bb9f8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -90,3 +90,4 @@ Nick Parlante Marko Seric Felipe Montoya Julia Hansbrough +Nicolas Chevalier \ No newline at end of file diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 26a3b8a4336c..fb182c6c6a6a 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -163,9 +163,11 @@ # Marketing link overrides MKTG_URL_LINK_MAP.update(ENV_TOKENS.get('MKTG_URL_LINK_MAP', {})) -# Timezone and translation overrides -LANGUAGES = ENV_TOKENS.get('LANGUAGES', ()) +# Timezone overrides TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) + +# Translation overrides +LANGUAGES = ENV_TOKENS.get('LANGUAGES', ()) LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE) USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N) diff --git a/lms/envs/common.py b/lms/envs/common.py index db66b821cab8..e1f2277ef772 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -456,6 +456,7 @@ # Locale/Internationalization 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 +LANGUAGES = () # 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 From adad03b0a8cfcc1691c450ccf26bfd472ca6cdbd Mon Sep 17 00:00:00 2001 From: Szczork Date: Sat, 19 Oct 2013 13:47:41 +0200 Subject: [PATCH 3/6] Translation overrides --- lms/envs/aws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index fb182c6c6a6a..084891d4f989 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -167,7 +167,7 @@ TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) # Translation overrides -LANGUAGES = ENV_TOKENS.get('LANGUAGES', ()) +LANGUAGES = ENV_TOKENS.get('LANGUAGES', LANGUAGES) LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE) USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N) From 241d8b1e0e83da6bab60aecc75f01571c3733fb1 Mon Sep 17 00:00:00 2001 From: Szczork Date: Tue, 15 Oct 2013 18:34:59 +0200 Subject: [PATCH 4/6] Translation overrides Usefull variables for translation --- lms/envs/aws.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 7a32916c44ee..a3db7c43f695 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -170,8 +170,11 @@ # Marketing link overrides MKTG_URL_LINK_MAP.update(ENV_TOKENS.get('MKTG_URL_LINK_MAP', {})) -# Timezone overrides +# Timezone and translation overrides +LANGUAGES = ENV_TOKENS.get('LANGUAGES', ()) TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) +LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE) +USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N) # Additional installed apps for app in ENV_TOKENS.get('ADDL_INSTALLED_APPS', []): From a4742bb040ccc1163f3d2d6541ab496bc2adfd02 Mon Sep 17 00:00:00 2001 From: Szczork Date: Sat, 19 Oct 2013 04:41:53 +0200 Subject: [PATCH 5/6] Translation-overrides --- AUTHORS | 1 + lms/envs/aws.py | 6 ++++-- lms/envs/common.py | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/AUTHORS b/AUTHORS index 2f4d7efeadd5..42c8351bb9f8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -90,3 +90,4 @@ Nick Parlante Marko Seric Felipe Montoya Julia Hansbrough +Nicolas Chevalier \ No newline at end of file diff --git a/lms/envs/aws.py b/lms/envs/aws.py index a3db7c43f695..041fa7f0d366 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -170,9 +170,11 @@ # Marketing link overrides MKTG_URL_LINK_MAP.update(ENV_TOKENS.get('MKTG_URL_LINK_MAP', {})) -# Timezone and translation overrides -LANGUAGES = ENV_TOKENS.get('LANGUAGES', ()) +# Timezone overrides TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) + +# Translation overrides +LANGUAGES = ENV_TOKENS.get('LANGUAGES', ()) LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE) USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N) diff --git a/lms/envs/common.py b/lms/envs/common.py index fe87c8900a5c..20e2f012b734 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -461,6 +461,7 @@ # Locale/Internationalization 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 +LANGUAGES = () # 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 From 1acb46aed3a73f30fdc92cabd87831a3e96082a4 Mon Sep 17 00:00:00 2001 From: Szczork Date: Sat, 19 Oct 2013 13:47:41 +0200 Subject: [PATCH 6/6] Translation overrides --- lms/envs/aws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index 041fa7f0d366..7fe8d8e10f96 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -174,7 +174,7 @@ TIME_ZONE = ENV_TOKENS.get('TIME_ZONE', TIME_ZONE) # Translation overrides -LANGUAGES = ENV_TOKENS.get('LANGUAGES', ()) +LANGUAGES = ENV_TOKENS.get('LANGUAGES', LANGUAGES) LANGUAGE_CODE = ENV_TOKENS.get('LANGUAGE_CODE', LANGUAGE_CODE) USE_I18N = ENV_TOKENS.get('USE_I18N', USE_I18N)