summaryrefslogtreecommitdiffstats
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2021-03-25 04:39:18 +0000
committerGo MAEDA <maeda@farend.jp>2021-03-25 04:39:18 +0000
commit9783ba003d7e6a2d539c4be404c666a6aa5a4b25 (patch)
tree9334cc245f35beb35848c8ae086c07ea20c5462f /app/controllers/application_controller.rb
parent8e3a857802c5f529ba4a4f62065d13cdc0be7a9f (diff)
downloadredmine-9783ba003d7e6a2d539c4be404c666a6aa5a4b25.tar.gz
redmine-9783ba003d7e6a2d539c4be404c666a6aa5a4b25.zip
Fix hard-coded error messages in ApplicationController (#33232).
Contributed by Kam Nazir. git-svn-id: http://svn.redmine.org/redmine/trunk@20843 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7750120d7..d382421ae 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -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