TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-29 07:09:48 +03:00
Code Issues Projects Releases Wiki Activity

Added pluralisation to members import

Browse Source 
no refs.
- added correct pluralisation to pre- and post-validation copy of members import
This commit is contained in:
Peter Zimon 2020-07-08 13:09:23 +02:00
parent 4ee30dc5bd
commit 5d261bfde8
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ghost/admin/app/components/modal-import-members.hbs
View File

@ -19,11 +19,11 @@
<div class="flex items-start"> <div class="flex items-start">
<div class="w-50 gh-member-import-result-summary"> <div class="w-50 gh-member-import-result-summary">
<h2>{{this.importResponse.imported.count}}</h2> <h2>{{this.importResponse.imported.count}}</h2>
<p>Members added</p> <p>{{pluralize this.importResponse.imported.count "Member" without-count=true}} added</p>
</div> </div>
<div class="bl b--whitegrey w-50 gh-member-import-result-summary"> <div class="bl b--whitegrey w-50 gh-member-import-result-summary">
<h2>{{this.importResponse.invalid.count}}</h2> <h2>{{this.importResponse.invalid.count}}</h2>
<p>Errors</p> <p>{{pluralize this.importResponse.invalid.count "Error" without-count=true}}</p>
</div> </div>
</div> </div>
</div> </div>
@ -33,7 +33,7 @@
<div class="flex items-start"> <div class="flex items-start">
{{svg-jar "warning" class="w5 h5 fill-red nudge-top--3 mr3"}} {{svg-jar "warning" class="w5 h5 fill-red nudge-top--3 mr3"}}
<div class="flex-grow w-100"> <div class="flex-grow w-100">
<p class="ma0 pa0"><span class="fw5">{{this.importResponse.invalid.count}}</span> members were skipped due to the following errors:</p> <p class="ma0 pa0">{{pluralize this.importResponse.invalid.count "member"}} were skipped due to the following errors:</p>
{{#if this.config.enableDeveloperExperiments}} {{#if this.config.enableDeveloperExperiments}}
<ul class="ma0 pa0 mt4 list bt b--whitegrey"> <ul class="ma0 pa0 mt4 list bt b--whitegrey">
{{#each this.importResponse.invalid.errors as |error|}} {{#each this.importResponse.invalid.errors as |error|}}
@ -51,10 +51,16 @@
{{#if (and this.filePresent (not this.failureMessage))}} {{#if (and this.filePresent (not this.failureMessage))}}
{{#if this.validating}} {{#if this.validating}}
{{#if validationErrors}} {{#if validationErrors}}
<div class="failed flex items-start gh-members-upload-errorcontainer warning"> <div class="failed flex items-start gh-members-upload-errorcontainer {{if this.importDisabled "error" "warning"}}">
<div class="mr3">{{svg-jar "warning" class="nudge-top--2 w5 h5 fill-yellow-d1"}}</div> <div class="mr3">
{{#if this.importDisabled}}
{{svg-jar "warning" class="nudge-top--2 w5 h5 fill-red"}}
{{else}}
{{svg-jar "warning" class="nudge-top--2 w5 h5 fill-yellow-d1"}}
{{/if}}
</div>
<div class="ma0"> <div class="ma0">
<p class="ma0 pa0 flex-grow w-100">The CSV contains errors! Some members will not be imported.</p> <p class="ma0 pa0 flex-grow w-100">The CSV contains errors! {{unless this.importDisabled "Some members will not be imported."}}</p>
{{#if validationErrors}} {{#if validationErrors}}
<ul class="ma0 pa0 mt4 list bt b--whitegrey"> <ul class="ma0 pa0 mt4 list bt b--whitegrey">
{{#each validationErrors as |error|}} {{#each validationErrors as |error|}}
@ -106,7 +112,7 @@
{{/if}} {{/if}}
{{else}} {{else}}
{{#if this.failureMessage}} {{#if this.failureMessage}}
<div class="failed flex items-start gh-members-upload-errorcontainer gh-members-upload-errormessage"> <div class="failed flex items-start gh-members-upload-errorcontainer error">
<div class="mr2">{{svg-jar "warning" class="nudge-top--2 w4 h4 fill-red"}}</div> <div class="mr2">{{svg-jar "warning" class="nudge-top--2 w4 h4 fill-red"}}</div>
<p class="ma0 pa0">{{this.failureMessage}}</p> <p class="ma0 pa0">{{this.failureMessage}}</p>
</div> </div>
@ -136,9 +142,11 @@
<button {{action "reset"}} class="gh-btn" data-test-button="close-import-members"> <button {{action "reset"}} class="gh-btn" data-test-button="close-import-members">
<span>Start over</span> <span>Start over</span>
</button> </button>
<button class="gh-btn gh-btn-blue" {{action "continueImport"}} disabled={{this.importDisabled}}> {{#unless this.importDisabled}}
<button class="gh-btn gh-btn-blue" {{action "continueImport"}}>
<span>Continue</span> <span>Continue</span>
</button> </button>
{{/unless}}
{{/if}} {{/if}}
{{else}} {{else}}
<button {{action "reset"}} class="gh-btn" data-test-button="close-import-members"> <button {{action "reset"}} class="gh-btn" data-test-button="close-import-members">

3
ghost/admin/app/services/member-import-validator.js
View File

@ -2,6 +2,7 @@ import MemberImportError from 'ghost-admin/errors/member-import-error';
import Service, {inject as service} from '@ember/service'; import Service, {inject as service} from '@ember/service';
import validator from 'validator'; import validator from 'validator';
import {isEmpty} from '@ember/utils'; import {isEmpty} from '@ember/utils';
import {pluralize} from 'ember-inflector';
export default Service.extend({ export default Service.extend({
ajax: service(), ajax: service(),
@ -32,7 +33,7 @@ export default Service.extend({
if (!this.membersUtils.isStripeEnabled) { if (!this.membersUtils.isStripeEnabled) {
validationErrors.push(new MemberImportError({ validationErrors.push(new MemberImportError({
message: 'Missing stripe connection', message: 'Missing stripe connection',
context: `${totalCount} Stripe customers won't be imported. You need to <a href="#/settings/labs">connect to Stripe</a> to import stripe customers.`, context: (pluralize(totalCount, 'Stripe customer')) + ` won't be imported. You need to <a href="#/settings/labs">connect to Stripe</a> to import stripe customers.`,
type: 'warning' type: 'warning'
})); }));
} else { } else {