Actually set the locale from the users browser request, rather than just parsing it.

[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..daaf2199190d4c1669415bcf8633843cb5337956 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -2,23 +2,26 @@ require 'lib/migrate'
 
 class CreateLanguages < ActiveRecord::Migration
   def self.up
-    create_table :languages do |t|
-      t.string :language_code, :limit => 5, :null => false
+    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
+    end
+
+    add_primary_key :languages, [:code]
 
-      t.timestamps
+    Language.create do |l|
+      l.code = 'en'
+      l.name = 'English'
+      l.translation_available = true
     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_foreign_key :users, [:locale], :languages, [:code]
+    add_foreign_key :diary_entries, [:language], :languages, [:code]    
   end
 
   def self.down
     raise IrreversibleMigration.new
   end
 end
+