Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I18n integration #19

Merged
merged 1 commit into from
Oct 28, 2021
Merged
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
6 changes: 3 additions & 3 deletions example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"clean": "rimraf dist"
},
"dependencies": {
"@jsonforms/core": "3.0.0-alpha.1",
"@jsonforms/vue2": "3.0.0-alpha.1",
"@jsonforms/vue2-vuetify": "3.0.0-alpha.1",
"@jsonforms/core": "3.0.0-alpha.2",
"@jsonforms/vue2": "3.0.0-alpha.2",
"@jsonforms/vue2-vuetify": "3.0.0-alpha.2",
"@vue/composition-api": "1.0.0-rc.3",
"core-js": "^3.6.5",
"vue": "^2.6.14",
Expand Down
19 changes: 18 additions & 1 deletion example/src/components/DemoForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
:validationMode="validationMode"
:ajv="ajv"
:readonly="readonly"
:i18n="i18n"
@change="onChange"
/>
<v-container v-else>
Expand Down Expand Up @@ -58,9 +59,11 @@ import {
JsonFormsRendererRegistryEntry,
JsonFormsCellRendererRegistryEntry,
JsonSchema,
JsonFormsI18nState,
} from '@jsonforms/core';
import { JsonForms, JsonFormsChangeEvent } from '@jsonforms/vue2';
import JsonRefs from 'json-refs';
import { createTranslator } from '../i18n';

export default {
name: 'demo-form',
Expand Down Expand Up @@ -103,6 +106,11 @@ export default {
type: Object as PropType<Ajv>,
default: undefined,
},
locale: {
required: false,
type: String,
default: 'en',
},
},
data() {
return {
Expand All @@ -111,15 +119,24 @@ export default {
resolved: false,
error: undefined,
} as ResolvedSchema,
i18n: {
locale: this.locale,
translate: createTranslator(this.locale),
} as JsonFormsI18nState,
};
},
watch: {
example: {
deep: true,
handler(newExample: Example, oldExample: Example) {
handler(newExample: Example, oldExample: Example): void {
this.resolveSchema(newExample.input.schema);
},
},
locale(newLocale: string): void {
console.log('LOCALE SWITCH', newLocale);
this.i18n.locale = newLocale;
this.i18n.translate = createTranslator(newLocale);
},
},
mounted() {
this.resolveSchema(this.example.input.schema);
Expand Down
36 changes: 36 additions & 0 deletions example/src/components/Settings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,23 @@

<v-divider />

<v-container>
<v-row><v-col>Locale (Mostly in basic example)</v-col></v-row>
<v-row>
<v-col>
<v-select
outlined
persistent-hint
dense
v-model="locale"
:items="locales"
></v-select>
</v-col>
</v-row>
</v-container>

<v-divider />

<v-container>
<v-row><v-col>Options</v-col></v-row>
<v-row>
Expand Down Expand Up @@ -170,6 +187,20 @@
</v-tooltip>
</v-col>
</v-row>
<v-row>
<v-col>
<v-tooltip bottom>
<template v-slot:activator="{ on: onTooltip }">
<v-switch
v-model="locale"
label="Switch beetwen english and german locale"
v-on="onTooltip"
></v-switch>
</template>
Only applies to basic example
</v-tooltip>
</v-col>
</v-row>
</v-container>

<v-divider />
Expand All @@ -190,6 +221,7 @@ export default {
),
restrict: sync('app/[email protected]'),
readonly: sync('app/jsonforms@readonly'),
locale: sync('app/jsonforms@locale'),
},
data: function () {
return {
Expand All @@ -199,6 +231,10 @@ export default {
{ text: 'Validate And Hide', value: 'ValidateAndHide' },
{ text: 'No Validation', value: 'NoValidation' },
],
locales: [
{ text: 'English (en)', value: 'en' },
{ text: 'German (de)', value: 'de' },
],
};
},
};
Expand Down
46 changes: 21 additions & 25 deletions example/src/examples/basic/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,54 @@
"name": {
"type": "string",
"minLength": 3,
"description": "Please enter your name"
"description": "Please enter your name",
"i18n": "name"
},
"vegetarian": {
"type": "boolean"
"type": "boolean",
"i18n": "vegetarian"
},
"birthDate": {
"type": "string",
"format": "date"
"format": "date",
"i18n": "birth"
},
"nationality": {
"type": "string",
"enum": [
"DE",
"IT",
"JP",
"US",
"RU",
"Other"
]
"enum": ["DE", "IT", "JP", "US", "RU", "Other"],
"i18n": "nationality"
},
"personalData": {
"type": "object",
"properties": {
"age": {
"type": "integer",
"description": "Please enter your age."
"description": "Please enter your age.",
"i18n": "personal-data.age"
},
"height": {
"type": "number"
"type": "number",
"i18n": "height"
},
"drivingSkill": {
"type": "number",
"maximum": 10,
"minimum": 1,
"default": 7
"default": 7,
"i18n": "personal-data.driving"
}
},
"required": [
"age",
"height"
]
"required": ["age", "height"]
},
"occupation": {
"type": "string"
"type": "string",
"i18n": "occupation"
},
"postalCode": {
"type": "string",
"maxLength": 5
"maxLength": 5,
"i18n": "postal-code"
}
},
"required": [
"occupation",
"nationality"
]
}
"required": ["occupation", "nationality"]
}
91 changes: 91 additions & 0 deletions example/src/i18n/i18n.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
import get from 'lodash/get';

const en = {
name: {
label: 'Name',
description: 'The name of the person',
},
vegetarian: {
label: 'Vegetarian',
description: 'Wether the person is a vegetarian',
},
birth: {
label: 'Birth Date',
description: '',
},
nationality: {
label: 'Nationality',
description: '',
},
'personal-data': {
age: {
label: 'Age',
},
driving: {
label: 'Driving Skill',
description: 'Indicating experience level',
},
},
height: {
label: 'Height',
},
occupation: {
label: 'Occupation',
description: '',
},
'postal-code': {
label: 'Postal Code',
},
error: {
required: 'field is required',
},
};

const de = {
name: {
label: 'Name',
description: 'Der Name der Person',
},
vegetarian: {
label: 'Vegetarier',
description: 'Isst die Person vegetarisch?',
},
birth: {
label: 'Geburtsdatum',
description: '',
},
nationality: {
label: 'Nationalität',
description: '',
Other: 'Andere',
},
'personal-data': {
age: {
label: 'Alter',
},
driving: {
label: 'Fahrkenntnisse',
description: 'Fahrerfahrung der Person',
},
},
height: {
label: 'Größe',
},
occupation: {
label: 'Beruf',
description: '',
},
'postal-code': {
label: 'Postleitzahl',
},
error: {
required: 'Pflichtfeld',
},
'Additional Information': 'Zusätzliche Informationen',
};

export const createTranslator =
(locale: 'en' | 'de') =>
(key: string, defaultMessage: string | undefined): string | undefined => {
return get(locale === 'en' ? en : de, key) ?? defaultMessage;
};
1 change: 1 addition & 0 deletions example/src/i18n/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './i18n';
1 change: 1 addition & 0 deletions example/src/store/modules/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ const state: AppState = {
renderers: extendedVuetifyRenderers,
cells: extendedVuetifyRenderers,
ajv,
locale: 'en',
},
monaco: {
schemaModel: undefined,
Expand Down
5 changes: 3 additions & 2 deletions example/src/store/modules/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
JsonFormsCellRendererRegistryEntry,
} from '@jsonforms/core';
import * as monaco from 'monaco-editor/esm/vs/editor/editor.api';
import AJV from 'ajv';
import Ajv from 'ajv';

// declare your own store states
export interface AppState {
Expand All @@ -19,7 +19,8 @@ export interface AppState {
};
renderers: JsonFormsRendererRegistryEntry[];
cells: JsonFormsCellRendererRegistryEntry[];
ajv: AJV.Ajv;
ajv: Ajv;
locale: string;
};
monaco: {
schemaModel: monaco.editor.ITextModel | undefined;
Expand Down
2 changes: 2 additions & 0 deletions example/src/views/example/Example.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
:validationMode="validationMode"
:ajv="ajv"
:readonly="readonly"
:locale="locale"
@change="onChange"
/>
</v-tab-item>
Expand Down Expand Up @@ -200,6 +201,7 @@ export default {
monacoSchemaModel: sync('app/monaco@schemaModel'),
monacoUiSchemaModel: sync('app/monaco@uischemaModel'),
monacoDataModel: sync('app/monaco@dataModel'),
locale: sync('app/jsonforms@locale'),
},
mounted() {
this.setExample(
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"packages": ["vue2-vuetify", "example"],
"version": "3.0.0-alpha.1"
"version": "3.0.0-alpha.2"
}
Loading