Merge branch 'master' into openstreetbugs

[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 ab5a7eee65ed3b7122a5e52b31b99b254e2b514f..95ed7d9cedac1235756aa763582016e1e9fef08c 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -10,13 +10,13 @@ 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}/config/languages.yml")

 
     add_foreign_key :users, [:locale], :languages, [:code]
     add_foreign_key :diary_entries, [:language_code], :languages, [:code]    
   end
 
   def self.down
 
     add_foreign_key :users, [:locale], :languages, [:code]
     add_foreign_key :diary_entries, [:language_code], :languages, [:code]    
   end
 
   def self.down

-    raise IrreversibleMigration.new
+    raise ActiveRecord::IrreversibleMigration

   end
 end
   end
 end