From 6427f68ea744fe8b6c8b427d6be7e1729c67f138 Mon Sep 17 00:00:00 2001 From: Anton Khorev Date: Tue, 2 Jan 2024 09:09:33 +0300 Subject: [PATCH] Don't show native language name if it's the same as English name --- app/models/language.rb | 2 +- test/models/language_test.rb | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) 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 -- 2.45.2