##// END OF EJS Templates
jro_apps » redmine
RSS
Fixes "too few arguments" error on activerecord error translation (#2626)....
Jean-Philippe Lang -
r2424:b9e95e7a7085
parent child
Show More
Side by Side Unified
Context file:
r2424:b9e95e7a7085 Loading diff...:
Show file before | Show file after | Hide comments
@@ -573,11 +573,11 module ApplicationHelper
573 573 full_messages = []
574 574 object.errors.each do |attr, msg|
575 575 next if msg.nil?
576 msg = msg.first if msg.is_a? Array
576 msg = [msg] unless msg.is_a?(Array)
577 577 if attr == "base"
578 full_messages << l(msg)
578 full_messages << l(*msg)
579 579 else
580 full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(msg) unless attr == "custom_values"
580 full_messages << "&#171; " + (l_has_string?("field_" + attr) ? l("field_" + attr) : object.class.human_attribute_name(attr)) + " &#187; " + l(*msg) unless attr == "custom_values"
581 581 end
582 582 end
583 583 # retrieve custom values error messages
@@ -585,8 +585,8 module ApplicationHelper
585 585 object.custom_values.each do |v|
586 586 v.errors.each do |attr, msg|
587 587 next if msg.nil?
588 msg = msg.first if msg.is_a? Array
589 full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(msg)
588 msg = [msg] unless msg.is_a?(Array)
589 full_messages << "&#171; " + v.custom_field.name + " &#187; " + l(*msg)
590 590 end
591 591 end
592 592 end
General Comments 0
You need to be logged in to leave comments. Login now