cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tom Hughes 2024-01-02 18:54:18 +00:00
commit 6892ccd015
2 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/language.rb
View file

@ -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

5
test/models/language_test.rb
View file

@ -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