From: Go MAEDA <maeda@farend.jp>
Date: Thu, 25 Mar 2021 04:39:18 +0000 (+0000)
Subject: Fix hard-coded error messages in ApplicationController (#33232).
X-Git-Tag: 4.2.0~18
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9783ba003d7e6a2d539c4be404c666a6aa5a4b25;p=redmine.git

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
---

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
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2ff0ae432..9d779a2fe 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -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:'