diff options
| author | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-02-13 22:15:26 -0600 |
| commit | c0341f06be5310a00b85a5d48fa80891d47c6710 (patch) | |
| tree | 907ef7f787f8bd446a6d9be1448a8bcff74e5a08 /app/models/user.rb | |
| parent | 169688aa9f2a69ac3d36332c833e9cad43b5f7a5 (diff) | |
| parent | 6f78c66fe01921a4e7e01aa6e2386a5fce7f3afd (diff) | |
Merge remote-tracking branch 'glitch/main'
Not at all sure where the admin UI is going to display English language names now but OK.
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 |