diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-02-08 19:43:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-08 19:43:59 +0100 |
| commit | 2fd1db7c9d0fe8c1cca159b9b0818c72e7c318aa (patch) | |
| tree | bc7319ae242a889bb1d05b7afdd365d78a43ac1d /app/models/user.rb | |
| parent | b1983623aec8e0b066d115736d2151e0c74407fa (diff) | |
| parent | 692963d43beb5e66a86e15d63b5aa3eeca82f0a1 (diff) | |
Merge pull request #1680 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 9afdc481d..ee20e293e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -245,6 +245,10 @@ class User < ApplicationRecord save! end + def preferred_posting_language + settings.default_language || locale + end + def setting_default_privacy settings.default_privacy || (account.locked? ? 'private' : 'public') end |