Skip to content

Commit ecd42fa

Browse files
authored
Merge pull request #1 from VIVOMEDIA/use-i18n
Use i18n from neos project
2 parents ebeb682 + ccd2195 commit ecd42fa

File tree

5 files changed

+94
-44
lines changed

5 files changed

+94
-44
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import React from 'react';
2+
import I18n from '@neos-project/neos-ui-i18n';
3+
4+
const JsonValidator = (value) => {
5+
try {
6+
if (value === "") {
7+
return null;
8+
}
9+
10+
JSON.parse(value);
11+
} catch (error) {
12+
return <I18n id="VIVOMEDIA.NeosUI.JsonValidator:Main:NotValidJson" fallback="Not a valid JSON string"/>
13+
}
14+
15+
return null;
16+
17+
}
18+
export default JsonValidator;

Resources/Private/Validators/JsonValidator/src/JsonValidator/index.tsx

Lines changed: 0 additions & 17 deletions
This file was deleted.
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
import manifest from '@neos-project/neos-ui-extensibility';
2-
import createJsonValidator from './JsonValidator';
2+
import JsonValidator from './JsonValidator';
33

44
manifest('VIVOMEDIA.NeosUI.JsonValidator:JsonValidator', {}, globalRegistry => {
55

6-
const i18nRegistry = globalRegistry.get('i18n');
76
const validatorRegistry = globalRegistry.get('validators');
87

9-
validatorRegistry.set('VIVOMEDIA.NeosUI.JsonValidator/Validation/JsonValidator', createJsonValidator({ i18nRegistry }));
8+
validatorRegistry.set('VIVOMEDIA.NeosUI.JsonValidator/Validation/JsonValidator', JsonValidator);
109
});

Resources/Public/Validators/JsonValidator/Plugin.js

Lines changed: 73 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Resources/Public/Validators/JsonValidator/Plugin.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)