From 15093f9113e0eda8a66a7c12bbd92e7e8670da15 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 27 Aug 2017 17:04:45 +0200
Subject: [PATCH] Shorten display of large numbers on public profiles (#4711)

---
 app/views/accounts/_header.html.haml |  6 +++---
 config/i18n-tasks.yml                |  4 ++--
 config/locales/en.yml                | 11 +++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 8009e903ec1..a6366b0f3e9 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -37,15 +37,15 @@
     .details-counters
       .counter{ class: active_nav_class(short_account_url(account)) }
         = 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')
 
       .counter{ class: active_nav_class(account_following_index_url(account)) }
         = 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')
 
       .counter{ class: active_nav_class(account_followers_url(account)) }
         = 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')
diff --git a/config/i18n-tasks.yml b/config/i18n-tasks.yml
index 849e8116aa5..b51cf46df95 100644
--- a/config/i18n-tasks.yml
+++ b/config/i18n-tasks.yml
@@ -36,7 +36,7 @@ ignore_missing:
   - 'activerecord.attributes.*'
   - 'activerecord.errors.*'
   - '{devise,pagination,doorkeeper}.*'
-  - '{date,datetime,time}.*'
+  - '{date,datetime,time,number}.*'
   - 'simple_form.{yes,no}'
   - 'simple_form.{placeholders,hints,labels}.*'
   - 'simple_form.{error_notification,required}.:'
@@ -50,7 +50,7 @@ ignore_unused:
   - 'activerecord.attributes.*'
   - 'activerecord.errors.*'
   - '{devise,pagination,doorkeeper}.*'
-  - '{date,datetime,time}.*'
+  - '{date,datetime,time,number}.*'
   - 'simple_form.{yes,no}'
   - 'simple_form.{placeholders,hints,labels}.*'
   - 'simple_form.{error_notification,required}.:'
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 96d08e6b2ea..1a9926edd8a 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -353,6 +353,17 @@ en:
     reblog:
       body: 'Your status was boosted by %{name}:'
       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:
     next: Next
     prev: Prev