diff --git a/ghost/admin/app/components/gh-date-time-picker.hbs b/ghost/admin/app/components/gh-date-time-picker.hbs
index 6f2a6bf587..a634c5f928 100644
--- a/ghost/admin/app/components/gh-date-time-picker.hbs
+++ b/ghost/admin/app/components/gh-date-time-picker.hbs
@@ -37,7 +37,7 @@
>
{{this.timezone}}
- {{#if this.hasError}}
-
{{this.dateError}}{{this.timeError}}
- {{/if}}
+{{#if this.hasError}}
+ {{this.dateError}}{{this.timeError}}
+{{/if}}
diff --git a/ghost/admin/app/components/members/filter-value.hbs b/ghost/admin/app/components/members/filter-value.hbs
index 139c530805..e6b4358395 100644
--- a/ghost/admin/app/components/members/filter-value.hbs
+++ b/ghost/admin/app/components/members/filter-value.hbs
@@ -118,7 +118,7 @@
diff --git a/ghost/admin/app/styles/components/publishmenu.css b/ghost/admin/app/styles/components/publishmenu.css
index 6249845030..6a781a9d63 100644
--- a/ghost/admin/app/styles/components/publishmenu.css
+++ b/ghost/admin/app/styles/components/publishmenu.css
@@ -99,17 +99,16 @@
.gh-date-time-picker-timezone {
font-size: 1.1rem;
- font-weight: 300;
- color: color-mod(var(--midgrey) l(+17%));
+ color: var(--midgrey);
margin-left: -30px;
}
.gh-date-time-picker-error {
display: block;
+ padding-top: 4px;
font-size: 1.3rem;
line-height: 1.4em;
- font-weight: 300;
- color: var(--red);
+ color: var(--red-d1);
}
.gh-publish-send-to {
diff --git a/ghost/admin/app/validators/post.js b/ghost/admin/app/validators/post.js
index f6ab868a99..ec32addd34 100644
--- a/ghost/admin/app/validators/post.js
+++ b/ghost/admin/app/validators/post.js
@@ -190,12 +190,12 @@ export default BaseValidator.create({
// draft/published must be in past
if ((status === 'draft' || status === 'published') && publishedAtBlogTZ.isSameOrAfter(now)) {
- model.errors.add('publishedAtBlogDate', 'Must be in the past');
+ model.errors.add('publishedAtBlogDate', 'Please choose a past date and time.');
this.invalidate();
// scheduled must be in the future when first scheduling
} else if ((model.changedAttributes().status || model.changedAttributes().publishedAtUTC) && status === 'scheduled' && !isInFuture) {
- model.errors.add('publishedAtBlogDate', 'Must be in the future');
+ model.errors.add('publishedAtBlogDate', 'Please choose a future date and time.');
this.invalidate();
}
}
diff --git a/ghost/admin/tests/acceptance/editor-test.js b/ghost/admin/tests/acceptance/editor-test.js
index a4a2168355..612f2e7ddc 100644
--- a/ghost/admin/tests/acceptance/editor-test.js
+++ b/ghost/admin/tests/acceptance/editor-test.js
@@ -153,7 +153,7 @@ describe('Acceptance: Editor', function () {
await blur('[data-test-date-time-picker-time-input]');
expect(find('[data-test-date-time-picker-error]').textContent.trim(), 'inline error response for future time')
- .to.equal('Must be in the past');
+ .to.equal('Please choose a past date and time.');
// closing the PSM will reset the invalid date/time
await click('[data-test-psm-trigger]');
diff --git a/ghost/admin/tests/integration/components/gh-date-picker-test.js b/ghost/admin/tests/integration/components/gh-date-picker-test.js
index 2b5e3208fe..93e658c5d0 100644
--- a/ghost/admin/tests/integration/components/gh-date-picker-test.js
+++ b/ghost/admin/tests/integration/components/gh-date-picker-test.js
@@ -333,12 +333,12 @@ describe('Integration: Component: gh-date-picker', function () {
this.set('date', moment('2022-02-22 22:22:22.000')).toDate();
this.set('maxDate', moment('2022-02-25 12:00:00.000').toDate());
- await render(hbs``);
+ await render(hbs``);
await fillIn('[data-test-date-picker-input]', '2022-02-28');
await blur('[data-test-date-picker-input]');
- expect(find('[data-test-date-picker-error]')).to.have.text('Must be in the past');
+ expect(find('[data-test-date-picker-error]')).to.have.text('Please choose a past date.');
});
});