From 387399caca1b75b45dd6a6e0d3611f9b4047a199 Mon Sep 17 00:00:00 2001 From: kirrg001 Date: Tue, 26 Jun 2018 18:54:55 +0200 Subject: [PATCH] Dynamic Routing Beta: Changed routes.yaml error messages refs #9601 - updated some error messages - reason: they didn't look clear enough or contained e.g. [object object] --- core/server/services/settings/validate.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/core/server/services/settings/validate.js b/core/server/services/settings/validate.js index f9ffa93f7b..4d9291c548 100644 --- a/core/server/services/settings/validate.js +++ b/core/server/services/settings/validate.js @@ -113,7 +113,7 @@ _private.validateData = function validateData(object) { if (!object.data[key].hasOwnProperty(option)) { throw new common.errors.ValidationError({ message: common.i18n.t('errors.services.settings.yaml.validate', { - at: object.data[key], + at: JSON.stringify(object.data[key]), reason: `${option} is required.` }) }); @@ -122,8 +122,8 @@ _private.validateData = function validateData(object) { if (allowedQueryValues[option] && allowedQueryValues[option].indexOf(object.data[key][option]) === -1) { throw new common.errors.ValidationError({ message: common.i18n.t('errors.services.settings.yaml.validate', { - at: object.data[key][option], - reason: `${object.data[key][option]} not supported.` + at: JSON.stringify(object.data[key]), + reason: `${object.data[key][option]} not supported. Please use ${_.uniq(allowedQueryValues[option])}.` }) }); } @@ -185,9 +185,9 @@ _private.validateRoutes = function validateRoutes(routes) { throw new common.errors.ValidationError({ message: common.i18n.t('errors.services.settings.yaml.validate', { at: routingTypeObjectKey, - reason: 'Please define a permalink route.' + reason: 'Please define a template.' }), - help: 'e.g. permalink: /{slug}/' + help: 'e.g. /about/: about' }); }