Clear pass_crypt_confirmation when encrypting a new password

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

diff --git a/app/models/language.rb b/app/models/language.rb
index 150341cc70f50fe2e5f8398bd25cb53ba6d5f64d..3a63176f618c52f7788111f91e112a7fcb66ebd9 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,14 +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.generate(code, name, translation_available)
-    Language.create do |l|
-      l.code = code
-      l.name = name
-      l.translation_available = translation_available
+
+  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
     end
   end

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

 end
 end