X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/ff7ddb6b86bf918a9418af7382836b41594d45e4..83d9f1f1642d71f3b590e7ee33b22e4c5da00c53:/app/models/language.rb diff --git a/app/models/language.rb b/app/models/language.rb index cdf85a52b..8d3e4583f 100644 --- a/app/models/language.rb +++ b/app/models/language.rb @@ -8,13 +8,11 @@ # class Language < ApplicationRecord - self.primary_key = "code" - - has_many :diary_entries, :foreign_key => "language" + 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|