diff --git a/assets/css/src/components/_parsley.scss b/assets/css/src/components/_parsley.scss index b4fcf6dbd2..85af8bdbd0 100644 --- a/assets/css/src/components/_parsley.scss +++ b/assets/css/src/components/_parsley.scss @@ -40,3 +40,7 @@ textarea.parsley-error { .parsley-custom-error-message { color: #b94a48; } + +.mailpoet-form-errors { + padding: 0 16px; +} diff --git a/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx b/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx index f34a515635..1f8b189ee2 100644 --- a/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx +++ b/assets/js/src/newsletters/automatic_emails/events/event_scheduling.jsx @@ -1,4 +1,5 @@ import React from 'react'; +import MailPoet from 'mailpoet'; import Selection from 'form/fields/selection.jsx'; import Text from 'form/fields/text.jsx'; import { timeDelayValues } from 'newsletters/scheduling/common.jsx'; @@ -106,6 +107,8 @@ class EventScheduling extends React.Component { size: afterTimeNumberSize, validation: { 'data-parsley-required': true, + 'data-parsley-errors-container': '.mailpoet-form-errors', + 'data-parsley-scheduled-at': MailPoet.I18n.t('emailCanBeScheduledUpToFiveYears'), }, }, item: {}, @@ -136,6 +139,7 @@ class EventScheduling extends React.Component { {this.displayAfterTimeNumberField()} {this.displayAfterTimeTypeOptions()} +
{ event.schedulingReadMoreLink diff --git a/assets/js/src/newsletters/types/welcome/scheduling.jsx b/assets/js/src/newsletters/types/welcome/scheduling.jsx index dc92693701..00fd7231bc 100644 --- a/assets/js/src/newsletters/types/welcome/scheduling.jsx +++ b/assets/js/src/newsletters/types/welcome/scheduling.jsx @@ -42,6 +42,8 @@ const afterTimeNumberField = { size: 3, validation: { 'data-parsley-required': true, + 'data-parsley-errors-container': '.mailpoet-form-errors', + 'data-parsley-scheduled-at': MailPoet.I18n.t('emailCanBeScheduledUpToFiveYears'), }, }; @@ -134,6 +136,7 @@ class WelcomeScheduling extends React.Component { onValueChange={this.handleAfterTimeTypeChange} /> + ); diff --git a/views/newsletters.html b/views/newsletters.html index 18a33f3460..60b203bec2 100644 --- a/views/newsletters.html +++ b/views/newsletters.html @@ -436,6 +436,7 @@ 'newsletterIsEmpty': __('Poet, please add prose to your masterpiece before you send it to your followers.'), 'automatedLatestContentMissing': _x('Please add an “Automatic Latest Content” widget to the email from the right sidebar.', '(Please reuse the current translation used for the string “Automatic Latest Content”) This Error message is displayed when a user tries to send a “Post Notification” email without any “Automatic Latest Content” widget inside'), 'emailAlreadySent': __('This email has already been sent. It can be edited, but not sent again. Duplicate this email if you want to send it again.'), + 'emailCanBeScheduledUpToFiveYears': __('An email can only be scheduled up to 5 years in the future. Please choose a shorter period.'), }) %> <% include('mss_pitch_translations.html') %> <% endblock %>