Merge remote-tracking branch 'upstream/pull/5374'

[rails.git] / db / seeds.rb

diff --git a/db/seeds.rb b/db/seeds.rb
index 664d8c74c881988e55df276a81f50d1d25b8d262..742704b51ccfecd78b92153154ea7804d1f99b20 100644 (file)
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -1,7 +1,9 @@
 # This file should contain all the record creation needed to seed the database with its default values.
 # This file should contain all the record creation needed to seed the database with its default values.

-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+# The data can then be loaded with the rails db:seed command (or created alongside the database with db:setup).

 #
 # Examples:
 #
 #
 # Examples:
 #

-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)
+#   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
+#   Character.create(name: 'Luke', movie: movies.first)
+
+Language.load(Rails.root.join("config/languages.yml"))