Update to iD v2.6.0

[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 05a70e7a9771092d1645fad3df60c107295dde08..603ad30665fb317ef137ed7c8ecabb26c4d6f14c 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -1,6 +1,6 @@
 require "migrate"
 
 require "migrate"
 

-class CreateLanguages < ActiveRecord::Migration
+class CreateLanguages < ActiveRecord::Migration[5.0]

   def change
     create_table :languages, :id => false do |t|
       t.string :code, :null => false
   def change
     create_table :languages, :id => false do |t|
       t.string :code, :null => false


@@ -10,7 +10,7 @@ class CreateLanguages < ActiveRecord::Migration
 
     add_primary_key :languages, [:code]
 
 
     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"
 
     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"