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 4b45ce33fb206198e2b166045e0c3fc279fe15c6..ab5a7eee65ed3b7122a5e52b31b99b254e2b514f 100644 (file)
--- a/db/migrate/034_create_languages.rb
+++ b/db/migrate/034_create_languages.rb
@@ -10,13 +10,7 @@ class CreateLanguages < ActiveRecord::Migration
 
     add_primary_key :languages, [:code]
 
 
     add_primary_key :languages, [:code]
 

-    YAML.load(File.read(RAILS_ROOT + "/config/languages.yml")).each do |k,v|
-      Language.create do |l|
-        l.code = k
-        l.english_name = v["english"]
-        l.native_name = v["native"]
-      end
-    end
+    Language.load(RAILS_ROOT + "/config/languages.yml")

 
     add_foreign_key :users, [:locale], :languages, [:code]
     add_foreign_key :diary_entries, [:language_code], :languages, [:code]    
 
     add_foreign_key :users, [:locale], :languages, [:code]
     add_foreign_key :diary_entries, [:language_code], :languages, [:code]    


@@ -26,4 +20,3 @@ class CreateLanguages < ActiveRecord::Migration
     raise IrreversibleMigration.new
   end
 end
     raise IrreversibleMigration.new
   end
 end

-