diff --git a/ghost/admin/app/components/editor-labs/modals/publish-flow.hbs b/ghost/admin/app/components/editor-labs/modals/publish-flow.hbs index 12727559dd..d44b048e96 100644 --- a/ghost/admin/app/components/editor-labs/modals/publish-flow.hbs +++ b/ghost/admin/app/components/editor-labs/modals/publish-flow.hbs @@ -40,6 +40,7 @@ {{else if this.isComplete}} 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 9535f5d9f5..29e6e5494d 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 @@ -40,21 +40,25 @@ Your post {{if post.isScheduled "will be" "was"}} sent to - {{#if post.isScheduled}} - {{#let (members-count-fetcher query=(hash filter=post.fullRecipientFilter)) as |countFetcher|}} - {{#if @publishOptions.onlyDefaultNewsletter}} - {{gh-pluralize post.email.emailCount "subscribers"}} - {{else}} - {{gh-pluralize post.email.emailCount "subscriber"}} of {{@publishOptions.post.newsletter.name}} - {{/if}} - {{/let}} - {{else}} + + {{#let (members-count-fetcher query=(hash filter=post.fullRecipientFilter)) as |countFetcher|}} + + + {{if (eq @recipientType "all") "all"}} + + {{countFetcher.count}} + + {{!-- @recipientType = none/free/paid/all/specific --}} + {{if (not-eq @recipientType "all") @recipientType}} + + {{#if @publishOptions.onlyDefaultNewsletter}} - {{gh-pluralize post.email.emailCount "subscribers"}} + {{gh-pluralize countFetcher.count "subscriber" without-count=true}} {{else}} - {{gh-pluralize post.email.emailCount "subscriber"}} of {{@publishOptions.post.newsletter.name}} + {{gh-pluralize countFetcher.count "subscriber" without-count=true}} + of {{@publishOptions.newsletter.name}}, {{/if}} - {{/if}} + {{/let}} {{#let (moment-site-tz post.publishedAtUTC) as |publishedAt|}} on