X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/dc2a2c8ebd1a11e4a64555fda22c6859a51defff..8a39c6b4a223160d47b293bc07d57d4e77685746:/db/migrate/034_create_languages.rb?ds=sidebyside

diff --git a/db/migrate/034_create_languages.rb b/db/migrate/034_create_languages.rb
index 05a70e7a9..459d7f647 100644
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -1,6 +1,6 @@
 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 +10,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"