diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-10-31 18:25:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-31 18:25:34 +0100 |
| commit | 968f34300681d8082cf2f824722a3945fc604b2d (patch) | |
| tree | 910675cc3b8d9022f65bcfa9bee1acee6af8d0e4 /app/views/admin/trends/statuses | |
| parent | 371563b0e249b6369e04709fb974a8e57413529f (diff) | |
| parent | 1fe4e5e38c17a726e6aea5d6033139653e89a379 (diff) | |
Merge pull request #1876 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/admin/trends/statuses')
| -rw-r--r-- | app/views/admin/trends/statuses/_status.html.haml | 4 | ||||
| -rw-r--r-- | app/views/admin/trends/statuses/index.html.haml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/admin/trends/statuses/_status.html.haml b/app/views/admin/trends/statuses/_status.html.haml index e4d75bbb9..f35e13d12 100644 --- a/app/views/admin/trends/statuses/_status.html.haml +++ b/app/views/admin/trends/statuses/_status.html.haml @@ -25,9 +25,9 @@ - if status.trendable? && !status.account.discoverable? • = t('admin.trends.statuses.not_discoverable') - - if status.trendable? && (rank = Trends.statuses.rank(status.id, locale: params[:locale].presence)) + - if status.trend.allowed? • - %abbr{ title: t('admin.trends.tags.current_score', score: Trends.statuses.score(status.id, locale: params[:locale].presence)) }= t('admin.trends.tags.trending_rank', rank: rank + 1) + %abbr{ title: t('admin.trends.tags.current_score', score: status.trend.score) }= t('admin.trends.tags.trending_rank', rank: status.trend.rank) - elsif status.requires_review? • = t('admin.trends.pending_review') diff --git a/app/views/admin/trends/statuses/index.html.haml b/app/views/admin/trends/statuses/index.html.haml index c96f4323a..bf04772f2 100644 --- a/app/views/admin/trends/statuses/index.html.haml +++ b/app/views/admin/trends/statuses/index.html.haml @@ -13,7 +13,7 @@ .filter-subset.filter-subset--with-select %strong= t('admin.follow_recommendations.language') .input.select.optional - = select_tag :locale, options_for_select(Trends.available_locales.map { |key| [standard_locale_name(key), key]}, params[:locale]), include_blank: true + = select_tag :locale, options_for_select(@locales.map { |key| [standard_locale_name(key), key] }, params[:locale]), include_blank: true .filter-subset %strong= t('admin.trends.trending') %ul |