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

[rails.git] / db / seeds.rb

diff --git a/db/seeds.rb b/db/seeds.rb
index 1beea2accd7ed91d080b323eef17dba95e95e27f..742704b51ccfecd78b92153154ea7804d1f99b20 100644 (file)
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -5,3 +5,5 @@
 #
 #   movies = Movie.create([{ name: 'Star Wars' }, { name: 'Lord of the Rings' }])
 #   Character.create(name: 'Luke', movie: movies.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"))