From 9fb06ee439884e3c70a21779391c693cf3a975b5 Mon Sep 17 00:00:00 2001 From: cmilfont Date: Fri, 9 Oct 2009 15:55:42 -0300 Subject: [PATCH] back the code for create a patch --- activerecord/lib/active_record/reflection.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index fd525c2..da234b6 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -245,7 +245,7 @@ module ActiveRecord private def derive_class_name class_name = name.to_s.camelize - class_name = name.to_s.singularize.camelize if [ :has_many, :has_and_belongs_to_many ].include?(macro) + class_name = class_name.singularize if [ :has_many, :has_and_belongs_to_many ].include?(macro) class_name end -- 1.5.6.3 From 58cbce097a32b2bf4dac92f0cd4f1023010a3421 Mon Sep 17 00:00:00 2001 From: cmilfont Date: Fri, 9 Oct 2009 15:56:13 -0300 Subject: [PATCH] fix in reflection.rb for has_many with inflection in pt-br names --- activerecord/lib/active_record/reflection.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb index da234b6..fd525c2 100644 --- a/activerecord/lib/active_record/reflection.rb +++ b/activerecord/lib/active_record/reflection.rb @@ -245,7 +245,7 @@ module ActiveRecord private def derive_class_name class_name = name.to_s.camelize - class_name = class_name.singularize if [ :has_many, :has_and_belongs_to_many ].include?(macro) + class_name = name.to_s.singularize.camelize if [ :has_many, :has_and_belongs_to_many ].include?(macro) class_name end -- 1.5.6.3