Merge remote-tracking branch 'openstreetmap/pull/1154'

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

diff --git a/app/models/language.rb b/app/models/language.rb
index 7bb0b6e771a7e692aad56464ec969758524cab27..bb31c82ee4586ac21ca5e2f4e4ba729dc3d0f29c 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,11 +1,11 @@
 class Language < ActiveRecord::Base
 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
 
   def self.load(file)
     Language.transaction do

-      YAML.load(File.read(file)).each do |k,v|
+      YAML.load(File.read(file)).each do |k, v|

         begin
           Language.update(k, :english_name => v["english"], :native_name => v["native"])
         rescue ActiveRecord::RecordNotFound
         begin
           Language.update(k, :english_name => v["english"], :native_name => v["native"])
         rescue ActiveRecord::RecordNotFound


@@ -23,5 +23,5 @@ class Language < ActiveRecord::Base
     name = english_name
     name += " (#{native_name})" unless native_name.nil?
     name
     name = english_name
     name += " (#{native_name})" unless native_name.nil?
     name

-  end  
+  end

 end
 end