diff -r 2467fe762673 app/controllers/application_controller.rb --- a/app/controllers/application_controller.rb Wed Apr 28 19:30:31 2010 +0000 +++ b/app/controllers/application_controller.rb Thu Apr 29 11:34:38 2010 +0000 @@ -107,8 +107,9 @@ lang = find_language(User.current.language) end if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE'] - accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase + accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first if !accept_lang.blank? + accept_lang = accept_lang.downcase lang = find_language(accept_lang) || find_language(accept_lang.split('-').first) end end