meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity

Fix hard-coded error messages in ApplicationController (#33232).

Browse Source 
Contributed by Kam Nazir.


git-svn-id: http://svn.redmine.org/redmine/trunk@20843 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-03-25 04:39:18 +00:00
parent 8e3a857802
commit 9783ba003d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

@ -52,7 +52,7 @@ class ApplicationController < ActionController::Base
cookies.delete(autologin_cookie_name)
self.logged_user = nil
set_localization
render_error :status => 422, :message => "Invalid form authenticity token."
render_error :status => 422, :message => l(:error_invalid_authenticity_token)
end
end
@ -722,7 +722,7 @@ class ApplicationController < ActionController::Base
def query_statement_invalid(exception)
logger.error "Query::StatementInvalid: #{exception.message}" if logger
session.delete(:issue_query)
render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
render_error l(:error_query_statement_invalid)
end
# Renders a 204 response for successful updates or deletions via the API

2
config/locales/en.yml
View File

@ -242,6 +242,8 @@ en:
error_filename_required: "Filename required"
error_invalid_size_parameter: "Invalid size parameter"
error_attachment_not_found: "Attachment %{name} not found"
error_invalid_authenticity_token: "Invalid form authenticity token."
error_query_statement_invalid: "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator."
mail_subject_lost_password: "Your %{value} password"
mail_body_lost_password: 'To change your password, click on the following link:'