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.

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