Merge remote branch 'mainstream/master'

Conflicts:
	activesupport/lib/active_support/core_ext/hash/conversions.rb

1 files changed, 16 insertions, 12 deletions

diff --git a/actionpack/lib/action_view/helpers/active_model_helper.rb b/actionpack/lib/action_view/helpers/active_model_helper.rb
index 7cc1e48572..c70f29f098 100644
--- a/actionpack/lib/action_view/helpers/active_model_helper.rb
+++ b/actionpack/lib/action_view/helpers/active_model_helper.rb
@@ -191,19 +191,19 @@ module ActionView
         options = params.extract_options!.symbolize_keys
 
         objects = Array.wrap(options.delete(:object) || params).map do |object|
-          unless object.respond_to?(:to_model)
-            object = instance_variable_get("@#{object}")
-            object = convert_to_model(object)
-          else
-            object = object.to_model
-            options[:object_name] ||= object.class.model_name.human
+          object = instance_variable_get("@#{object}") unless object.respond_to?(:to_model)
+          object = convert_to_model(object)
+
+          if object.class.respond_to?(:model_name)
+            options[:object_name] ||= object.class.model_name.human.downcase
           end
+
           object
         end
 
         objects.compact!
-
         count = objects.inject(0) {|sum, object| sum + object.errors.count }
+
         unless count.zero?
           html = {}
           [:id, :class].each do |key|
@@ -216,16 +216,20 @@ module ActionView
           end
           options[:object_name] ||= params.first
 
-          I18n.with_options :locale => options[:locale], :scope => [:activerecord, :errors, :template] do |locale|
+          I18n.with_options :locale => options[:locale], :scope => [:activemodel, :errors, :template] do |locale|
             header_message = if options.include?(:header_message)
               options[:header_message]
             else
-              object_name = options[:object_name].to_s.gsub('_', ' ')
-              object_name = I18n.t(options[:object_name].to_s, :default => object_name, :scope => [:activerecord, :models], :count => 1)
-              locale.t :header, :count => count, :model => object_name
+              locale.t :header, :count => count, :model => options[:object_name].to_s.gsub('_', ' ')
             end
+
             message = options.include?(:message) ? options[:message] : locale.t(:body)
-            error_messages = objects.sum {|object| object.errors.full_messages.map {|msg| content_tag(:li, ERB::Util.html_escape(msg)) } }.join
+
+            error_messages = objects.sum do |object|
+              object.errors.full_messages.map do |msg|
+                content_tag(:li, ERB::Util.html_escape(msg))
+              end
+            end.join
 
             contents = ''
             contents << content_tag(options[:header_tag] || :h2, header_message) unless header_message.blank?