Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Merge pull request #1156 from mailpoet/number_formatting_update

Browse Source 
Formats number as per locale's convention [MAILPOET-1125]
This commit is contained in:
amine-mp
2017-10-23 15:19:47 +02:00
committed by GitHub
parent e8c85e2a54 4e378484ea
commit b2324db7b4
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
assets/js/src/newsletters/listings/mixins.jsx
View File

@@ -84,8 +84,8 @@ const _QueueMixin = {
<span> <span>
{ {
MailPoet.I18n.t('newsletterQueueCompleted') MailPoet.I18n.t('newsletterQueueCompleted')
.replace('%$1d', newsletter.queue.count_processed) .replace('%$1d', parseInt(newsletter.queue.count_processed, 10).toLocaleString())
.replace('%$2d', newsletter.queue.count_total) .replace('%$2d', parseInt(newsletter.queue.count_total, 10).toLocaleString())
} }
</span> </span>
); );

12
lib/Config/Shortcodes.php
View File

@@ -56,12 +56,14 @@ class Shortcodes {
} }
if(empty($segment_ids)) { if(empty($segment_ids)) {
return Subscriber::filter('subscribed')->count(); return number_format_i18n(Subscriber::filter('subscribed')->count());
} else { } else {
return SubscriberSegment::whereIn('segment_id', $segment_ids) return number_format_i18n(
->select('subscriber_id')->distinct() SubscriberSegment::whereIn('segment_id', $segment_ids)
->filter('subscribed') ->select('subscriber_id')->distinct()
->findResultSet()->count(); ->filter('subscribed')
->findResultSet()->count()
);
} }
} }