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 db34978a8ff856894e1bf1ef62c9f62ca6ac289d..ab5a7eee65ed3b7122a5e52b31b99b254e2b514f 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -2,20 +2,18 @@ require 'lib/migrate'
 
 class CreateLanguages < ActiveRecord::Migration
   def self.up
-    create_table :languages do |t|
-      t.string :language_code, :limit => 5, :null => false
-      t.string :name, :null => false
-      t.boolean :translation_available, :null => false, :default => false
-
-      t.timestamps
+    create_table :languages, innodb_table do |t|
+      t.string :code, :null => false
+      t.string :english_name, :null => false
+      t.string :native_name
     end
-    
-    add_index :languages, [:language_code], :unique => true
 
-    Language.create(:language_code => 'en', :name => 'English', :translation_available => true)
-    
-    add_foreign_key :users, [:locale], :languages, [:language_code]
-    add_foreign_key :diary_entries, [:language], :languages, [:language_code]    
+    add_primary_key :languages, [:code]
+
+    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