Cleaned up ActiveRecord i18n scoping

actionpack/lib/action_view/helpers/active_record_helper.rb

@@ -189,15 +189,15 @@ def error_messages_for(*params)
           end
           options[:object_name] ||= params.first
 
-          I18n.with_options :locale => options[:locale], :scope => [:active_record, :error] do |locale|
+          I18n.with_options :locale => options[:locale], :scope => [:activerecord, :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(object_name, :default => object_name)
-              locale.t :header_message, :count => count, :object_name => object_name
+              object_name = I18n.t(object_name, :default => object_name, :scope => [:activerecord, :models], :count => 1)
+              locale.t :header, :count => count, :model => object_name
             end
-            message = options.include?(:message) ? options[:message] : locale.t(:message)
+            message = options.include?(:message) ? options[:message] : locale.t(:body)
             error_messages = objects.sum {|object| object.errors.full_messages.map {|msg| content_tag(:li, msg) } }.join
 
             contents = ''

actionpack/lib/action_view/locale/en-US.rb

@@ -74,14 +74,16 @@
         }
       }
     },
-    :active_record => {
-      :error => {
-        :header_message => {
-          :one => "1 error prohibited this {{object_name}} from being saved", 
-          :many => "{{count}} errors prohibited this {{object_name}} from being saved"
-        },
-        :message => "There were problems with the following fields:"
+    :activerecord => {
+      :errors => {
+        :template => {
+          :header => {
+            :one => "1 error prohibited this {{model}} from being saved", 
+            :many => "{{count}} errors prohibited this {{model}} from being saved"
+          },
+          :body => "There were problems with the following fields:"
+        }
       }
     }
   }
-}
+}

actionpack/test/template/active_record_helper_i18n_test.rb

@@ -10,37 +10,37 @@ def setup
       @object_name = 'book'
       stubs(:content_tag).returns 'content_tag'
 
-      I18n.stubs(:t).with(:'header_message', :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => '').returns "1 error prohibited this  from being saved"
-      I18n.stubs(:t).with(:'message', :locale => 'en-US', :scope => [:active_record, :error]).returns 'There were problems with the following fields:'
+      I18n.stubs(:t).with(:'header', :locale => 'en-US', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns "1 error prohibited this  from being saved"
+      I18n.stubs(:t).with(:'body', :locale => 'en-US', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
     end
 
-    def test_error_messages_for_given_a_header_message_option_it_does_not_translate_header_message
-      I18n.expects(:translate).with(:'header_message', :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => '').never
+    def test_error_messages_for_given_a_header_option_it_does_not_translate_header_message
+      I18n.expects(:translate).with(:'header', :locale => 'en-US', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').never
       error_messages_for(:object => @object, :header_message => 'header message', :locale => 'en-US')
     end
 
-    def test_error_messages_for_given_no_header_message_option_it_translates_header_message
-      I18n.expects(:t).with(:'header_message', :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => '').returns 'header message'
-      I18n.expects(:t).with('', :default => '').once.returns ''
+    def test_error_messages_for_given_no_header_option_it_translates_header_message
+      I18n.expects(:t).with(:'header', :locale => 'en-US', :scope => [:activerecord, :errors, :template], :count => 1, :model => '').returns 'header message'
+      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
       error_messages_for(:object => @object, :locale => 'en-US')
     end
 
     def test_error_messages_for_given_a_message_option_it_does_not_translate_message
-      I18n.expects(:t).with(:'message', :locale => 'en-US', :scope => [:active_record, :error]).never
-      I18n.expects(:t).with('', :default => '').once.returns ''
+      I18n.expects(:t).with(:'body', :locale => 'en-US', :scope => [:activerecord, :errors, :template]).never
+      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
       error_messages_for(:object => @object, :message => 'message', :locale => 'en-US')
     end
 
     def test_error_messages_for_given_no_message_option_it_translates_message
-      I18n.expects(:t).with(:'message', :locale => 'en-US', :scope => [:active_record, :error]).returns 'There were problems with the following fields:'
-      I18n.expects(:t).with('', :default => '').once.returns ''
+      I18n.expects(:t).with(:'body', :locale => 'en-US', :scope => [:activerecord, :errors, :template]).returns 'There were problems with the following fields:'
+      I18n.expects(:t).with('', :default => '', :count => 1, :scope => [:activerecord, :models]).once.returns ''
       error_messages_for(:object => @object, :locale => 'en-US')
     end
 
     def test_error_messages_for_given_object_name_it_translates_object_name
-      I18n.expects(:t).with(:header_message, :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
-      I18n.expects(:t).with(@object_name, :default => @object_name).once.returns @object_name
+      I18n.expects(:t).with(:header, :locale => 'en-US', :scope => [:activerecord, :errors, :template], :count => 1, :model => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
+      I18n.expects(:t).with(@object_name, :default => @object_name, :count => 1, :scope => [:activerecord, :models]).once.returns @object_name
       error_messages_for(:object => @object, :locale => 'en-US', :object_name => @object_name)
     end
   end
-end
+end

activerecord/lib/active_record/base.rb

@@ -1220,13 +1220,35 @@ def reset_column_information_and_inheritable_attributes_for_all_subclasses#:nodo
         subclasses.each { |klass| klass.reset_inheritable_attributes; klass.reset_column_information }
       end
 
+      def self_and_descendents_from_active_record#nodoc:
+        klass = self
+        classes = [klass]
+        while klass != klass.base_class  
+          classes << klass = klass.superclass
+        end
+        classes
+      rescue
+        # OPTIMIZE this rescue is to fix this test: ./test/cases/reflection_test.rb:56:in `test_human_name_for_column'
+        # Appearantly the method base_class causes some trouble.
+        # It now works for sure.
+        [self]
+      end
+
       # Transforms attribute key names into a more humane format, such as "First name" instead of "first_name". Example:
       #   Person.human_attribute_name("first_name") # => "First name"
-      # Deprecated in favor of just calling "first_name".humanize
-      def human_attribute_name(attribute_key_name) #:nodoc:
-        attribute_key_name.humanize
+      # This used to be depricated in favor of humanize, but is now preferred, because it automatically uses the I18n
+      # module now.
+      # Specify +options+ with additional translating options.
+      def human_attribute_name(attribute_key_name, options = {})
+        defaults = self_and_descendents_from_active_record.map do |klass|
+          :"#{klass.name.underscore}.#{attribute_key_name}"
+        end
+        defaults << options[:default] if options[:default]
+        defaults.flatten!
+        defaults << attribute_key_name.humanize
+        options[:count] ||= 1
+        I18n.translate(defaults.shift, options.merge(:default => defaults, :scope => [:activerecord, :attributes]))
       end
-
       # True if this isn't a concrete subclass needing a STI type condition.
       def descends_from_active_record?
         if superclass.abstract_class?

activerecord/lib/active_record/locale/en-US.rb

@@ -1,26 +1,28 @@
 { :'en-US' => {
-    :active_record => {
-      :error_messages => {
-        :inclusion => "is not included in the list",
-        :exclusion => "is reserved",
-        :invalid => "is invalid",
-        :confirmation => "doesn't match confirmation",
-        :accepted  => "must be accepted",
-        :empty => "can't be empty",
-        :blank => "can't be blank",
-        :too_long => "is too long (maximum is {{count}} characters)",
-        :too_short => "is too short (minimum is {{count}} characters)",
-        :wrong_length => "is the wrong length (should be {{count}} characters)",
-        :taken => "has already been taken",
-        :not_a_number => "is not a number",
-        :greater_than => "must be greater than {{count}}",
-        :greater_than_or_equal_to => "must be greater than or equal to {{count}}",
-        :equal_to => "must be equal to {{count}}",
-        :less_than => "must be less than {{count}}",
-        :less_than_or_equal_to => "must be less than or equal to {{count}}",
-        :odd => "must be odd",
-        :even => "must be even"
-      }            
+    :activerecord => {
+      :errors => {
+        :messages => {
+          :inclusion => "is not included in the list",
+          :exclusion => "is reserved",
+          :invalid => "is invalid",
+          :confirmation => "doesn't match confirmation",
+          :accepted  => "must be accepted",
+          :empty => "can't be empty",
+          :blank => "can't be blank",
+          :too_long => "is too long (maximum is {{count}} characters)",
+          :too_short => "is too short (minimum is {{count}} characters)",
+          :wrong_length => "is the wrong length (should be {{count}} characters)",
+          :taken => "has already been taken",
+          :not_a_number => "is not a number",
+          :greater_than => "must be greater than {{count}}",
+          :greater_than_or_equal_to => "must be greater than or equal to {{count}}",
+          :equal_to => "must be equal to {{count}}",
+          :less_than => "must be less than {{count}}",
+          :less_than_or_equal_to => "must be less than or equal to {{count}}",
+          :odd => "must be odd",
+          :even => "must be even"
+        }            
+      }
     }
   }
-}
+}