heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fallback to "en_US" if browser does not send preferred languages

Browse Source 
E.g. in our test suite we don't send an "accepted languages" header, which
caused the language matching to fail. So we need to explicitely fallback to
en_US, in case request.accepted_languages is None. This fixes the tests and
all cases where user browsers don't send preferred languages.

This also fixes issue #562, the AVAILABLE_LOCALES are already case-normalized
and we don't need to fudge the preferred language through the lower_upper_locale
thing for each and every request.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth 2012-12-04 09:44:07 +01:00
parent 78d932e792
commit c39b9afc83
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mediagoblin/tools/translate.py
View File

@ -69,29 +69,26 @@ def locale_to_lower_lower(locale):
def get_locale_from_request(request): def get_locale_from_request(request):
""" """
Figure out what target language is most appropriate based on the Return most appropriate language based on prefs/request request
request
""" """
global AVAILABLE_LOCALES request_args = (request.args, request.form)[request.method=='POST']
request_form = request.args or request.form
if request_form.has_key('lang'): if request_args.has_key('lang'):
# User explicitely demanded a language # User explicitely demanded a language, normalize lower_uppercase
target_lang = request_form['lang'] target_lang = locale_to_lower_upper(request_args['lang'])
elif 'target_lang' in request.session: elif 'target_lang' in request.session:
# TODO: Uh, ohh, this is never ever set anywhere? # TODO: Uh, ohh, this is never ever set anywhere?
target_lang = request.session['target_lang'] target_lang = request.session['target_lang']
else: else:
# Pull the first acceptable language or English # Pull the most acceptable language based on browser preferences
# This picks your favorite browser lingo, falling back to 'en' # This returns one of AVAILABLE_LOCALES which is aready case-normalized.
# Note: in our tests request.accept_languages is None, so we need
# to explicitely fallback to en here.
target_lang = request.accept_languages.best_match(AVAILABLE_LOCALES) \
or "en_US"
# TODO: We need a list of available locales, and match with the list return target_lang
# of accepted locales, and serve the best available locale rather than
# the most preferred, or fall back to 'en' immediately.
target_lang = request.accept_languages.best_match(AVAILABLE_LOCALES)
return locale_to_lower_upper(target_lang)
SETUP_GETTEXTS = {} SETUP_GETTEXTS = {}