From 8338be3acaead1e316649eb91d03edd582c4e282 Mon Sep 17 00:00:00 2001 From: Bruno Silva Date: Tue, 5 Oct 2021 06:39:01 -0300 Subject: [PATCH] Replace the dependency i18n with tpl in permissions.js files (#13448) refs: #13380 The i18n package is deprecated. It is being replaced with the tpl package. The files changed are under `core/server/api/v2` and `core/server/api/v3`. --- core/server/api/v2/utils/permissions.js | 8 ++++++-- core/server/api/v3/utils/permissions.js | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/server/api/v2/utils/permissions.js b/core/server/api/v2/utils/permissions.js index 572d34c111..3880db95d2 100644 --- a/core/server/api/v2/utils/permissions.js +++ b/core/server/api/v2/utils/permissions.js @@ -2,9 +2,13 @@ const debug = require('@tryghost/debug')('api:v2:utils:permissions'); const Promise = require('bluebird'); const _ = require('lodash'); const permissions = require('../../../services/permissions'); -const i18n = require('../../../../shared/i18n'); +const tpl = require('@tryghost/tpl'); const errors = require('@tryghost/errors'); +const messages = { + noPermissionToCall: 'You do not have permission to {method} {docName}' +}; + /** * @description Handle requests, which need authentication. * @@ -51,7 +55,7 @@ const nonePublicAuth = (apiConfig, frame) => { } }).catch((err) => { if (err instanceof errors.NoPermissionError) { - err.message = i18n.t('errors.api.utils.noPermissionToCall', { + err.message = tpl(messages.noPermissionToCall, { method: apiConfig.method, docName: apiConfig.docName }); diff --git a/core/server/api/v3/utils/permissions.js b/core/server/api/v3/utils/permissions.js index 59734bec45..ad3a4da105 100644 --- a/core/server/api/v3/utils/permissions.js +++ b/core/server/api/v3/utils/permissions.js @@ -2,9 +2,13 @@ const debug = require('@tryghost/debug')('api:v3:utils:permissions'); const Promise = require('bluebird'); const _ = require('lodash'); const permissions = require('../../../services/permissions'); -const i18n = require('../../../../shared/i18n'); +const tpl = require('@tryghost/tpl'); const errors = require('@tryghost/errors'); +const messages = { + noPermissionToCall: 'You do not have permission to {method} {docName}' +}; + /** * @description Handle requests, which need authentication. * @@ -55,7 +59,7 @@ const nonePublicAuth = (apiConfig, frame) => { } }).catch((err) => { if (err instanceof errors.NoPermissionError) { - err.message = i18n.t('errors.api.utils.noPermissionToCall', { + err.message = tpl(messages.noPermissionToCall, { method: apiConfig.method, docName: apiConfig.docName });