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.

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/lib/formatter.rb
Simple merge

diff --cc app/views/admin/follow_recommendations/show.html.haml
Simple merge

diff --cc app/views/settings/preferences/appearance/show.html.haml
index ccea2e9b7fe929e8a7f5779dfbbc503b4f898839,9e3964f2176c4403376a68770028da75ffdd5675..89bd4f459f84a9437505ee84e06e78ca05e8ab7e
--- 1/app/views/settings/preferences/appearance/show.html.haml
--- 2/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@@@ -5,8 -5,11 +5,8 @@@
    = button_tag t('generic.save_changes'), class: 'button', form: 'edit_user'
  
  = simple_form_for current_user, url: settings_preferences_appearance_path, html: { method: :put, id: 'edit_user' } do |f|
 -  .fields-row
 -    .fields-group.fields-row__column.fields-row__column-6
 -      = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false
 -    .fields-group.fields-row__column.fields-row__column-6
 -      = f.input :setting_theme, collection: Themes.instance.names, label_method: lambda { |theme| I18n.t("themes.#{theme}", default: theme) }, wrapper: :with_label, include_blank: false, hint: false
 +  .fields-group
-     = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| human_locale(locale) }, selected: I18n.locale, hint: false
++    = f.input :locale, collection: I18n.available_locales, wrapper: :with_label, include_blank: false, label_method: lambda { |locale| native_locale_name(locale) }, selected: I18n.locale, hint: false
  
    - unless I18n.locale == :en
      .flash-message.translation-prompt

diff --cc app/views/settings/preferences/other/show.html.haml
Simple merge