From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 27 Sep 2022 23:02:15 +0000 (+0200)
Subject: Fix language dropdown sometimes not appearing in web UI (#19246)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=81a4fd5cead786c9cf26804138f36d1ee4385b27;p=mastodon.git

Fix language dropdown sometimes not appearing in web UI (#19246)

When user has no locale preference saved (such as never changing it
from the default), the preferred posting language is nil, and
the dropdown is not visible
---

diff --git a/app/models/user.rb b/app/models/user.rb
index 1292c04d4..e7c7f9edb 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