Merge remote-tracking branch 'upstream/pull/4182'

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

diff --git a/app/models/language.rb b/app/models/language.rb
index cdf85a52bc3530cb11dc0eb3e0a05ed29d7f7a56..f346c8a748aeb94dc44bf6d4d8769ffe8ba0bdaa 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -10,11 +10,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|