diff --git a/assets/js/src/newsletters/listings/welcome.jsx b/assets/js/src/newsletters/listings/welcome.jsx index e008d85fd7..9df82b0b64 100644 --- a/assets/js/src/newsletters/listings/welcome.jsx +++ b/assets/js/src/newsletters/listings/welcome.jsx @@ -193,24 +193,10 @@ const NewsletterListWelcome = createReactClass({ // eslint-disable-line react/pr }, renderStatus: function renderStatus(newsletter) { - let totalSentMessage = MailPoet.I18n.t('notSentYet'); - const totalSent = (parseInt(newsletter.total_sent, 10)); - if (totalSent === 1) { - totalSentMessage = MailPoet.I18n.t('sentToXSubscribers'); - } - if (totalSent > 1) { - totalSentMessage = MailPoet.I18n.t('sentToXSubscribersPlural') - .replace('%$1d', newsletter.total_sent.toLocaleString()); - } - let totalScheduledMessage = ''; - const totalScheduled = (parseInt(newsletter.total_scheduled, 10)); - if (totalScheduled === 1) { - totalScheduledMessage = MailPoet.I18n.t('scheduledToXSubscribers'); - } - if (totalScheduled > 1) { - totalScheduledMessage = MailPoet.I18n.t('scheduledToXSubscribersPlural') - .replace('%$1d', newsletter.total_sent.toLocaleString()); - } + const totalSentMessage = MailPoet.I18n.t('sentToXSubscribers') + .replace('%$1d', newsletter.total_sent.toLocaleString()); + const totalScheduledMessage = MailPoet.I18n.t('scheduledToXSubscribers') + .replace('%$1d', newsletter.total_scheduled.toLocaleString()); return (
@@ -225,8 +211,7 @@ const NewsletterListWelcome = createReactClass({ // eslint-disable-line react/pr

- { totalSentMessage } - { totalScheduledMessage !== '' ?
: '' } + { totalSentMessage }
{ totalScheduledMessage }

diff --git a/views/newsletters.html b/views/newsletters.html index 0e483b526d..0cd5836917 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -105,10 +105,8 @@ 'active': __('Active'), 'inactive': __('Not Active'), 'newsletterQueueCompleted': __('Sent to %$1d of %$2d'), - 'sentToXSubscribers': _x('Sent to 1 subscriber', 'inform the number of emails already sent'), - 'sentToXSubscribersPlural': _x('Sent to %$1d subscribers', 'inform the number of emails already sent; always plural'), - 'scheduledToXSubscribers': _x('1 scheduled to be sent', 'inform the number of emails planned to be sent'), - 'scheduledToXSubscribersPlural': _x('%$1d scheduled to be sent', 'inform the number of emails planned to be sent; always plural'), + 'sentToXSubscribers': _x('%$1d sent', 'number of welcome emails sent'), + 'scheduledToXSubscribers': _x('%$1d scheduled', 'number of welcome emails scheduled to be sent'), 'resume': __('Resume'), 'pause': __('Pause'), 'paused': __('Paused'),