aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorthenickcox <nick@nickcox.me>2013-04-17 20:25:05 -0700
committerthenickcox <nick@nickcox.me>2013-04-17 20:26:16 -0700
commit431b236f5df90e552179424f090f7f9f8ecd7dab (patch)
treeb7254a8dfa0813dbc220c1511b2405f86c125aed /activerecord/lib
parenta7ef0982d44c7bdac5e41a1a97afb8eaa537d6db (diff)
downloadrails-431b236f5df90e552179424f090f7f9f8ecd7dab.tar.gz
rails-431b236f5df90e552179424f090f7f9f8ecd7dab.tar.bz2
rails-431b236f5df90e552179424f090f7f9f8ecd7dab.zip
Fix subject-verb agreement in error msg (and other grammar stuff)
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/railties/databases.rake6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/railties/databases.rake b/activerecord/lib/active_record/railties/databases.rake
index 78afed5e91..26200e1ba6 100644
--- a/activerecord/lib/active_record/railties/databases.rake
+++ b/activerecord/lib/active_record/railties/databases.rake
@@ -156,7 +156,7 @@ db_namespace = namespace :db do
begin
puts ActiveRecord::Tasks::DatabaseTasks.collation_current
rescue NoMethodError
- $stderr.puts 'Sorry, your database adapter is not supported yet, feel free to submit a patch'
+ $stderr.puts 'Sorry, your database adapter is not supported yet. Feel free to submit a patch.'
end
end
@@ -170,7 +170,7 @@ db_namespace = namespace :db do
pending_migrations = ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations
if pending_migrations.any?
- puts "You have #{pending_migrations.size} pending migrations:"
+ puts "You have #{pending_migrations.size} pending #{pending_migrations.size > 1 ? 'migrations:' : 'migration:'}"
pending_migrations.each do |pending_migration|
puts ' %4d %s' % [pending_migration.version, pending_migration.name]
end
@@ -241,7 +241,7 @@ db_namespace = namespace :db do
if File.exists?(file)
load(file)
else
- abort %{#{file} doesn't exist yet. Run `rake db:migrate` to create it then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded}
+ abort %{#{file} doesn't exist yet. Run `rake db:migrate` to create it, then try again. If you do not intend to use a database, you should instead alter #{Rails.root}/config/application.rb to limit the frameworks that will be loaded.}
end
end