Add richtext help tab

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

diff --git a/app/models/language.rb b/app/models/language.rb
index 67e98569bbf14315099efb4b79d40dc7ef32e2ad..f1d40feeab109fc341c9aae48fa1ea184e63d494 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -7,22 +7,18 @@
 #  native_name  :string
 #
 
 #  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
 
   def self.load(file)
     Language.transaction do

-      YAML.safe_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
         end
       end
     end


@@ -30,7 +26,7 @@ class Language < ActiveRecord::Base
 
   def name
     name = english_name
 
   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
     name
   end
 end