diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-12 13:28:03 +0100 |
commit | 93912f04988eab072a119a588342c68c5cdb52e0 (patch) | |
tree | 815a69053ed9f1eb5e86e62735220a53bfcef814 /spec/helpers | |
parent | d37f426f95f812b44925e13c00eabb9d1cd76b1f (diff) | |
parent | d26c1cb2fe145b8d56a9c15e110a917e6f63068b (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/models/account.rb`: Conflict because we (glitch-soc) have disabled trending of posts without review. Discarded that upstream change. - `app/views/admin/settings/discovery/show.html.haml`: Just an extra setting in glitch-soc. Kept that extra setting.
Diffstat (limited to 'spec/helpers')
-rw-r--r-- | spec/helpers/languages_helper_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/helpers/languages_helper_spec.rb b/spec/helpers/languages_helper_spec.rb index 5587fc261..217c9b239 100644 --- a/spec/helpers/languages_helper_spec.rb +++ b/spec/helpers/languages_helper_spec.rb @@ -11,7 +11,7 @@ describe LanguagesHelper do 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') + expect(helper.native_locale_name(:de)).to eq('Deutsch') end end |