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

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
b9e95e7a · Jean-Philippe Lang · 33e7ae96 · b9e95e7a
Commit b9e95e7a authored Feb 20, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

application_helper.rb app/helpers/application_helper.rb +5 -5

No files found.
--- 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 << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
+          full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + 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 << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
+            msg = [msg] unless msg.is_a?(Array)
+            full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(*msg)
          end
        end
      end