diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs b/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs
index 8e1d632020..1233bbcde1 100644
--- a/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs
+++ b/ghost/admin/app/components/editor-labs/modals/publish-flow/complete.hbs
@@ -1,41 +1,8 @@
{{#let @publishOptions.post as |post|}}
- ...aand it's out there.
- Now that's something to smile about.
+ Boom. It’s out there. That’s 391 posts published, keep going!
-
- {{#if post.isScheduled}}
- {{#let (moment-site-tz post.publishedAtUTC) as |scheduledAt|}}
- On
-
- {{moment-format scheduledAt "D MMM YYYY"}}
- at
- {{moment-format scheduledAt "HH:mm"}}
-
- your
- {{/let}}
- {{else}}
- Your
- {{/if}}
-
- {{post.displayName}} is
-
- {{#if post.email}}
- on its way to
-
- {{pluralize post.email.emailCount "member"}}
-
- and was
-
- {{#if post.emailOnly}}
- not
- {{/if}}
- {{/if}}
-
- published on your site.
-
-
{{#unless post.emailOnly}}
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs b/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs
index 12c98d112d..2a83c49f93 100644
--- a/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs
+++ b/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.hbs
@@ -19,8 +19,14 @@
{{@publishOptions.post.displayName}}
+ {{#if @publishOptions.willPublish}}
+ will be published on your site{{#if @publishOptions.willEmail}}, and delivered to{{else}}.{{/if}}
+ {{/if}}
+
{{#if @publishOptions.willEmail}}
- will be delivered to
+ {{#unless @publishOptions.willPublish}}
+ will be delivered to
+ {{/unless}}
{{#let (members-count-fetcher query=(hash filter=@publishOptions.fullRecipientFilter)) as |countFetcher|}}
@@ -36,22 +42,16 @@
{{gh-pluralize countFetcher.count "member" without-count=true}}
{{else}}
{{gh-pluralize countFetcher.count "subscriber" without-count=true}}
- of {{@publishOptions.newsletter.name}}
+ of {{@publishOptions.newsletter.name}}{{#if @publishOptions.willPublish}}.{{else}},{{/if}}
{{/if}}
{{/let}}
- {{#if @publishOptions.willPublish}}
- and
- {{else}}
+ {{#unless @publishOptions.willPublish}}
and will not be published on your site.
- {{/if}}
+ {{/unless}}
{{/if}}
- {{#if @publishOptions.willPublish}}
- will be published on your site.
- {{/if}}
-
- Are you good to go?
+ This is it.
\ No newline at end of file
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs b/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs
index 6e39303313..0cd77f66a9 100644
--- a/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs
+++ b/ghost/admin/app/components/editor-labs/modals/publish-flow/options.hbs
@@ -108,9 +108,6 @@
-
-
- Or
-
-
+
+
\ No newline at end of file
diff --git a/ghost/admin/app/components/editor-labs/modals/update-flow.hbs b/ghost/admin/app/components/editor-labs/modals/update-flow.hbs
index 1d967cc33a..381fda39b9 100644
--- a/ghost/admin/app/components/editor-labs/modals/update-flow.hbs
+++ b/ghost/admin/app/components/editor-labs/modals/update-flow.hbs
@@ -1,25 +1,23 @@
{{#let @data.publishOptions.post as |post|}}
-
+
This {{post.displayName}} is
- {{post.status}}
+ {{post.status}}
-
+
{{#let (moment-site-tz post.publishedAtUTC) as |publishedAt|}}
On
-
{{moment-format publishedAt "D MMM YYYY"}}
at
{{moment-format publishedAt "HH:mm"}}
-
your
{{/let}}
diff --git a/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs b/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs
index 902143b608..d0fa4b5f82 100644
--- a/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs
+++ b/ghost/admin/app/components/editor-labs/publish-options/publish-at.hbs
@@ -7,7 +7,7 @@