From f9ce41620af1c2ba3eddaf05e78c510b60a37abe Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Fri, 6 May 2022 15:12:38 +0100
Subject: [PATCH] Updated confirm publish button text

no issue

- button text changed to include the post type and time of publish
- the button text has become more complex than a static string so the logic was moved into a getter on the confirm component backing class
---
 .../modals/publish-flow/confirm.hbs           |  4 +--
 .../modals/publish-flow/confirm.js            | 30 +++++++++++++++++++
 .../editor-labs/publish-management.js         |  5 +---
 3 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.js

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 992d1f7dc2..12c98d112d 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
@@ -1,5 +1,5 @@
 <div class="gh-publish-title">
-    <div class="green">Ready, set, publish.</div> 
+    <div class="green">Ready, set, publish.</div>
     <div>Share it with the world.</div>
 </div>
 <p class="gh-publish-confirmation">
@@ -57,7 +57,7 @@
 <div class="gh-publish-cta">
     <GhTaskButton
         @task={{@saveTask}}
-        @buttonText={{@publishOptions.selectedPublishTypeOption.confirmButton}}
+        @buttonText={{this.confirmButtonText}}
         @runningText={{if @publishOptions.willOnlyEmail "Sending" "Publishing"}}
         @successText={{if @publishOptions.willOnlyEmail "Sent" "Published"}}
         @class="gh-btn gh-btn-pulse gh-btn-large"
diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.js b/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.js
new file mode 100644
index 0000000000..886d888467
--- /dev/null
+++ b/ghost/admin/app/components/editor-labs/modals/publish-flow/confirm.js
@@ -0,0 +1,30 @@
+import Component from '@glimmer/component';
+import moment from 'moment';
+import {inject as service} from '@ember/service';
+
+export default class PublishFlowOptions extends Component {
+    @service settings;
+
+    get confirmButtonText() {
+        const publishType = this.args.publishOptions.publishType;
+
+        let buttonText = '';
+
+        if (publishType === 'publish+send') {
+            buttonText = 'Publish & send';
+        } else if (publishType === 'publish') {
+            buttonText = `Publish ${this.args.publishOptions.post.displayName}`;
+        } else if (publishType === 'send') {
+            buttonText = 'Send email';
+        }
+
+        if (this.args.publishOptions.isScheduled) {
+            const scheduleMoment = moment.tz(this.args.publishOptions.scheduledAtUTC, this.settings.get('timezone'));
+            buttonText += `, on ${scheduleMoment.format('MMMM Do')}`;
+        } else {
+            buttonText += ', right now';
+        }
+
+        return buttonText;
+    }
+}
diff --git a/ghost/admin/app/components/editor-labs/publish-management.js b/ghost/admin/app/components/editor-labs/publish-management.js
index 37b3fea91b..5e07ca2628 100644
--- a/ghost/admin/app/components/editor-labs/publish-management.js
+++ b/ghost/admin/app/components/editor-labs/publish-management.js
@@ -92,18 +92,15 @@ export class PublishOptions {
             value: 'publish+send', // internal
             label: 'Publish and email', // shown in expanded options
             display: 'Publish and email', // shown in option title
-            confirmButton: 'Yes, publish and send', // shown in confirm step
             disabled: this.emailDisabled
         }, {
             value: 'publish',
             label: 'Publish only',
-            display: 'Publish',
-            confirmButton: 'Yes, publish on site'
+            display: 'Publish'
         }, {
             value: 'send',
             label: 'Email only',
             display: 'Email',
-            confirmButton: 'Yes, send by email',
             disabled: this.emailDisabled
         }];
     }