From: single-right-quote <34298117+single-right-quote@users.noreply.github.com>
Date: Wed, 30 Mar 2022 16:06:00 +0000 (+0000)
Subject: Merge remote-tracking branch 'origin/main' into merge_glitch-soc_2022-03-30
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7a970679eab0aa739c92d5e3e1afb589d73656ce;p=mastodon.git

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

7a970679eab0aa739c92d5e3e1afb589d73656ce
diff --cc app/models/user.rb
index 506df3da5,7c9ced6ae..927f25e24
--- a/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?