techhub/mastodon
2
0
Fork 0
Code Activity

Fix follow recommendation moderation page default language when using regional variant (#32580)

Browse Source
This commit is contained in:
Claire
2024-10-18 12:21:25 +02:00
committed by GitHub
parent 8eae0d067d
commit 2391937e11
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/models/follow_recommendation_filter.rb
View File

@@ -11,7 +11,7 @@ class FollowRecommendationFilter
attr_reader :params, :language attr_reader :params, :language
def initialize(params) def initialize(params)
@language = params.delete('language') || I18n.locale @language = usable_language(params.delete('language') || I18n.locale)
@params = params @params = params
end end
@@ -22,4 +22,15 @@ class FollowRecommendationFilter
Account.includes(:account_stat).joins(:follow_recommendation).merge(FollowRecommendation.localized(@language).order(rank: :desc)) Account.includes(:account_stat).joins(:follow_recommendation).merge(FollowRecommendation.localized(@language).order(rank: :desc))
end end
end end
private
def usable_language(locale)
return locale if Trends.available_locales.include?(locale)
locale = locale.to_s.split(/[_-]/).first
return locale if Trends.available_locales.include?(locale)
nil
end
end end