X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e731dd71a77ad4ad1e9db22535e89444bb98e5d9..8f57efe850bf9805d9bfb073d16d4cf1d06882f5:/app/models/language.rb diff --git a/app/models/language.rb b/app/models/language.rb index bb1aa4bd2..8d3e4583f 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -7,14 +7,12 @@ # native_name :string # -class Language < ActiveRecord::Base - self.primary_key = "code" - - has_many :diary_entries, :foreign_key => "language" +class Language < ApplicationRecord + has_many :diary_entries, :foreign_key => "language", :inverse_of => :language def self.load(file) Language.transaction do - YAML.safe_load(File.read(file)).each do |k, v| + YAML.safe_load_file(file).each do |k, v| Language.update(k, :english_name => v["english"], :native_name => v["native"]) rescue ActiveRecord::RecordNotFound Language.create do |l|