]> cat aescling's git repositories - mastodon.git/commitdiff
Fix language dropdown sometimes not appearing in web UI (#19246)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 27 Sep 2022 23:02:15 +0000 (01:02 +0200)
committeraescling <aescling+gitlab@cat.family>
Thu, 17 Nov 2022 03:13:56 +0000 (22:13 -0500)
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

app/models/user.rb

index 1292c04d4a5c1d938ac61ecacd2b92d817ce1314..e7c7f9edb0246f55b7e3d8ac1d6770c3de33a20f 100644 (file)
@@ -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