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

[rails.git] / db / migrate / 034_create_languages.rb

diff --git a/db/migrate/034_create_languages.rb b/db/migrate/034_create_languages.rb
index 8f5244f22b497ff652c86116ead724ab2c9bda41..24590355168c4d89b60fd420a2855945cef24244 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -1,6 +1,4 @@
-require 'migrate'
-
-class CreateLanguages < ActiveRecord::Migration
+class CreateLanguages < ActiveRecord::Migration[4.2]
   def change
     create_table :languages, :id => false do |t|
       t.string :code, :null => false
@@ -10,7 +8,7 @@ class CreateLanguages < ActiveRecord::Migration
 
     add_primary_key :languages, [:code]
 
-    Language.load("#{Rails.root}/config/languages.yml")
+    Language.load(Rails.root.join("config/languages.yml"))
 
     add_foreign_key :users, :languages, :column => :locale, :primary_key => :code, :name => "users_locale_fkey"
     add_foreign_key :diary_entries, :languages, :column => :language_code, :primary_key => :code, :name => "diary_entries_language_code_fkey"