From: Tom Hughes <tom@compton.nu>
Date: Tue, 2 Jan 2024 18:54:18 +0000 (+0000)
Subject: Merge remote-tracking branch 'upstream/pull/4452'
X-Git-Tag: live~403
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6892ccd0155b431cc567b4744b1e2759df3e8c68?hp=50e5d6a65934fd22129aa9e450db0b821c7750b0

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

diff --git a/app/models/language.rb b/app/models/language.rb
index 8d3e4583f..f1d40feea 100644
--- a/app/models/language.rb
+++ b/app/models/language.rb
@@ -26,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
diff --git a/test/models/language_test.rb b/test/models/language_test.rb
index 5ba558907..f777d8e19 100644
--- a/test/models/language_test.rb
+++ b/test/models/language_test.rb
@@ -6,6 +6,11 @@ class LanguageTest < ActiveSupport::TestCase
     assert_equal "Slovenian (slovenščina)", Language.find("sl").name
   end
 
+  def test_same_native_name
+    create(:language, :code => "af", :english_name => "Afrikaans", :native_name => "Afrikaans")
+    assert_equal "Afrikaans", Language.find("af").name
+  end
+
   def test_load
     assert_equal 0, Language.count
     assert_raise ActiveRecord::RecordNotFound do