Feature #2691 » 0001-Redmine-default-locale-used-before-browser-locale-en.patch
| app/controllers/application_controller.rb | ||
|---|---|---|
|
if User.current.logged?
|
||
|
lang = find_language(User.current.language)
|
||
|
end
|
||
|
if lang.nil? && request.env['HTTP_ACCEPT_LANGUAGE']
|
||
|
lang ||= Setting.default_language
|
||
|
if lang.blank? && request.env['HTTP_ACCEPT_LANGUAGE']
|
||
|
accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase
|
||
|
if !accept_lang.blank?
|
||
|
lang = find_language(accept_lang) || find_language(accept_lang.split('-').first)
|
||
|
end
|
||
|
end
|
||
|
lang ||= Setting.default_language
|
||
|
set_language_if_valid(lang)
|
||
|
end
|
||
|
|
||
| app/views/settings/_display.rhtml | ||
|---|---|---|
|
<%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
|
||
|
<p><label><%= l(:setting_default_language) %></label>
|
||
|
<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
|
||
|
<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(true), Setting.default_language) %></p>
|
||
|
<p><label><%= l(:setting_date_format) %></label>
|
||
|
<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '']] + Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, Setting.date_format) %></p>
|
||