diff options
| author | ThibG <thib@sitedethib.com> | 2018-08-27 20:20:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-27 20:20:49 +0200 |
| commit | 8852fff3a43ea4ac26aef5c7f0d72f3db3b421a0 (patch) | |
| tree | 30dcf8694eadb68ca8a9579e312f9c38ad8c09d1 /app/views/accounts | |
| parent | af934b90710a2ce1099d3ceda5de7bcf0e94595c (diff) | |
| parent | 53b7bb9d047cfc8b21ee0540bd3e5285267160fd (diff) | |
Merge pull request #675 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/views/accounts')
| -rw-r--r-- | app/views/accounts/_header.html.haml | 10 | ||||
| -rw-r--r-- | app/views/accounts/show.html.haml | 2 |
2 files changed, 6 insertions, 6 deletions
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) |