From 826919c97c3fa61f46bef2e2a3708a16f956cfce Mon Sep 17 00:00:00 2001 From: Sebastian Spaeth Date: Sun, 2 Dec 2012 02:35:04 +0100 Subject: en_US is always available We were using "en" as fallback only when no preferred language matched. This is obviously bad. Always insert en_US as available locale, so we can match it with the accept_languages. Don't set available_locales as mg_global, per discussion with paroneaya, make it a global var in translate.py Signed-off-by: Sebastian Spaeth --- mediagoblin/init/__init__.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mediagoblin/init') diff --git a/mediagoblin/init/__init__.py b/mediagoblin/init/__init__.py index 88af377e..8d70c4ef 100644 --- a/mediagoblin/init/__init__.py +++ b/mediagoblin/init/__init__.py @@ -19,7 +19,7 @@ from beaker.util import parse_cache_config_options import jinja2 from mediagoblin.tools import staticdirect -from mediagoblin.tools.translate import get_available_locales +from mediagoblin.tools.translate import set_available_locales from mediagoblin.init.config import ( read_mediagoblin_config, generate_validation_report) from mediagoblin import mg_globals @@ -40,7 +40,7 @@ class ImproperlyConfigured(Error): def setup_locales(): """Checks which language translations are available and sets them""" - setup_globals(available_locales=get_available_locales()) + set_available_locales() def setup_global_and_app_config(config_path): -- cgit v1.2.3