Merge remote-tracking branch 'origin/main' into merge_glitch-soc_2022-03-30

diff --cc .env.production.sample
Simple merge

diff --cc app/models/user.rb
index 506df3da50ef0c8b25f6d502de12a04362dbba45,7c9ced6aed9a616d67727003b8346099784a3ffd..927f25e24644633cf2d42f5f0b1d72b68fb39b21
--- 1/app/models/user.rb
--- 2/app/models/user.rb
+++ b/app/models/user.rb
@@@ -245,8 -249,12 +249,12 @@@ class User < ApplicationRecor
      save!
    end
  
+   def preferred_posting_language
+     settings.default_language || locale
+   end
+ 
    def setting_default_privacy
 -    settings.default_privacy || (account.locked? ? 'private' : 'public')
 +    settings.default_privacy || (account.locked? ? 'private' : 'unlisted')
    end
  
    def allows_digest_emails?

diff --cc lib/mastodon/version.rb
Simple merge

diff --cc spec/models/user_spec.rb
Simple merge

diff --cc yarn.lock
Simple merge