Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `app/views/admin/tags/index.html.haml`:
  Removed upstream while it had changes in glitch-soc to accomodate for the
  theming system.

Additional changes to accomodate for the theming system:
- `app/views/admin/trends/links/preview_card_providers/index.html.haml`
- `app/views/admin/trends/links/index.html.haml`
- `app/views/admin/trends/tags/index.html.haml`
- `app/views/admin/tags/show.html.haml`

1 files changed, 17 insertions, 0 deletions

diff --git a/spec/helpers/languages_helper_spec.rb b/spec/helpers/languages_helper_spec.rb
new file mode 100644
index 000000000..6db617824
--- /dev/null
+++ b/spec/helpers/languages_helper_spec.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe LanguagesHelper do
+  describe 'the HUMAN_LOCALES constant' do
+    it 'includes all I18n locales' do
+      expect(described_class::HUMAN_LOCALES.keys).to include(*I18n.available_locales)
+    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')
+    end
+  end
+end