Remove the character "~" from counts

[MAILPOET-3708]
This commit is contained in:
Jan Lysý
2021-08-06 14:17:11 +02:00
committed by Veljko V
parent 4120839102
commit 74dc9fce53
9 changed files with 12 additions and 12 deletions

View File

@ -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')),
}}
/>

View File

@ -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();

View File

@ -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();

View File

@ -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,
};

View File

@ -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));

View File

@ -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)
);

View File

@ -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(),
];
}

View File

@ -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);
}

View File

@ -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() {