diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-12-28 18:39:24 +0100 |
|---|---|---|
| committer | ThibG <thib@sitedethib.com> | 2018-12-28 20:05:47 +0100 |
| commit | 115b1abb6e30517fa56efc78551f5953b6ccef27 (patch) | |
| tree | 744089a87555f8b70b840a9de35a31d1dae98871 | |
| parent | 374bae0abe69e9c1dfece084fe3ca8e28a7836dc (diff) | |
Rename hide_followers_count helper to hide_followers_count?
| -rw-r--r-- | app/helpers/stream_entries_helper.rb | 4 | ||||
| -rw-r--r-- | app/views/accounts/_header.html.haml | 6 | ||||
| -rw-r--r-- | app/views/directories/index.html.haml | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb index 46ef04343..792a91162 100644 --- a/app/helpers/stream_entries_helper.rb +++ b/app/helpers/stream_entries_helper.rb @@ -60,7 +60,7 @@ module StreamEntriesHelper end end - def hide_followers_count(account) + def hide_followers_count?(account) Setting.hide_followers_count || account.user&.setting_hide_followers_count end @@ -77,7 +77,7 @@ module StreamEntriesHelper ].join(' '), ] - unless hide_followers_count(account) + unless hide_followers_count?(account) prepend_stats << [ number_to_human(account.followers_count, strip_insignificant_zeros: true), I18n.t('accounts.followers', count: account.followers_count), diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml index 3afd2e482..d285dc858 100644 --- a/app/views/accounts/_header.html.haml +++ b/app/views/accounts/_header.html.haml @@ -24,8 +24,8 @@ %span.counter-label= t('accounts.following', count: account.following_count) .counter{ class: active_nav_class(account_followers_url(account)) } - = link_to account_followers_url(account), title: hide_followers_count(account) ? nil : number_with_delimiter(account.followers_count) do - %span.counter-number= hide_followers_count(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true) + = link_to account_followers_url(account), title: hide_followers_count?(account) ? nil : number_with_delimiter(account.followers_count) do + %span.counter-number= hide_followers_count?(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true) %span.counter-label= t('accounts.followers', count: account.followers_count) .spacer .public-account-header__tabs__tabs__buttons @@ -39,5 +39,5 @@ %strong= number_to_human account.following_count, strip_insignificant_zeros: true = t('accounts.following', count: account.following_count) = link_to account_followers_url(account) do - %strong= hide_followers_count(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true) + %strong= hide_followers_count?(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true) = t('accounts.followers', count: account.followers_count) diff --git a/app/views/directories/index.html.haml b/app/views/directories/index.html.haml index 4189ce897..9e1e65732 100644 --- a/app/views/directories/index.html.haml +++ b/app/views/directories/index.html.haml @@ -29,7 +29,7 @@ = number_to_human account.statuses_count, strip_insignificant_zeros: true %small= t('accounts.posts', count: account.statuses_count).downcase %td.accounts-table__count.optional - = hide_followers_count(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true) + = hide_followers_count?(account) ? '-' : (number_to_human account.followers_count, strip_insignificant_zeros: true) %small= t('accounts.followers', count: account.followers_count).downcase %td.accounts-table__count - if account.last_status_at.present? |