X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/73340e1780bfee7b3ebfd17f9fa204647ea40d34..11806a676fb88f51ece004b7c05bde38f1e77706:/app/models/language.rb?ds=sidebyside

diff --git a/app/models/language.rb b/app/models/language.rb
index 7bb0b6e77..67e98569b 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,11 +1,20 @@
+# == Schema Information
+#
+# Table name: languages
+#
+#  code         :string           not null, primary key
+#  english_name :string           not null
+#  native_name  :string
+#
+
 class Language < ActiveRecord::Base
-  set_primary_key :code
+  self.primary_key = "code"
 
-  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|
+      YAML.safe_load(File.read(file)).each do |k, v|
         begin
           Language.update(k, :english_name => v["english"], :native_name => v["native"])
         rescue ActiveRecord::RecordNotFound
@@ -23,5 +32,5 @@ class Language < ActiveRecord::Base
     name = english_name
     name += " (#{native_name})" unless native_name.nil?
     name
-  end  
+  end
 end