diff options
| author | Joar Wandborg <git@wandborg.com> | 2012-09-27 21:41:48 +0200 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2012-09-29 21:08:20 +0200 |
| commit | f1d06e1d6c604c72028082a477248d26e81cad5b (patch) | |
| tree | d541c710e0788bf81e7b2f336d534e074f55ffc6 /mediagoblin/tools | |
| parent | 8518e95eb64ff2864d7880f8bfff9df1828fb848 (diff) | |
| download | mediagoblin-f1d06e1d6c604c72028082a477248d26e81cad5b.tar.lz mediagoblin-f1d06e1d6c604c72028082a477248d26e81cad5b.tar.xz mediagoblin-f1d06e1d6c604c72028082a477248d26e81cad5b.zip | |
Switch from webob.Request to werkzeug.wrappers.Request
Diffstat (limited to 'mediagoblin/tools')
| -rw-r--r-- | mediagoblin/tools/translate.py | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/mediagoblin/tools/translate.py b/mediagoblin/tools/translate.py index 5ab62a07..71c3b793 100644 --- a/mediagoblin/tools/translate.py +++ b/mediagoblin/tools/translate.py @@ -68,23 +68,14 @@ def get_locale_from_request(request): # Your routing can explicitly specify a target language matchdict = request.matchdict or {} - if matchdict.has_key('locale'): + if 'locale' in matchdict: target_lang = matchdict['locale'] - elif request.session.has_key('target_lang'): + elif 'target_lang' in request.session: target_lang = request.session['target_lang'] # Pull the first acceptable language or English else: - # 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') + # TODO: Internationalization broken + target_lang = 'en' return locale_to_lower_upper(target_lang) |