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 daaf2199190d4c1669415bcf8633843cb5337956..ab5a7eee65ed3b7122a5e52b31b99b254e2b514f 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -3,25 +3,20 @@ require 'lib/migrate'
 class CreateLanguages < ActiveRecord::Migration
   def self.up
     create_table :languages, innodb_table do |t|
-      t.string :code, :limit => 5, :null => false
-      t.string :name, :null => false
-      t.boolean :translation_available, :null => false, :default => false
+      t.string :code, :null => false
+      t.string :english_name, :null => false
+      t.string :native_name
     end
 
     add_primary_key :languages, [:code]
 
-    Language.create do |l|
-      l.code = 'en'
-      l.name = 'English'
-      l.translation_available = true
-    end
+    Language.load(RAILS_ROOT + "/config/languages.yml")
 
     add_foreign_key :users, [:locale], :languages, [:code]
-    add_foreign_key :diary_entries, [:language], :languages, [:code]    
+    add_foreign_key :diary_entries, [:language_code], :languages, [:code]    
   end
 
   def self.down
     raise IrreversibleMigration.new
   end
 end
-