Skip to content

Commit 8d2c522

Browse files
authored
Merge pull request #35 from XavierOlland/master
Fix for french message ;)
2 parents 4cd370d + d0c5b85 commit 8d2c522

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ You can override this file via the component React props :
7777
```js
7878
const messages = {
7979
en: {numbers: "error on numbers !"},
80-
fr: {numbers: "erreur sur numbers !"}
80+
fr: {numbers: "erreur sur les nombres !"}
8181
};
8282

8383
<FormTest messages={messages} />

defaultRules.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const defaultRules = {
1515
minlength(length, value) {
1616
if (length === void(0)) {
1717
throw 'ERROR: It is not a valid length, checkout your minlength settings.';
18-
} else if(value.length > length) {
18+
} else if(value.length >= length) {
1919
return true;
2020
}
2121
return false;

index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default class ValidationComponent extends Component {
4848

4949
// Method to check rules on a spefific field
5050
_checkRules(fieldName, rules, value) {
51-
if (!value && !rules.required ) {
51+
if (!value && !rules.required ) {
5252
return; // if value is empty AND its not required by the rules, no need to check any other rules
5353
}
5454
for (const key of Object.keys(rules)) {
@@ -64,6 +64,7 @@ export default class ValidationComponent extends Component {
6464
// ex:
6565
// [{ fieldName: "name", messages: ["The field name is required."] }]
6666
_addError(fieldName, rule, value, isFn) {
67+
value = rule == 'minlength'? value-1 : value;
6768
const errMsg = this.messages[this.deviceLocale][rule].replace("{0}", fieldName).replace("{1}", value);
6869
let [error] = this.errors.filter(err => err.fieldName === fieldName);
6970
// error already exists

test/index.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ describe('ValidationComponent:', () => {
197197
it('messages props should be updated', () => {
198198
const messages = {
199199
en: {numbers: "error on numbers !"},
200-
fr: {numbers: "erreur sur numbers !"}
200+
fr: {numbers: "erreur sur les nombres !"}
201201
};
202202
const wrapper = shallow(<FormTest messages={messages} />);
203203
const formTest = wrapper.instance();

0 commit comments

Comments
 (0)