diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-02-09 17:28:33 +0100 |
commit | 322e907e0417da482789e4d24263f247f29a5769 (patch) | |
tree | 8356833bbbf82de571feb1d739e0db7e2a50c9be /spec/helpers/languages_helper_spec.rb | |
parent | 8987ea4d6b236657b8ea97d619902668768ae8ff (diff) | |
parent | 3aebe711fd54d75c1ea35e65a5dc342e78508d15 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change.
Diffstat (limited to 'spec/helpers/languages_helper_spec.rb')
-rw-r--r-- | spec/helpers/languages_helper_spec.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/spec/helpers/languages_helper_spec.rb b/spec/helpers/languages_helper_spec.rb index b455cee33..5587fc261 100644 --- a/spec/helpers/languages_helper_spec.rb +++ b/spec/helpers/languages_helper_spec.rb @@ -9,9 +9,15 @@ describe LanguagesHelper do end end - describe 'human_locale' do - it 'finds the human readable local description from a key' do - expect(helper.human_locale(:en)).to eq('English') + describe 'native_locale_name' do + it 'finds the human readable native name from a key' do + expect(helper.native_locale_name(:en)).to eq('English') + end + end + + describe 'standard_locale_name' do + it 'finds the human readable standard name from a key' do + expect(helper.standard_locale_name(:de)).to eq('German') end end end |