TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-04 17:04:59 +03:00
Code Issues Projects Releases Wiki Activity

Replaced i18n.t with tpl in core/server/services/bulk-email and core/server/services/permissions (#13562)

Browse Source 
refs: #13380

- i18n is deprecated and is being replaced with tpl
This commit is contained in:
PakkuDon 2021-10-13 00:46:35 +11:00 committed by GitHub
parent b48c16c118
commit 0fe62e3aee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/server/services/bulk-email/bulk-email-processor.js
View File

@ -2,7 +2,7 @@ const _ = require('lodash');
const Promise = require('bluebird'); const Promise = require('bluebird');
const moment = require('moment-timezone'); const moment = require('moment-timezone');
const errors = require('@tryghost/errors'); const errors = require('@tryghost/errors');
const i18n = require('../../../shared/i18n'); const tpl = require('@tryghost/tpl');
const logging = require('@tryghost/logging'); const logging = require('@tryghost/logging');
const models = require('../../models'); const models = require('../../models');
const mailgunProvider = require('./mailgun'); const mailgunProvider = require('./mailgun');
@ -10,6 +10,10 @@ const sentry = require('../../../shared/sentry');
const debug = require('@tryghost/debug')('mega'); const debug = require('@tryghost/debug')('mega');
const postEmailSerializer = require('../mega/post-email-serializer'); const postEmailSerializer = require('../mega/post-email-serializer');
const messages = {
error: 'The email service was unable to send an email batch.'
};
const BATCH_SIZE = mailgunProvider.BATCH_SIZE; const BATCH_SIZE = mailgunProvider.BATCH_SIZE;
/** /**
@ -239,7 +243,7 @@ module.exports = {
// REF: possible mailgun errors https://documentation.mailgun.com/en/latest/api-intro.html#errors // REF: possible mailgun errors https://documentation.mailgun.com/en/latest/api-intro.html#errors
let ghostError = new errors.EmailError({ let ghostError = new errors.EmailError({
err: error, err: error,
context: i18n.t('errors.services.mega.requestFailed.error'), context: tpl(messages.error),
code: 'BULK_EMAIL_SEND_FAILED' code: 'BULK_EMAIL_SEND_FAILED'
}); });

8
core/server/services/permissions/public.js
View File

@ -1,10 +1,14 @@
const _ = require('lodash'); const _ = require('lodash');
const Promise = require('bluebird'); const Promise = require('bluebird');
const errors = require('@tryghost/errors'); const errors = require('@tryghost/errors');
const i18n = require('../../../shared/i18n'); const tpl = require('@tryghost/tpl');
const parseContext = require('./parse-context'); const parseContext = require('./parse-context');
const _private = {}; const _private = {};
const messages = {
error: 'You do not have permission to retrieve {docName} with that status'
};
/** /**
* @TODO: * @TODO:
* *
@ -17,7 +21,7 @@ const _private = {};
* - public context cannot fetch draft/scheduled posts * - public context cannot fetch draft/scheduled posts
*/ */
_private.applyStatusRules = function applyStatusRules(docName, method, opts) { _private.applyStatusRules = function applyStatusRules(docName, method, opts) {
const err = new errors.NoPermissionError({message: i18n.t('errors.permissions.applyStatusRules.error', {docName: docName})}); const err = new errors.NoPermissionError({message: tpl(messages.error, {docName: docName})});
// Enforce status 'active' for users // Enforce status 'active' for users
if (docName === 'users') { if (docName === 'users') {