From 4e378484ea40166e94c49379c8a93e7db096000f Mon Sep 17 00:00:00 2001
From: Vlad <site.github@mrcasual.com>
Date: Sun, 22 Oct 2017 21:46:46 -0400
Subject: [PATCH] Formats number as per locale's convention

---
 assets/js/src/newsletters/listings/mixins.jsx |  4 ++--
 lib/Config/Shortcodes.php                     | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/assets/js/src/newsletters/listings/mixins.jsx b/assets/js/src/newsletters/listings/mixins.jsx
index bf6202dccf..8a5171bd06 100644
--- a/assets/js/src/newsletters/listings/mixins.jsx
+++ b/assets/js/src/newsletters/listings/mixins.jsx
@@ -84,8 +84,8 @@ const _QueueMixin = {
           <span>
             {
               MailPoet.I18n.t('newsletterQueueCompleted')
-              .replace('%$1d', newsletter.queue.count_processed)
-              .replace('%$2d', newsletter.queue.count_total)
+              .replace('%$1d', parseInt(newsletter.queue.count_processed, 10).toLocaleString())
+              .replace('%$2d', parseInt(newsletter.queue.count_total, 10).toLocaleString())
             }
           </span>
         );
diff --git a/lib/Config/Shortcodes.php b/lib/Config/Shortcodes.php
index aeb35ab16a..319cc1f3a4 100644
--- a/lib/Config/Shortcodes.php
+++ b/lib/Config/Shortcodes.php
@@ -56,12 +56,14 @@ class Shortcodes {
     }
 
     if(empty($segment_ids)) {
-      return Subscriber::filter('subscribed')->count();
+      return number_format_i18n(Subscriber::filter('subscribed')->count());
     } else {
-      return SubscriberSegment::whereIn('segment_id', $segment_ids)
-        ->select('subscriber_id')->distinct()
-        ->filter('subscribed')
-        ->findResultSet()->count();
+      return number_format_i18n(
+        SubscriberSegment::whereIn('segment_id', $segment_ids)
+          ->select('subscriber_id')->distinct()
+          ->filter('subscribed')
+          ->findResultSet()->count()
+      );
     }
   }