From dfb78be2a7d79925d35b1c25bf9a86f36f188cd9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Apr 2016 19:07:54 +0000
Subject: [PATCH] Code cleanup (#22383).

git-svn-id: http://svn.redmine.org/redmine/trunk@15331 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/initializers/10-patches.rb | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
index a42b33b00..ef8b930ef 100644
--- a/config/initializers/10-patches.rb
+++ b/config/initializers/10-patches.rb
@@ -6,19 +6,14 @@ module ActiveRecord
     # Translate attribute names for validation errors display
     def self.human_attribute_name(attr, options = {})
       prepared_attr = attr.to_s.sub(/_id$/, '').sub(/^.+\./, '')
+      class_prefix = name.underscore.gsub('/', '_')
 
-      redmine_default =
-          [
-              :"field_#{name.underscore.gsub('/', '_')}_#{prepared_attr}",
-              :"field_#{prepared_attr}"
-          ]
+      redmine_default = [
+        :"field_#{class_prefix}_#{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
+      options[:default] = redmine_default + Array(options[:default])
 
       super
     end