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

Improve code according the review

Browse Source 
[MAILPOET-3708]
This commit is contained in:
Jan Lysý
2021-08-09 15:11:56 +02:00
committed by Veljko V
parent 1a2c2746ca
commit 5e1f523c96
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletters/send/notification.jsx
View File

@@ -60,7 +60,7 @@ let fields = [
return segment.name; return segment.name;
}, },
getCount: function getCount(segment) { getCount: function getCount(segment) {
return `${parseInt(segment.subscribers, 10).toLocaleString()}`; return parseInt(segment.subscribers, 10).toLocaleString();
}, },
transformChangedValue: function transformChangedValue(segmentIds) { transformChangedValue: function transformChangedValue(segmentIds) {
const allSegments = this.getItems(); const allSegments = this.getItems();

2
assets/js/src/newsletters/send/standard.jsx
View File

@@ -160,7 +160,7 @@ let fields = [
return segment.name; return segment.name;
}, },
getCount: function getCount(segment) { getCount: function getCount(segment) {
return `${parseInt(segment.subscribers, 10).toLocaleString()}`; return parseInt(segment.subscribers, 10).toLocaleString();
}, },
transformChangedValue: function transformChangedValue(segmentIds) { transformChangedValue: function transformChangedValue(segmentIds) {
const allSegments = this.getItems(); const allSegments = this.getItems();

2
assets/js/src/newsletters/types/welcome/scheduling.jsx
View File

@@ -27,7 +27,7 @@ const segmentField = {
placeholder: MailPoet.I18n.t('selectSegmentPlaceholder'), placeholder: MailPoet.I18n.t('selectSegmentPlaceholder'),
forceSelect2: true, forceSelect2: true,
values: availableSegments, values: availableSegments,
getCount: (segment) => `${parseInt(segment.subscribers, 10).toLocaleString()}`, getCount: (segment) => parseInt(segment.subscribers, 10).toLocaleString(),
getLabel: (segment) => segment.name, getLabel: (segment) => segment.name,
getValue: (segment) => segment.id, getValue: (segment) => segment.id,
}; };

2
assets/js/src/settings/components/segments_select.tsx
View File

@@ -16,7 +16,7 @@ export default (props: Props) => {
const segments = useSelector(selector)().map((segment) => ({ const segments = useSelector(selector)().map((segment) => ({
value: segment.id, value: segment.id,
label: segment.name, label: segment.name,
count: `${segment.subscribers}`, count: segment.subscribers,
})); }));
const defaultValue = segments.filter((segment) => props.value.includes(segment.value)); const defaultValue = segments.filter((segment) => props.value.includes(segment.value));

2
lib/Models/Subscriber.php
View File

@@ -168,7 +168,7 @@ class Subscriber extends Model {
->whereNull('deleted_at') ->whereNull('deleted_at')
->count(); ->count();
$subscribersWithoutSegmentLabel = sprintf( $subscribersWithoutSegmentLabel = sprintf(
WPFunctions::get()->__('Subscribers without a list (%s)', 'mailpoet'), __('Subscribers without a list (%s)', 'mailpoet'),
number_format($subscribersWithoutSegment) number_format($subscribersWithoutSegment)
); );

2
lib/Subscribers/SubscriberListingRepository.php
View File

@@ -233,7 +233,7 @@ class SubscriberListingRepository extends ListingRepository {
$subscribersWithoutSegmentCount = $subscribersWithoutSegmentStats[$key]; $subscribersWithoutSegmentCount = $subscribersWithoutSegmentStats[$key];
$subscribersWithoutSegmentLabel = sprintf( $subscribersWithoutSegmentLabel = sprintf(
WPFunctions::get()->__('Subscribers without a list (%s)', 'mailpoet'), __('Subscribers without a list (%s)', 'mailpoet'),
number_format((float)$subscribersWithoutSegmentCount) number_format((float)$subscribersWithoutSegmentCount)
); );