From b9e95e7a708501b62a2a886a544b97dbf41838b8 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Fri, 20 Feb 2009 18:55:56 +0000 Subject: [PATCH] Fixes "too few arguments" error on activerecord error translation (#2626). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2486 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 2872c14a..5b63ecd5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -573,11 +573,11 @@ module ApplicationHelper full_messages = [] object.errors.each do |attr, msg| next if msg.nil? - msg = msg.first if msg.is_a? Array + msg = [msg] unless msg.is_a?(Array) if attr == "base" - full_messages << l(msg) + full_messages << l(*msg) else - full_messages << "« " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " » " + l(msg) unless attr == "custom_values" + full_messages << "« " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " » " + l(*msg) unless attr == "custom_values" end end # retrieve custom values error messages @@ -585,8 +585,8 @@ module ApplicationHelper object.custom_values.each do |v| v.errors.each do |attr, msg| next if msg.nil? - msg = msg.first if msg.is_a? Array - full_messages << "« " + v.custom_field.name + " » " + l(msg) + msg = [msg] unless msg.is_a?(Array) + full_messages << "« " + v.custom_field.name + " » " + l(*msg) end end end -- 2.11.0