aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorFrederick Cheung <frederick.cheung@gmail.com>2008-12-27 14:16:17 +0000
committerFrederick Cheung <frederick.cheung@gmail.com>2008-12-27 14:16:17 +0000
commitafdec83ed543e904b495d3225b6401101ea7ba6c (patch)
tree284c08299ca201d2a097c60e3e93f2a9735d762b /activerecord
parent21efba464afa2ae6e5dfd938ac8a3ce446faf7e7 (diff)
downloadrails-afdec83ed543e904b495d3225b6401101ea7ba6c.tar.gz
rails-afdec83ed543e904b495d3225b6401101ea7ba6c.tar.bz2
rails-afdec83ed543e904b495d3225b6401101ea7ba6c.zip
Fix to_sentence being used with options removed by 273c77
Diffstat (limited to 'activerecord')
-rwxr-xr-xactiverecord/lib/active_record/associations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 237e5c0e9d..eba10b505e 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -22,7 +22,7 @@ module ActiveRecord
through_reflection = reflection.through_reflection
source_reflection_names = reflection.source_reflection_names
source_associations = reflection.through_reflection.klass.reflect_on_all_associations.collect { |a| a.name.inspect }
- super("Could not find the source association(s) #{source_reflection_names.collect(&:inspect).to_sentence :connector => 'or'} in model #{through_reflection.klass}. Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => <name>'. Is it one of #{source_associations.to_sentence :connector => 'or'}?")
+ super("Could not find the source association(s) #{source_reflection_names.collect(&:inspect).to_sentence :two_words_connector => ' or ', :last_word_connector => ', or '} in model #{through_reflection.klass}. Try 'has_many #{reflection.name.inspect}, :through => #{through_reflection.name.inspect}, :source => <name>'. Is it one of #{source_associations.to_sentence :two_words_connector => ' or ', :last_word_connector => ', or '}?")
end
end