aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails_generator/generators/components
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2005-09-28 00:06:39 +0000
committerMarcel Molina <marcel@vernix.org>2005-09-28 00:06:39 +0000
commit8e78e9335b6b6e86d5a55f9d00ea0ab699268cc5 (patch)
treea2eab5b1b6e41762122c1c18e6af6a730dcfe01b /railties/lib/rails_generator/generators/components
parent0b1abc3360706268618dabcb1868fb0406d997aa (diff)
downloadrails-8e78e9335b6b6e86d5a55f9d00ea0ab699268cc5.tar.gz
rails-8e78e9335b6b6e86d5a55f9d00ea0ab699268cc5.tar.bz2
rails-8e78e9335b6b6e86d5a55f9d00ea0ab699268cc5.zip
Make table_name and controller_name in generators honor AR::Base.pluralize_table_names.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2380 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/lib/rails_generator/generators/components')
-rw-r--r--railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
index 5ffe428fce..0f789efc83 100644
--- a/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
+++ b/railties/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
@@ -46,7 +46,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
def initialize(runtime_args, runtime_options = {})
super
- @controller_name = args.shift || @name.pluralize
+ @controller_name = args.shift || ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name
base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
@controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
if @controller_class_nesting.empty?