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

This commit is contained in:
M Somerville 2018-08-26 20:30:53 +01:00 committed by Eugen Rochko
parent f3a12ddfd0
commit b31449cd77
6 changed files with 21 additions and 16 deletions

View File

@ -62,17 +62,17 @@ module StreamEntriesHelper
prepend_str = [ prepend_str = [
[ [
number_to_human(account.statuses_count, strip_insignificant_zeros: true), number_to_human(account.statuses_count, strip_insignificant_zeros: true),
I18n.t('accounts.posts'), I18n.t('accounts.posts', count: account.statuses_count),
].join(' '), ].join(' '),
[ [
number_to_human(account.following_count, strip_insignificant_zeros: true), number_to_human(account.following_count, strip_insignificant_zeros: true),
I18n.t('accounts.following'), I18n.t('accounts.following', count: account.following_count),
].join(' '), ].join(' '),
[ [
number_to_human(account.followers_count, strip_insignificant_zeros: true), number_to_human(account.followers_count, strip_insignificant_zeros: true),
I18n.t('accounts.followers'), I18n.t('accounts.followers', count: account.followers_count),
].join(' '), ].join(' '),
].join(', ') ].join(', ')

View File

@ -16,17 +16,17 @@
.counter{ class: active_nav_class(short_account_url(account)) } .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 = 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-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)) } .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 = 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-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)) } .counter{ class: active_nav_class(account_followers_url(account)) }
= link_to account_followers_url(account), title: number_with_delimiter(account.followers_count) do = 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-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 .spacer
.public-account-header__tabs__tabs__buttons .public-account-header__tabs__tabs__buttons
= account_action_button(account) = account_action_button(account)
@ -37,7 +37,7 @@
.public-account-header__extra__links .public-account-header__extra__links
= link_to account_following_index_url(account) do = link_to account_following_index_url(account) do
%strong= number_to_human account.following_count, strip_insignificant_zeros: true %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 = link_to account_followers_url(account) do
%strong= number_to_human account.followers_count, strip_insignificant_zeros: true %strong= number_to_human account.followers_count, strip_insignificant_zeros: true
= t('accounts.followers') = t('accounts.followers', count: account.followers_count)

View File

@ -29,7 +29,7 @@
%data.p-name{ value: "#{@account.username} on #{site_hostname}" }/ %data.p-name{ value: "#{@account.username} on #{site_hostname}" }/
.account__section-headline .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.posts_with_replies'), short_account_with_replies_url(@account)
= active_link_to t('accounts.media'), short_account_media_url(@account) = active_link_to t('accounts.media'), short_account_media_url(@account)

View File

@ -8,13 +8,13 @@
%ul %ul
%li.negative-hint %li.negative-hint
= number_to_human @account.statuses_count, strip_insignificant_zeros: true = number_to_human @account.statuses_count, strip_insignificant_zeros: true
= t('accounts.posts') = t('accounts.posts', count: @account.statuses_count)
%li.negative-hint %li.negative-hint
= number_to_human @account.following_count, strip_insignificant_zeros: true = number_to_human @account.following_count, strip_insignificant_zeros: true
= t('accounts.following') = t('accounts.following', count: @account.following_count)
%li.negative-hint %li.negative-hint
= number_to_human @account.followers_count, strip_insignificant_zeros: true = 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)) %p.hint= t('admin.suspensions.hint_html', value: content_tag(:code, @account.acct))

View File

@ -9,7 +9,7 @@
%td= number_to_human_size @export.total_storage %td= number_to_human_size @export.total_storage
%td %td
%tr %tr
%th= t('accounts.statuses') %th= t('accounts.statuses', count: @export.total_statuses)
%td= number_with_delimiter @export.total_statuses %td= number_with_delimiter @export.total_statuses
%td %td
%tr %tr
@ -17,7 +17,7 @@
%td= number_with_delimiter @export.total_follows %td= number_with_delimiter @export.total_follows
%td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv) %td= table_link_to 'download', t('exports.csv'), settings_exports_follows_path(format: :csv)
%tr %tr
%th= t('accounts.followers') %th= t('accounts.followers', count: @export.total_followers)
%td= number_with_delimiter @export.total_followers %td= number_with_delimiter @export.total_followers
%td %td
%tr %tr

View File

@ -43,7 +43,9 @@ en:
accounts: accounts:
choices_html: "%{name}'s choices:" choices_html: "%{name}'s choices:"
follow: Follow follow: Follow
followers: Followers followers:
one: Follower
other: Followers
following: Following following: Following
joined: Joined %{date} joined: Joined %{date}
media: Media media: Media
@ -54,7 +56,10 @@ en:
people_who_follow: People who follow %{name} people_who_follow: People who follow %{name}
pin_errors: pin_errors:
following: You must be already following the person you want to endorse following: You must be already following the person you want to endorse
posts: Toots posts:
one: Toot
other: Toots
posts_tab_heading: Toots
posts_with_replies: Toots and replies posts_with_replies: Toots and replies
reserved_username: The username is reserved reserved_username: The username is reserved
roles: roles: