Move changeset comment feeds to resourceful routes

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

diff --git a/app/models/language.rb b/app/models/language.rb
index f346c8a748aeb94dc44bf6d4d8769ffe8ba0bdaa..f1d40feeab109fc341c9aae48fa1ea184e63d494 100644 (file)
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -8,8 +8,6 @@
 #
 
 class Language < ApplicationRecord
 #
 
 class Language < ApplicationRecord

-  self.primary_key = "code"
-

   has_many :diary_entries, :foreign_key => "language", :inverse_of => :language
 
   def self.load(file)
   has_many :diary_entries, :foreign_key => "language", :inverse_of => :language
 
   def self.load(file)


@@ -28,7 +26,7 @@ class Language < ApplicationRecord
 
   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