##// END OF EJS Templates
Merged r3702 from trunk....
Jean-Philippe Lang -
r3600:98f3e98d823e
parent child
Show More
@@ -107,8 +107,9 class ApplicationController < ActionController::Base
107 lang = find_language(User.current.language)
107 lang = find_language(User.current.language)
108 end
108 end
109 if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
109 if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
110 accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase
110 accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first
111 if !accept_lang.blank?
111 if !accept_lang.blank?
112 accept_lang = accept_lang.downcase
112 lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
113 lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
113 end
114 end
114 end
115 end
General Comments 0
You need to be logged in to leave comments. Login now