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

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

diff --git a/app/models/language.rb b/app/models/language.rb
index 7bb0b6e771a7e692aad56464ec969758524cab27..f1d40feeab109fc341c9aae48fa1ea184e63d494 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -1,19 +1,24 @@
-class Language < ActiveRecord::Base
-  set_primary_key :code
+# == Schema Information
+#
+# Table name: languages
+#
+#  code         :string           not null, primary key
+#  english_name :string           not null
+#  native_name  :string
+#
 
-  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.load(File.read(file)).each do |k,v|
-        begin
-          Language.update(k, :english_name => v["english"], :native_name => v["native"])
-        rescue ActiveRecord::RecordNotFound
-          Language.create do |l|
-            l.code = k
-            l.english_name = v["english"]
-            l.native_name = v["native"]
-          end
+      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|
+          l.code = k
+          l.english_name = v["english"]
+          l.native_name = v["native"]
         end
       end
     end
@@ -21,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
 end