Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions src/Confere.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import ValidationError from './validators/ValidatorError'
import validators from './validators'
import i18n from './i18n'

var config = {
realTime: false,
dateFormat: 'yyyy-MM-dd',
validators,
rules: {}
rules: {},
locale: 'en',
i18n
}

/**
Expand Down Expand Up @@ -157,18 +160,43 @@ class ConfereJs {
options.rules = rules
}

static isEmpty (value) {
static isEmpty(value) {
let undef
const emptyValues = [undef, null, '', {}, []]
for (const empty of emptyValues) {
if( value === empty ) return true
if (value === empty) return true
}

if (value instanceof Array && value.length === 0) return true
if (value instanceof Object && Object.keys(value).length === 0) return true
return false
}

/**
*
* @param locale
* @param key dot notation
* @param params
*/
t(key = '', params = {}) {
let locale = this.options.locale
let t = this.options.i18n
key = `${locale}.${key}`
key.split('.').map(item => {
if (typeof t !== 'undefined') {
t = t[item]
}
})
if (typeof t === 'undefined') {
console.warn(`${key} translation doen't exists`)
return key
}
Object.keys(params).map(param => {
t = t.replace(`:${param}`, params[param])
})
return t
}

}

export default ConfereJs
Expand Down
29 changes: 29 additions & 0 deletions src/i18n/en.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
export default {
validations: {
digits: ':name field must be digits with size = :param1',
digits_between : ':name must be digits with size between :params0 and :params1',
integer : ':name field must be digits with size = :params0',

date: ':name field is not a valid date',
after: ':name field should be after :params0',
after_or_equal: ':name field should be equal or greater than :params0',
before: ':name field must be a date before :params0',
before_or_equal: ':name field must be a date before or equal :params0',

min: ':name field must have at least :min chars in length',
max: ':name field must not pass :max chars in length',
email: ':name is not a valid email',
alpha: ':name field only allows alphabet',
alpha_dash: ':name field only allows alphabet, dash and underscore characters',
alpha_numeric: ':name field must be alpha numeric',
between: ':name field must be between :min and :max',
url: ':name field must be a valid url',


},
fields: {
name: 'Name',
min: 'Minimum',
max: 'Maximum'
}
}
8 changes: 8 additions & 0 deletions src/i18n/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import en from './en'
import pt from './pt'

export const i18n = {
en, pt
}

export default i18n
10 changes: 10 additions & 0 deletions src/i18n/pt.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
export default {
validations: {
digits: 'campo :name deve conter apenas digitos com tamanho = :param1',
digits_between : 'campo :name deve ser dígitos com tamanho entre :params0 a :params1}',
integer : 'campo :name campo deve ser dígitos com tamanho = :params0',
},
fields: {
name: 'Nome'
}
}
2 changes: 1 addition & 1 deletion src/validators/Numbers.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default {
})
},

integer (name, value) {
integer(name, value) {
return new Promise((resolve, reject) => {
if (Confere.isEmpty(value)) resolve()
if (/^\d+$/.test(value)) resolve()
Expand Down
12 changes: 12 additions & 0 deletions test/Confere.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,16 @@ describe('Confere.js', () => {
})
})

describe('t', () => {
it('should return campo Name deve conter apenas digitos com tamanho = 10', done => {
let config = {
locale : 'zk',
Copy link
Owner

@isneezy isneezy Aug 24, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you forgot to set the locale to pt. Fore sure this is the reason the build is failing

rules : {user:'required'}
}
let confere = new Confere(config)
expect(confere.t('validations.digits', {name : 'Nome', param1 : 10})).to.be('campo Nome deve conter apenas digitos com tamanho = 10')
done()
})
})

});