X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/aef7439c56cc26ec3faa22aa851f6ed80e5fb691..6094a97ce6297d390e5bbf733f5c2b4cc6b2076c:/app/models/language.rb

diff --git a/app/models/language.rb b/app/models/language.rb
index 1158721e8..f1d40feea 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -8,13 +8,11 @@
 #
 
 class Language < ApplicationRecord
-  self.primary_key = "code"
-
   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 < ApplicationRecord
 
   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