Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-02 11:25:55 +01:00
Code Issues Packages Projects Releases Activity

Fixed: The error flash message on session expiration is not in the language of the user but of the user of the previous request (#17023).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13391 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-09-13 10:35:46 +00:00
parent e124da5488
commit 77b0abb79c
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/application_controller.rb
View File

@@ -61,6 +61,7 @@ class ApplicationController < ActionController::Base
def session_expiration
if session[:user_id]
if session_expired? && !try_to_autologin
set_localization(User.active.find_by_id(session[:user_id]))
reset_session
flash[:error] = l(:error_session_expired)
redirect_to signin_url
@@ -197,10 +198,10 @@ class ApplicationController < ActionController::Base
end
end
def set_localization
def set_localization(user=User.current)
lang = nil
if User.current.logged?
lang = find_language(User.current.language)
if user && user.logged?
lang = find_language(user.language)
end
if lang.nil? && !Setting.force_default_language_for_anonymous? && request.env['HTTP_ACCEPT_LANGUAGE']
accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first