diff --git a/ghost/admin/app/components/gh-members-segment-count.hbs b/ghost/admin/app/components/gh-members-segment-count.hbs index 0f39086866..57045c0f53 100644 --- a/ghost/admin/app/components/gh-members-segment-count.hbs +++ b/ghost/admin/app/components/gh-members-segment-count.hbs @@ -4,6 +4,6 @@ {{did-insert (perform this.fetchTotalsTask)}} {{did-update (perform this.fetchSegmentTotalTask) @segment}} > - {{format-number this.segmentTotal}} members + {{format-number this.segmentTotal}} {{gh-pluralize this.segmentTotal "member" without-count=true}} {{/if}} \ No newline at end of file diff --git a/ghost/admin/app/components/settings/default-email-recipients.hbs b/ghost/admin/app/components/settings/default-email-recipients.hbs index edd8af69f7..183b603e49 100644 --- a/ghost/admin/app/components/settings/default-email-recipients.hbs +++ b/ghost/admin/app/components/settings/default-email-recipients.hbs @@ -11,12 +11,19 @@
-
Disabled
+
Send emails to
+
+ +
-
All members
-
-
-
-
-
-
Free members
-
-
-
-
-
-
Paid members
-
-
-
-
-
-
Specific segment:
-
- -
+
Disabled
diff --git a/ghost/admin/app/components/settings/default-email-recipients.js b/ghost/admin/app/components/settings/default-email-recipients.js index 0ba055b749..bb35614ca2 100644 --- a/ghost/admin/app/components/settings/default-email-recipients.js +++ b/ghost/admin/app/components/settings/default-email-recipients.js @@ -29,34 +29,9 @@ export default class SettingsDefaultEmailRecipientsComponent extends Component { this.settings.get('editorDefaultEmailRecipientsFilter') === null; } - get isAllSelected() { - return !this.isDisabled && - !this.segmentSelected && - this.settings.get('editorDefaultEmailRecipients') === 'filter' && - this.settings.get('editorDefaultEmailRecipientsFilter') === 'status:free,status:-free'; - } - - get isFreeSelected() { - return !this.isDisabled && - !this.segmentSelected && - this.settings.get('editorDefaultEmailRecipients') === 'filter' && - this.settings.get('editorDefaultEmailRecipientsFilter') === 'status:free'; - } - - get isPaidSelected() { - return !this.isDisabled && - !this.segmentSelected && - this.settings.get('editorDefaultEmailRecipients') === 'filter' && - this.settings.get('editorDefaultEmailRecipientsFilter') === 'status:-free'; - } - get isSegmentSelected() { const isCustomSegment = this.settings.get('editorDefaultEmailRecipients') === 'filter' && - !this.isNobodySelected && - !this.isAllSelected && - !this.isFreeSelected && - !this.isPaidSelected; - + !this.isNobodySelected; return !this.isDisabled && (this.segmentSelected || isCustomSegment); } @@ -73,18 +48,6 @@ export default class SettingsDefaultEmailRecipientsComponent extends Component { this.settings.set('editorDefaultEmailRecipientsFilter', null); } - if (value === 'all') { - this.settings.set('editorDefaultEmailRecipientsFilter', 'status:free,status:-free'); - } - - if (value === 'free') { - this.settings.set('editorDefaultEmailRecipientsFilter', 'status:free'); - } - - if (value === 'paid') { - this.settings.set('editorDefaultEmailRecipientsFilter', 'status:-free'); - } - if (value === 'segment') { this.segmentSelected = true; }