diff options
Diffstat (limited to 'mediagoblin/tools/translate.py')
| -rw-r--r-- | mediagoblin/tools/translate.py | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py index 2c2a710d..b99c4aa4 100644 --- a/mediagoblin/tools/translate.py +++ b/mediagoblin/tools/translate.py @@ -65,8 +65,6 @@ def get_locale_from_request(request): if request_form.has_key('lang'): return locale_to_lower_upper(request_form['lang']) - accept_lang_matches = request.accept_language.best_matches() - # Your routing can explicitly specify a target language matchdict = request.matchdict or {} @@ -74,12 +72,19 @@ def get_locale_from_request(request): target_lang = matchdict['locale'] elif request.session.has_key('target_lang'): target_lang = request.session['target_lang'] - # Pull the first acceptable language - elif accept_lang_matches: - target_lang = accept_lang_matches[0] - # Fall back to English + # Pull the first acceptable language or English else: - target_lang = 'en' + # WebOb recently changed how it handles determining best language. + # Here's a compromise commit that handles either/or... + if hasattr(request.accept_language, "best_matches"): + accept_lang_matches = request.accept_language.best_matches() + if accept_lang_matches: + target_lang = accept_lang_matches[0] + else: + target_lang = 'en' + else: + target_lang = request.accept.best_match( + request.accept_language, 'en') return locale_to_lower_upper(target_lang) |