From 223141a20b27ed41d05e11394f895be160b32d1d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Apr 2016 18:54:28 +0000
Subject: [PATCH] Support of default Active Record (I18n) transliteration paths
 (#22383).

Patch by Ivan Zabrovskiy.

git-svn-id: http://svn.redmine.org/redmine/trunk@15330 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/initializers/10-patches.rb             | 20 ++++++++++++++++---
 .../api_test/issue_relations_test.rb          |  2 +-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index dae04fc98..a42b33b00 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -4,9 +4,23 @@ module ActiveRecord
   class Base
     include Redmine::I18n
     # Translate attribute names for validation errors display
-    def self.human_attribute_name(attr, *args)
-      attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
-      l("field_#{name.underscore.gsub('/', '_')}_#{attr}", :default => ["field_#{attr}".to_sym, attr])
+    def self.human_attribute_name(attr, options = {})
+      prepared_attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
+
+      redmine_default =
+          [
+              :"field_#{name.underscore.gsub('/', '_')}_#{prepared_attr}",
+              :"field_#{prepared_attr}"
+          ]
+
+      if options[:default].present?
+        options[:default] = [options[:default]] unless options[:default].is_a? Array
+        options[:default].unshift redmine_default
+      else
+        options[:default] = redmine_default
+      end
+
+      super
     end
   end
 
diff --git a/test/integration/api_test/issue_relations_test.rb b/test/integration/api_test/issue_relations_test.rb
index 125346dde..752cb3fe3 100644
--- a/test/integration/api_test/issue_relations_test.rb
+++ b/test/integration/api_test/issue_relations_test.rb
@@ -57,7 +57,7 @@ class Redmine::ApiTest::IssueRelationsTest < Redmine::ApiTest::Base
     end
 
     assert_response :unprocessable_entity
-    assert_select 'errors error', :text => /relation_type is not included in the list/
+    assert_select 'errors error', :text => /Relation type is not included in the list/
   end
 
   test "GET /relations/:id.xml should return the relation" do