Fixed tests + Added new ones

[rails.git] / app / models / language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index 81441db5c4ff0665f845b7eb147d5d02446c1d34..bb31c82ee4586ac21ca5e2f4e4ba729dc3d0f29c 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,12 +1,27 @@
 class Language < ActiveRecord::Base
 class Language < ActiveRecord::Base

-  set_primary_key :code
+  self.primary_key = "code"

 
 

-  has_many :users, :foreign_key => 'locale'
-  has_many :diary_entries, :foreign_key => 'language'
+  has_many :diary_entries, :foreign_key => "language"
+
+  def self.load(file)
+    Language.transaction do
+      YAML.load(File.read(file)).each do |k, v|
+        begin
+          Language.update(k, :english_name => v["english"], :native_name => v["native"])
+        rescue ActiveRecord::RecordNotFound
+          Language.create do |l|
+            l.code = k
+            l.english_name = v["english"]
+            l.native_name = v["native"]
+          end
+        end
+      end
+    end
+  end

 
   def name
     name = english_name
     name += " (#{native_name})" unless native_name.nil?
     name
 
   def name
     name = english_name
     name += " (#{native_name})" unless native_name.nil?
     name

-  end  
+  end

 end
 end