Merge remote-tracking branch 'mastodon/main' into custom/quote

2022-11-05 19:43:04 +00:00
parent bef7f9a21c 312d616371
commit 4be8ece78d
1540 changed files with 62088 additions and 37209 deletions
--- a/app/controllers/api/v1/timelines/public_controller.rb
+++ b/app/controllers/api/v1/timelines/public_controller.rb
@@ -39,6 +39,7 @@ class Api::V1::Timelines::PublicController < Api::BaseController
  def public_feed
    PublicFeed.new(
      current_account,
+      locale: content_locale,
      local: truthy_param?(:local),
      remote: truthy_param?(:remote),
      only_media: truthy_param?(:only_media)