Skip to content

Commit

Permalink
refactor: change defaultMessage config to generateMessage
Browse files Browse the repository at this point in the history
  • Loading branch information
logaretm committed Jul 23, 2020
1 parent 72ff33e commit af88502
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions packages/core/src/config.ts
Expand Up @@ -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,
};
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/validate.ts
Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions packages/i18n/tests/index.spec.ts
Expand Up @@ -14,7 +14,7 @@ localize('en', {

test('can define new locales', async () => {
configure({
defaultMessage: localize('ar', {
generateMessage: localize('ar', {
messages: {
required: 'هذا الحقل مطلوب',
},
Expand Down Expand Up @@ -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!',
Expand Down Expand Up @@ -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: 'هذا الحقل مطلوب',
Expand Down

0 comments on commit af88502

Please sign in to comment.