cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Try preferred_language_from as it looks for an exact match - only if that

Browse source 
fails do we fall back to compatible_language_from which will take any
language where the first token matches. Fixes #2069.
This commit is contained in:
Tom Hughes 2009-07-15 23:29:07 +00:00
parent a5ab006122
commit 1368f194da
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/controllers/application_controller.rb
View file

@ -110,8 +110,9 @@ class ApplicationController < ActionController::Base
end
end
I18n.locale = request.compatible_language_from(I18n.available_locales)
I18n.locale = request.preferred_language_from(I18n.available_locales) ||
request.compatible_language_from(I18n.available_locales)
logger.info("Select #{I18n.locale} matching #{request.user_preferred_languages.join(',')} against #{I18n.available_locales.join(',')}")
response.headers['Content-Language'] = I18n.locale.to_s
end