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

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

diff --git a/app/models/language.rb b/app/models/language.rb
index bb1aa4bd26016758ad3d8b66d09a7527a72b8ad8..f1d40feeab109fc341c9aae48fa1ea184e63d494 100644 (file)
--- 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|
@@ -28,7 +26,7 @@ class Language < ActiveRecord::Base
 
   def name
     name = english_name
-    name += " (#{native_name})" unless native_name.nil?
+    name += " (#{native_name})" unless native_name.nil? || native_name == english_name
     name
   end
 end