Better singulars of account followers/toots. (#8471)

5 files changed, 14 insertions, 14 deletions

diff --git a/app/helpers/stream_entries_helper.rb b/app/helpers/stream_entries_helper.rb
index 9ded69436..187bfe4a0 100644
--- a/app/helpers/stream_entries_helper.rb
+++ b/app/helpers/stream_entries_helper.rb
@@ -62,17 +62,17 @@ module StreamEntriesHelper
     prepend_str = [
       [
         number_to_human(account.statuses_count, strip_insignificant_zeros: true),
-        I18n.t('accounts.posts'),
+        I18n.t('accounts.posts', count: account.statuses_count),
       ].join(' '),
 
       [
         number_to_human(account.following_count, strip_insignificant_zeros: true),
-        I18n.t('accounts.following'),
+        I18n.t('accounts.following', count: account.following_count),
       ].join(' '),
 
       [
         number_to_human(account.followers_count, strip_insignificant_zeros: true),
-        I18n.t('accounts.followers'),
+        I18n.t('accounts.followers', count: account.followers_count),
       ].join(' '),
     ].join(', ')
 
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index caf03bd7c..f09beff98 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -16,17 +16,17 @@
           .counter{ class: active_nav_class(short_account_url(account)) }
             = link_to short_account_url(account), class: 'u-url u-uid', title: number_with_delimiter(account.statuses_count) do
               %span.counter-number= number_to_human account.statuses_count, strip_insignificant_zeros: true
-              %span.counter-label= t('accounts.posts')
+              %span.counter-label= t('accounts.posts', count: account.statuses_count)
 
           .counter{ class: active_nav_class(account_following_index_url(account)) }
             = link_to account_following_index_url(account), title: number_with_delimiter(account.following_count) do
               %span.counter-number= number_to_human account.following_count, strip_insignificant_zeros: true
-              %span.counter-label= t('accounts.following')
+              %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: number_with_delimiter(account.followers_count) do
               %span.counter-number= number_to_human account.followers_count, strip_insignificant_zeros: true
-              %span.counter-label= t('accounts.followers')
+              %span.counter-label= t('accounts.followers', count: account.followers_count)
         .spacer
         .public-account-header__tabs__tabs__buttons
           = account_action_button(account)
@@ -37,7 +37,7 @@
       .public-account-header__extra__links
         = link_to account_following_index_url(account) do
           %strong= number_to_human account.following_count, strip_insignificant_zeros: true
-          = t('accounts.following')
+          = t('accounts.following', count: account.following_count)
         = link_to account_followers_url(account) do
           %strong= number_to_human account.followers_count, strip_insignificant_zeros: true
-          = t('accounts.followers')
+          = t('accounts.followers', count: account.followers_count)
diff --git a/app/views/accounts/show.html.haml b/app/views/accounts/show.html.haml
index e398fc29b..b825b82cb 100644
--- a/app/views/accounts/show.html.haml
+++ b/app/views/accounts/show.html.haml
@@ -29,7 +29,7 @@
       %data.p-name{ value: "#{@account.username} on #{site_hostname}" }/
 
       .account__section-headline
-        = active_link_to t('accounts.posts'), short_account_url(@account)
+        = active_link_to t('accounts.posts_tab_heading'), short_account_url(@account)
         = active_link_to t('accounts.posts_with_replies'), short_account_with_replies_url(@account)
         = active_link_to t('accounts.media'), short_account_media_url(@account)
 
diff --git a/app/views/admin/suspensions/new.html.haml b/app/views/admin/suspensions/new.html.haml
index 5ffbbbe46..f03ecacc3 100644
--- a/app/views/admin/suspensions/new.html.haml
+++ b/app/views/admin/suspensions/new.html.haml
@@ -8,13 +8,13 @@
     %ul
       %li.negative-hint
         = number_to_human @account.statuses_count, strip_insignificant_zeros: true
-        = t('accounts.posts')
+        = t('accounts.posts', count: @account.statuses_count)
       %li.negative-hint
         = number_to_human @account.following_count, strip_insignificant_zeros: true
-        = t('accounts.following')
+        = t('accounts.following', count: @account.following_count)
       %li.negative-hint
         = number_to_human @account.followers_count, strip_insignificant_zeros: true
-        = t('accounts.followers')
+        = t('accounts.followers', count: @account.followers_count)
 
   %p.hint= t('admin.suspensions.hint_html', value: content_tag(:code, @account.acct))
 
diff --git a/app/views/settings/exports/show.html.haml b/app/views/settings/exports/show.html.haml
index ef2d2b894..792dccd9e 100644
--- a/app/views/settings/exports/show.html.haml
+++ b/app/views/settings/exports/show.html.haml
@@ -9,7 +9,7 @@
         %td= number_to_human_size @export.total_storage
         %td
       %tr
-        %th= t('accounts.statuses')
+        %th= t('accounts.statuses', count: @export.total_statuses)
         %td= number_with_delimiter @export.total_statuses
         %td
       %tr
@@ -17,7 +17,7 @@
         %td= number_with_delimiter @export.total_follows
         %td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv)
       %tr
-        %th= t('accounts.followers')
+        %th= t('accounts.followers', count: @export.total_followers)
         %td= number_with_delimiter @export.total_followers
         %td
       %tr