mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-09-23 10:57:26 +03:00
Replaced i18n.t() with tpl() in v2/utils/validators/input/invitations.js (#13560)
refs: #13380 - The i18n package is deprecated. It is being replaced with the tpl package.
This commit is contained in:
parent
9ccf590ddc
commit
ed6045d82c
@ -1,9 +1,17 @@
|
|||||||
const Promise = require('bluebird');
|
const Promise = require('bluebird');
|
||||||
const validator = require('@tryghost/validator');
|
const validator = require('@tryghost/validator');
|
||||||
const debug = require('@tryghost/debug')('api:v2:utils:validators:input:invitation');
|
const debug = require('@tryghost/debug')('api:v2:utils:validators:input:invitation');
|
||||||
const i18n = require('../../../../../../shared/i18n');
|
const tpl = require('@tryghost/tpl');
|
||||||
const errors = require('@tryghost/errors');
|
const errors = require('@tryghost/errors');
|
||||||
|
|
||||||
|
const messages = {
|
||||||
|
noTokenProvided: 'No token provided.',
|
||||||
|
noEmailProvided: 'No email provided.',
|
||||||
|
noPasswordProvided: 'No password provided.',
|
||||||
|
noNameProvided: 'No name provided.',
|
||||||
|
invalidEmailReceived: 'The server did not receive a valid email'
|
||||||
|
};
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
acceptInvitation(apiConfig, frame) {
|
acceptInvitation(apiConfig, frame) {
|
||||||
debug('acceptInvitation');
|
debug('acceptInvitation');
|
||||||
@ -11,19 +19,19 @@ module.exports = {
|
|||||||
const data = frame.data.invitation[0];
|
const data = frame.data.invitation[0];
|
||||||
|
|
||||||
if (!data.token) {
|
if (!data.token) {
|
||||||
return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noTokenProvided')}));
|
return Promise.reject(new errors.ValidationError({message: tpl(messages.noTokenProvided)}));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data.email) {
|
if (!data.email) {
|
||||||
return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noEmailProvided')}));
|
return Promise.reject(new errors.ValidationError({message: tpl(messages.noEmailProvided)}));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data.password) {
|
if (!data.password) {
|
||||||
return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noPasswordProvided')}));
|
return Promise.reject(new errors.ValidationError({message: tpl(messages.noPasswordProvided)}));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!data.name) {
|
if (!data.name) {
|
||||||
return Promise.reject(new errors.ValidationError({message: i18n.t('errors.api.authentication.noNameProvided')}));
|
return Promise.reject(new errors.ValidationError({message: tpl(messages.noNameProvided)}));
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -34,7 +42,7 @@ module.exports = {
|
|||||||
|
|
||||||
if (typeof email !== 'string' || !validator.isEmail(email)) {
|
if (typeof email !== 'string' || !validator.isEmail(email)) {
|
||||||
throw new errors.BadRequestError({
|
throw new errors.BadRequestError({
|
||||||
message: i18n.t('errors.api.authentication.invalidEmailReceived')
|
message: tpl(messages.invalidEmailReceived)
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user