diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-03 09:03:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 09:03:11 +0200 |
| commit | 2aafdd0efb3fa0bf067e0b08a627a462793f296b (patch) | |
| tree | d559e2dec7ceb4c446db973b5c040a708d1c5756 /app/models/user.rb | |
| parent | 9d7c323abdda66423751f3a25faf960674af8a49 (diff) | |
| parent | 6ee768b7b285382fce3270ad4cf06c71838182d8 (diff) | |
Merge pull request #1848 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 962ca68ff..de59fe4b3 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -282,7 +282,7 @@ class User < ApplicationRecord end def preferred_posting_language - valid_locale_cascade(settings.default_language, locale) + valid_locale_cascade(settings.default_language, locale, I18n.locale) end def setting_default_privacy |