diff --git a/ghost/admin/app/controllers/members.js b/ghost/admin/app/controllers/members.js index 083cc16b2d..98119eb797 100644 --- a/ghost/admin/app/controllers/members.js +++ b/ghost/admin/app/controllers/members.js @@ -3,7 +3,7 @@ import ghostPaths from 'ghost-admin/utils/ghost-paths'; import moment from 'moment'; import {A} from '@ember/array'; import {action} from '@ember/object'; -import {ghPluralize} from 'ghost-admin/helpers/pluralize'; +import {ghPluralize} from 'ghost-admin/helpers/gh-pluralize'; import {inject as service} from '@ember/service'; import {task} from 'ember-concurrency-decorators'; import {timeout} from 'ember-concurrency'; diff --git a/ghost/admin/app/helpers/gh-pluralize.js b/ghost/admin/app/helpers/gh-pluralize.js index 7782011bda..09d6f617ca 100644 --- a/ghost/admin/app/helpers/gh-pluralize.js +++ b/ghost/admin/app/helpers/gh-pluralize.js @@ -3,7 +3,7 @@ import {helper} from '@ember/component/helper'; import {isBlank} from '@ember/utils'; import {pluralize} from 'ember-inflector'; -export function ghPluralize(number, word, {'without-count': withoutCount} = {}) { +export function ghPluralize(number, word, {withoutCount} = {}) { let output = []; if (!isBlank(number) && withoutCount !== true) { @@ -12,7 +12,7 @@ export function ghPluralize(number, word, {'without-count': withoutCount} = {}) // default {{pluralize}} allows for {{pluralize "word"}} with no number if (isBlank(number)) { - output.push(pluralize(word, {withoutCount: true})); + output.push(pluralize(word)); } else { output.push(pluralize(number, word, {withoutCount: true})); } @@ -22,5 +22,5 @@ export function ghPluralize(number, word, {'without-count': withoutCount} = {}) // like {{pluralize}} but formats the number according to current locale export default helper(function ([number, word], {'without-count': withoutCount} = {}) { - return ghPluralize(number, word, {'without-count': withoutCount}); + return ghPluralize(number, word, {withoutCount}); }); diff --git a/ghost/admin/app/services/member-import-validator.js b/ghost/admin/app/services/member-import-validator.js index 348593f7a7..7acd64e39d 100644 --- a/ghost/admin/app/services/member-import-validator.js +++ b/ghost/admin/app/services/member-import-validator.js @@ -1,6 +1,7 @@ import MemberImportError from 'ghost-admin/errors/member-import-error'; import Service, {inject as service} from '@ember/service'; import validator from 'validator'; +import {formatNumber} from 'ghost-admin/helpers/format-number'; import {ghPluralize} from 'ghost-admin/helpers/gh-pluralize'; import {isEmpty} from '@ember/utils';