diff --git a/ghost/admin/app/components/modal-import-members.hbs b/ghost/admin/app/components/modal-import-members.hbs
index b904f92326..019f385e07 100644
--- a/ghost/admin/app/components/modal-import-members.hbs
+++ b/ghost/admin/app/components/modal-import-members.hbs
@@ -2,12 +2,12 @@
{{#if this.summary}}
Import complete{{unless this.importResponse.invalid.count "!"}}
- {{/if}}
-
- {{#if this.uploading}}
- Importing members
{{else}}
- Import members
+ {{#if this.uploading}}
+ Importing members
+ {{else}}
+ Import members
+ {{/if}}
{{/if}}
@@ -110,7 +110,7 @@
{{#if this.config.enableDeveloperExperiments}}
{{#each this.importResponse.invalid.errors as |error|}}
- - {{error.message}} ({{format-number error.count}})
+ - {{error.message}} ({{format-number error.count}})
{{/each}}
{{/if}}
diff --git a/ghost/admin/app/services/member-import-validator.js b/ghost/admin/app/services/member-import-validator.js
index 987b6b1f83..baad0b9375 100644
--- a/ghost/admin/app/services/member-import-validator.js
+++ b/ghost/admin/app/services/member-import-validator.js
@@ -3,6 +3,7 @@ import Service, {inject as service} from '@ember/service';
import validator from 'validator';
import {formatNumber} from 'ghost-admin/helpers/format-number';
import {isEmpty} from '@ember/utils';
+import {pluralize} from 'ember-inflector';
export default Service.extend({
ajax: service(),
@@ -32,8 +33,8 @@ export default Service.extend({
if (!this.membersUtils.isStripeEnabled) {
validationErrors.push(new MemberImportError({
- message: `Missing Stripe connection (${formatNumber(totalCount)})`,
- context: `Stripe customers won't be imported. You need to connect to Stripe to import stripe customers.`,
+ message: `Missing Stripe connection`,
+ context: `${formatNumber(totalCount)} ${pluralize(totalCount, 'Stripe customer', {withoutCount: true})} won't be imported. You need to connect to Stripe to import Stripe customers.`,
type: 'warning'
}));
} else {
@@ -49,7 +50,7 @@ export default Service.extend({
if (duplicateCount) {
validationErrors.push(new MemberImportError({
- message: `Duplicate Stripe ID (${formatNumber(duplicateCount)})`,
+ message: `Duplicate Stripe ID (${formatNumber(duplicateCount)})`,
type: 'warning'
}));
}
@@ -65,7 +66,7 @@ export default Service.extend({
if (emptyCount) {
validationErrors.push(new MemberImportError({
- message: `Missing email address (${formatNumber(emptyCount)})`,
+ message: `Missing email address (${formatNumber(emptyCount)})`,
type: 'warning'
}));
}
diff --git a/ghost/admin/tests/integration/services/member-import-validator-test.js b/ghost/admin/tests/integration/services/member-import-validator-test.js
index 2cf821f3f1..6b57d6f2c2 100644
--- a/ghost/admin/tests/integration/services/member-import-validator-test.js
+++ b/ghost/admin/tests/integration/services/member-import-validator-test.js
@@ -57,7 +57,7 @@ describe('Integration: Service: member-import-validator', function () {
}]);
expect(validationErrors.length).to.equal(1);
- expect(validationErrors[0].message).to.equal('Missing Stripe connection (1)');
+ expect(validationErrors[0].message).to.equal('Missing Stripe connection');
expect(mapping.email).to.equal('email');
expect(mapping.stripe_customer_id).to.equal('stripe_customer_id');
});