From 0bd10720c2c0aec89b697d0e5e359cb3f0e9bf68 Mon Sep 17 00:00:00 2001 From: namusyaka Date: Wed, 4 Sep 2013 21:44:22 +0900 Subject: [PATCH] Remove code duplication in error_messages_for. --- padrino-helpers/lib/padrino-helpers/form_helpers.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/padrino-helpers/lib/padrino-helpers/form_helpers.rb b/padrino-helpers/lib/padrino-helpers/form_helpers.rb index abf2efbcd..839d0308e 100644 --- a/padrino-helpers/lib/padrino-helpers/form_helpers.rb +++ b/padrino-helpers/lib/padrino-helpers/form_helpers.rb @@ -194,19 +194,19 @@ def error_messages_for(*objects) end end - options[:object_name] ||= objects.first.class + options[:object_name] ||= objects.first.class.to_s.underscore.gsub(/\//, ' ') I18n.with_options :locale => options[:locale], :scope => [:models, :errors, :template] do |locale| header_message = if options.include?(:header_message) options[:header_message] else - object_name = options[:object_name].to_s.underscore.gsub(/\//, ' ') + object_name = options[:object_name] object_name = I18n.t(:name, :default => object_name.humanize, :scope => [:models, object_name], :count => 1) locale.t :header, :count => count, :model => object_name end message = options.include?(:message) ? options[:message] : locale.t(:body) error_messages = objects.map { |object| - object_name = options[:object_name].to_s.underscore.gsub(/\//, ' ') + object_name = options[:object_name] object.errors.map { |f, msg| field = I18n.t(f, :default => f.to_s.humanize, :scope => [:models, object_name, :attributes]) content_tag(:li, "%s %s" % [field, msg])