Skip to content
This repository
Browse code

Fix spelling of an internal method [#1734 state:resolved]

Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
  • Loading branch information...
commit 3c64c9a5756193247ac87bb55326b6387dfd3070 1 parent 47bdf3b
Chris Kampmeier authored March 12, 2009 lifo committed March 12, 2009
6  activerecord/lib/active_record/base.rb
@@ -1344,7 +1344,7 @@ def reset_column_information_and_inheritable_attributes_for_all_subclasses#:nodo
1344 1344
         subclasses.each { |klass| klass.reset_inheritable_attributes; klass.reset_column_information }
1345 1345
       end
1346 1346
 
1347  
-      def self_and_descendents_from_active_record#nodoc:
  1347
+      def self_and_descendants_from_active_record#nodoc:
1348 1348
         klass = self
1349 1349
         classes = [klass]
1350 1350
         while klass != klass.base_class  
@@ -1364,7 +1364,7 @@ def self_and_descendents_from_active_record#nodoc:
1364 1364
       # module now.
1365 1365
       # Specify +options+ with additional translating options.
1366 1366
       def human_attribute_name(attribute_key_name, options = {})
1367  
-        defaults = self_and_descendents_from_active_record.map do |klass|
  1367
+        defaults = self_and_descendants_from_active_record.map do |klass|
1368 1368
           :"#{klass.name.underscore}.#{attribute_key_name}"
1369 1369
         end
1370 1370
         defaults << options[:default] if options[:default]
@@ -1379,7 +1379,7 @@ def human_attribute_name(attribute_key_name, options = {})
1379 1379
       # Default scope of the translation is activerecord.models
1380 1380
       # Specify +options+ with additional translating options.
1381 1381
       def human_name(options = {})
1382  
-        defaults = self_and_descendents_from_active_record.map do |klass|
  1382
+        defaults = self_and_descendants_from_active_record.map do |klass|
1383 1383
           :"#{klass.name.underscore}"
1384 1384
         end 
1385 1385
         defaults << self.name.humanize
2  activerecord/lib/active_record/validations.rb
@@ -89,7 +89,7 @@ def generate_message(attribute, message = :invalid, options = {})
89 89
 
90 90
       message, options[:default] = options[:default], message if options[:default].is_a?(Symbol)
91 91
 
92  
-      defaults = @base.class.self_and_descendents_from_active_record.map do |klass| 
  92
+      defaults = @base.class.self_and_descendants_from_active_record.map do |klass|
93 93
         [ :"models.#{klass.name.underscore}.attributes.#{attribute}.#{message}", 
94 94
           :"models.#{klass.name.underscore}.#{message}" ]
95 95
       end

0 notes on commit 3c64c9a

Please sign in to comment.
Something went wrong with that request. Please try again.