aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2004-12-23 01:08:51 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2004-12-23 01:08:51 +0000
commit1f94ac2c4571143ed90a145aea1b366f827e3b28 (patch)
treeb578fe268e4ac73d9294d7ceb715dfdb7b3bc2ce /railties
parent4ff4afa57949e6a7a4d3d200531932207f97da8e (diff)
downloadrails-1f94ac2c4571143ed90a145aea1b366f827e3b28.tar.gz
rails-1f94ac2c4571143ed90a145aea1b366f827e3b28.tar.bz2
rails-1f94ac2c4571143ed90a145aea1b366f827e3b28.zip
Touched up wording on the new recommendation stuff for generate models
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@264 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
-rwxr-xr-xrailties/bin/generate7
-rw-r--r--railties/lib/rails_generator.rb7
2 files changed, 7 insertions, 7 deletions
diff --git a/railties/bin/generate b/railties/bin/generate
index ec6d04126e..c034c57548 100755
--- a/railties/bin/generate
+++ b/railties/bin/generate
@@ -26,9 +26,10 @@ unless ARGV.empty?
$stderr.puts msg
if synonyms = find_synonyms(generator.class_name) then
- $stderr.puts "", "Here's a few synonyms from WordNets.",
- "Maybe they will help you find an alternative name."
+ $stderr.puts(
+ "", "Here are a few synonyms from WordNets. Maybe they will help you find an alternative name.",
"", synonyms
+ )
end
else
generator.generate
@@ -65,4 +66,4 @@ end_usage
#{$0} login
end_usage
exit 0
-end
+end \ No newline at end of file
diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb
index 38b8daee49..83a404fc0a 100644
--- a/railties/lib/rails_generator.rb
+++ b/railties/lib/rails_generator.rb
@@ -126,10 +126,9 @@ module Rails
end
if builtin then
- "Sorry, you can't have a #{self.class.generator_name} named\n" +
- "'#{full_class_name}' because Ruby or RubyOnRails already has\n" +
- "a #{type} with that name. Please rerun the generator with a\n" +
- "different name."
+ "Sorry, you can't have a #{self.class.generator_name} named " +
+ "'#{full_class_name}' because Ruby or Rails already has a #{type} with that name.\n" +
+ "Please rerun the generator with a different name."
end
end