mirrors
/
donphan
mirror of https://github.com/Siphonay/mastodon
1
0
Fork 0
Code Releases Activity

Shorten display of large numbers on public profiles (#4711)

This commit is contained in:
Eugen Rochko 2017-08-27 17:04:45 +02:00 committed by GitHub
parent f92d991e52
commit 15093f9113
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/accounts/_header.html.haml
View File

@ -37,15 +37,15 @@
.details-counters .details-counters
.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' do = link_to short_account_url(account), class: 'u-url u-uid' do
%span.counter-number= number_with_delimiter account.statuses_count %span.counter-number= number_to_human account.statuses_count
%span.counter-label= t('accounts.posts') %span.counter-label= t('accounts.posts')
.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) do = link_to account_following_index_url(account) do
%span.counter-number= number_with_delimiter account.following_count %span.counter-number= number_to_human account.following_count
%span.counter-label= t('accounts.following') %span.counter-label= t('accounts.following')
.counter{ class: active_nav_class(account_followers_url(account)) } .counter{ class: active_nav_class(account_followers_url(account)) }
= link_to account_followers_url(account) do = link_to account_followers_url(account) do
%span.counter-number= number_with_delimiter account.followers_count %span.counter-number= number_to_human account.followers_count
%span.counter-label= t('accounts.followers') %span.counter-label= t('accounts.followers')

4
config/i18n-tasks.yml
View File

@ -36,7 +36,7 @@ ignore_missing:
- 'activerecord.attributes.*' - 'activerecord.attributes.*'
- 'activerecord.errors.*' - 'activerecord.errors.*'
- '{devise,pagination,doorkeeper}.*' - '{devise,pagination,doorkeeper}.*'
- '{date,datetime,time}.*' - '{date,datetime,time,number}.*'
- 'simple_form.{yes,no}' - 'simple_form.{yes,no}'
- 'simple_form.{placeholders,hints,labels}.*' - 'simple_form.{placeholders,hints,labels}.*'
- 'simple_form.{error_notification,required}.:' - 'simple_form.{error_notification,required}.:'
@ -50,7 +50,7 @@ ignore_unused:
- 'activerecord.attributes.*' - 'activerecord.attributes.*'
- 'activerecord.errors.*' - 'activerecord.errors.*'
- '{devise,pagination,doorkeeper}.*' - '{devise,pagination,doorkeeper}.*'
- '{date,datetime,time}.*' - '{date,datetime,time,number}.*'
- 'simple_form.{yes,no}' - 'simple_form.{yes,no}'
- 'simple_form.{placeholders,hints,labels}.*' - 'simple_form.{placeholders,hints,labels}.*'
- 'simple_form.{error_notification,required}.:' - 'simple_form.{error_notification,required}.:'

11
config/locales/en.yml
View File

@ -353,6 +353,17 @@ en:
reblog: reblog:
body: 'Your status was boosted by %{name}:' body: 'Your status was boosted by %{name}:'
subject: "%{name} boosted your status" subject: "%{name} boosted your status"
number:
human:
decimal_units:
format: "%n%u"
units:
billion: B
million: M
quadrillion: Q
thousand: K
trillion: T
unit: ''
pagination: pagination:
next: Next next: Next
prev: Prev prev: Prev