diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2022-05-16 19:13:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-16 19:13:36 +0200 |
| commit | 6c699b17234355598d6d3237e8826adf6f0688f9 (patch) | |
| tree | 11d9fb4e95b866ca656a5986ad1e5ac1921b83bd /app/models/user.rb | |
| parent | 0cdb07757050825725cac76f1c9cf11cf64acc0a (diff) | |
Fix preferred posting language returning unusable value in REST API (#18428)
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index ab832bcd0..ab2e391e9 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -53,6 +53,7 @@ class User < ApplicationRecord include Settings::Extend include UserRoles include Redisable + include LanguagesHelper # The home and list feeds will be stored in Redis for this amount # of time, and status fan-out to followers will include only people @@ -248,7 +249,7 @@ class User < ApplicationRecord end def preferred_posting_language - settings.default_language || locale + valid_locale_cascade(settings.default_language, locale) end def setting_default_privacy |