diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-05-17 10:44:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-17 10:44:41 +0200 |
| commit | 06de3a17f89e0a781389354aea6a9e3f72316b7d (patch) | |
| tree | 899b44858be77bbb54a4de74f9e6c404f81a7434 /app/models/user.rb | |
| parent | b91196f4b73fff91997b8077619ae25b6d04a59e (diff) | |
| parent | b3ea262e40362b6a3b54646b42ac380243b0140e (diff) | |
Merge pull request #1775 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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 b38de74b8..f7a35eeb5 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 |