From af88502fc28ecd87b02e042e00ee909a21acc314 Mon Sep 17 00:00:00 2001 From: Abdelrahman Awad Date: Thu, 23 Jul 2020 06:10:41 +0200 Subject: [PATCH] refactor: change defaultMessage config to generateMessage --- packages/core/src/config.ts | 4 ++-- packages/core/src/validate.ts | 2 +- packages/i18n/tests/index.spec.ts | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/core/src/config.ts b/packages/core/src/config.ts index 72ddaa146..c8a1825fa 100644 --- a/packages/core/src/config.ts +++ b/packages/core/src/config.ts @@ -2,12 +2,12 @@ import { ValidationMessageGenerator } from '../../shared'; export interface VeeValidateConfig { bails: boolean; - defaultMessage: ValidationMessageGenerator; + generateMessage: ValidationMessageGenerator; skipOptional: boolean; } const DEFAULT_CONFIG: VeeValidateConfig = { - defaultMessage: ({ field }) => `${field} is not valid.`, + generateMessage: ({ field }) => `${field} is not valid.`, skipOptional: true, bails: true, }; diff --git a/packages/core/src/validate.ts b/packages/core/src/validate.ts index b92924b97..c01d30ea4 100644 --- a/packages/core/src/validate.ts +++ b/packages/core/src/validate.ts @@ -153,7 +153,7 @@ async function _test(field: FieldValidationContext, value: any, rule: { name: st * Generates error messages. */ function _generateFieldError(fieldCtx: FieldContext) { - const message = getConfig().defaultMessage; + const message = getConfig().generateMessage; return message(fieldCtx); } diff --git a/packages/i18n/tests/index.spec.ts b/packages/i18n/tests/index.spec.ts index b7a71686b..e29885498 100644 --- a/packages/i18n/tests/index.spec.ts +++ b/packages/i18n/tests/index.spec.ts @@ -14,7 +14,7 @@ localize('en', { test('can define new locales', async () => { configure({ - defaultMessage: localize('ar', { + generateMessage: localize('ar', { messages: { required: 'هذا الحقل مطلوب', }, @@ -42,7 +42,7 @@ test('can define new locales', async () => { test('can define specific messages for specific fields', async () => { configure({ - defaultMessage: localize('en', { + generateMessage: localize('en', { fields: { test: { required: 'WRONG!', @@ -77,7 +77,7 @@ test('can define specific messages for specific fields', async () => { test('can merge locales without setting the current one', async () => { configure({ - defaultMessage: localize({ + generateMessage: localize({ ar: { messages: { required: 'هذا الحقل مطلوب',