diff --git a/assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx b/assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx index 2d6e361937..5fa083a5be 100644 --- a/assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx +++ b/assets/js/src/form_editor/components/form_settings/basic_settings_panel.jsx @@ -108,7 +108,7 @@ const BasicSettingsPanel = ({ onToggle, isOpened }) => { values: segments, multiple: true, placeholder: MailPoet.I18n.t('settingsPleaseSelectList'), - getLabel: (seg) => (`${seg.name} (~${parseInt(seg.subscribers, 10).toLocaleString()})`), + getLabel: (seg) => (`${seg.name} (${parseInt(seg.subscribers, 10).toLocaleString()})`), filter: (seg) => (!!(!seg.deleted_at && seg.type === 'default')), }} /> diff --git a/assets/js/src/newsletters/send/notification.jsx b/assets/js/src/newsletters/send/notification.jsx index 87cfb837c7..7a69eccc67 100644 --- a/assets/js/src/newsletters/send/notification.jsx +++ b/assets/js/src/newsletters/send/notification.jsx @@ -60,7 +60,7 @@ let fields = [ return segment.name; }, getCount: function getCount(segment) { - return `~${parseInt(segment.subscribers, 10).toLocaleString()}`; + return `${parseInt(segment.subscribers, 10).toLocaleString()}`; }, transformChangedValue: function transformChangedValue(segmentIds) { const allSegments = this.getItems(); diff --git a/assets/js/src/newsletters/send/standard.jsx b/assets/js/src/newsletters/send/standard.jsx index 557caf062d..1c548f362d 100644 --- a/assets/js/src/newsletters/send/standard.jsx +++ b/assets/js/src/newsletters/send/standard.jsx @@ -160,7 +160,7 @@ let fields = [ return segment.name; }, getCount: function getCount(segment) { - return `~${parseInt(segment.subscribers, 10).toLocaleString()}`; + return `${parseInt(segment.subscribers, 10).toLocaleString()}`; }, transformChangedValue: function transformChangedValue(segmentIds) { const allSegments = this.getItems(); diff --git a/assets/js/src/newsletters/types/welcome/scheduling.jsx b/assets/js/src/newsletters/types/welcome/scheduling.jsx index 9f40b710b0..8d2320b369 100644 --- a/assets/js/src/newsletters/types/welcome/scheduling.jsx +++ b/assets/js/src/newsletters/types/welcome/scheduling.jsx @@ -27,7 +27,7 @@ const segmentField = { placeholder: MailPoet.I18n.t('selectSegmentPlaceholder'), forceSelect2: true, values: availableSegments, - getCount: (segment) => `~${parseInt(segment.subscribers, 10).toLocaleString()}`, + getCount: (segment) => `${parseInt(segment.subscribers, 10).toLocaleString()}`, getLabel: (segment) => segment.name, getValue: (segment) => segment.id, }; diff --git a/assets/js/src/settings/components/segments_select.tsx b/assets/js/src/settings/components/segments_select.tsx index 7594527a66..e13d8998ca 100644 --- a/assets/js/src/settings/components/segments_select.tsx +++ b/assets/js/src/settings/components/segments_select.tsx @@ -16,7 +16,7 @@ export default (props: Props) => { const segments = useSelector(selector)().map((segment) => ({ value: segment.id, label: segment.name, - count: `~${segment.subscribers}`, + count: `${segment.subscribers}`, })); const defaultValue = segments.filter((segment) => props.value.includes(segment.value)); diff --git a/lib/Models/Subscriber.php b/lib/Models/Subscriber.php index 888c8f022a..05a9955ac7 100644 --- a/lib/Models/Subscriber.php +++ b/lib/Models/Subscriber.php @@ -168,7 +168,7 @@ class Subscriber extends Model { ->whereNull('deleted_at') ->count(); $subscribersWithoutSegmentLabel = sprintf( - WPFunctions::get()->__('Subscribers without a list (~%s)', 'mailpoet'), + WPFunctions::get()->__('Subscribers without a list (%s)', 'mailpoet'), number_format($subscribersWithoutSegment) ); @@ -186,7 +186,7 @@ class Subscriber extends Model { } $label = sprintf( - '%s (~%s)', + '%s (%s)', $segment->name, number_format($subscribersCount) ); diff --git a/lib/Subscribers/SubscriberListingRepository.php b/lib/Subscribers/SubscriberListingRepository.php index dc050d2e9b..768fd8af57 100644 --- a/lib/Subscribers/SubscriberListingRepository.php +++ b/lib/Subscribers/SubscriberListingRepository.php @@ -233,7 +233,7 @@ class SubscriberListingRepository extends ListingRepository { $subscribersWithoutSegmentCount = $subscribersWithoutSegmentStats[$key]; $subscribersWithoutSegmentLabel = sprintf( - WPFunctions::get()->__('Subscribers without a list (~%s)', 'mailpoet'), + WPFunctions::get()->__('Subscribers without a list (%s)', 'mailpoet'), number_format((float)$subscribersWithoutSegmentCount) ); @@ -271,7 +271,7 @@ class SubscriberListingRepository extends ListingRepository { } $segmentList[] = [ - 'label' => sprintf('%s (~%s)', $segment->getName(), number_format((float)$count[$key])), + 'label' => sprintf('%s (%s)', $segment->getName(), number_format((float)$count[$key])), 'value' => $segment->getId(), ]; } diff --git a/tests/integration/API/JSON/v1/SubscribersTest.php b/tests/integration/API/JSON/v1/SubscribersTest.php index 03a25db11c..fc7097921f 100644 --- a/tests/integration/API/JSON/v1/SubscribersTest.php +++ b/tests/integration/API/JSON/v1/SubscribersTest.php @@ -364,7 +364,7 @@ class SubscribersTest extends \MailPoetTest { 'segment' => $dynamicSegment->getId(), ], ]); - expect($response->meta['filters']['segment'])->contains(['value' => $dynamicSegment->getId(), 'label' => 'Dynamic (~1)']); + expect($response->meta['filters']['segment'])->contains(['value' => $dynamicSegment->getId(), 'label' => 'Dynamic (1)']); $this->tester->deleteWordPressUser($wpUserEmail); } diff --git a/tests/integration/Subscribers/SubscriberListingRepositoryTest.php b/tests/integration/Subscribers/SubscriberListingRepositoryTest.php index 3d81fd087a..dbda834e25 100644 --- a/tests/integration/Subscribers/SubscriberListingRepositoryTest.php +++ b/tests/integration/Subscribers/SubscriberListingRepositoryTest.php @@ -70,8 +70,8 @@ class SubscriberListingRepositoryTest extends \MailPoetTest { $filters = $this->repository->getFilters($this->getListingDefinition()); expect($filters['segment'])->count(3); expect($filters['segment'][0]['label'])->equals('All Lists'); - expect($filters['segment'][1]['label'])->equals('Subscribers without a list (~3)'); - expect($filters['segment'][2]['label'])->endsWith('(~2)'); + expect($filters['segment'][1]['label'])->equals('Subscribers without a list (3)'); + expect($filters['segment'][2]['label'])->endsWith('(2)'); } public function testItBuildsGroups() {