X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/7b384f03ab1d34fd3ebcc5ae3add25b3b5591e2e..ef7f3d800cbdd49b692df10d312e5fd880e2e938:/app/models/language.rb diff --git a/app/models/language.rb b/app/models/language.rb index 7bb0b6e77..8ccb00a5d 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -1,11 +1,11 @@ class Language < ActiveRecord::Base - set_primary_key :code + self.primary_key = "code" has_many :diary_entries, :foreign_key => 'language' 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 @@ -23,5 +23,5 @@ class Language < ActiveRecord::Base name = english_name name += " (#{native_name})" unless native_name.nil? name - end + end end