Skip to content

Commit ab48c02

Browse files
committed
Remove label translator
Remove label translator, this was a bad idea. It is preferable and cleaner to use the label attribute of the control component
1 parent 75774fa commit ab48c02

File tree

8 files changed

+12
-68
lines changed

8 files changed

+12
-68
lines changed

fractal.helpers.js

+2-20
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,6 @@ const flashMessages = {
1919
}
2020
}
2121

22-
const defaultT = key => {
23-
const sample = {
24-
'user.name': 'Nom',
25-
'page.title': 'Titre',
26-
}
27-
28-
return sample[key] ? sample[key] : key
29-
}
30-
3122
const defaultFlash = {
3223
values:null,
3324
has: name => name ? false : false,
@@ -67,16 +58,8 @@ const jrmc = {
6758

6859
return option.selected ?? false
6960
},
70-
getLabel: (props, context = { translator: { prefix: '', t: (k) => k } }) => {
71-
const t = context.translator.t
72-
73-
let name = props.has('name') ? props.get('name') : ''
74-
75-
if (props.has('translator.prefix')) {
76-
name = t(`${props.translator.prefix}${name}`)
77-
} else if (context.translator.prefix) {
78-
name = t(`${context.translator.prefix}${name}`)
79-
}
61+
getLabel: props => {
62+
const name = props.has('name') ? props.get('name') : ''
8063

8164
return `${string.capitalCase(string.noCase(name))}:`
8265
},
@@ -125,5 +108,4 @@ module.exports = {
125108
}
126109
},
127110
flashMessages,
128-
t: defaultT
129111
}

fractal/components/03-form/03-form-translate-labels.edge

-13
This file was deleted.

fractal/components/03-form/readme.md

+1-21
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,4 @@
66
| method | GET/POST | HTTP method (default POST) |
77
| csrf | true/false | add csrf input hidden (default true) |
88
| error | true/false | show errors message (default true) |
9-
| translator | object | config for translate |
10-
| translator.prefix | property | prefix translator |
11-
| translator.t | property | function translate |
12-
13-
## Translator AdonisJS
14-
15-
```
16-
{
17-
prefix: 'user.',
18-
t: (key) => t(key)
19-
}
20-
21-
22-
@jrmc.form({ translator: { prefix: 'user.', t: (key) => t(key) }})
23-
@jrmc.form.control({ name: 'name' })
24-
@!jrmc.form.input({ class: 'input-bordered' })
25-
@end
26-
@end
27-
28-
=> exec i18n helper Adonis t('user.name')
29-
```
9+
| object | object model | entity model for default value |

fractal/docs/03-changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# 1.8.0
2+
3+
- Remove label translator, this was a bad idea. It is preferable and cleaner to use the label attribute of the control component
4+
15
# 1.7.0
26

37
- Form label translator

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@jrmc/edge-components",
3-
"version": "1.7.1",
3+
"version": "1.8.0beta",
44
"description": "",
55
"main": "build/index.js",
66
"repository": {

src/helpers.ts

+2-10
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,8 @@ const obj = {
3939

4040
return option.selected ?? false
4141
},
42-
getLabel: (props, context = { translator: { prefix: '', t: (k) => k } }) => {
43-
const t = context.translator.t
44-
45-
let name = props.has('name') ? props.get('name') : ''
46-
47-
if (props.has('translator.prefix')) {
48-
name = t(`${props.translator.prefix}${name}`)
49-
} else if (context?.translator?.prefix) {
50-
name = t(`${context.translator.prefix}${name}`)
51-
}
42+
getLabel: (props) => {
43+
const name = props.has('name') ? props.get('name') : ''
5244

5345
return `${string.capitalCase(string.noCase(name))}:`
5446
},

views/components/form.edge

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
@inject({
22
object: $props.get('object'),
3-
translator: $props.has('translator') ? $props.get('translator') : { prefix: '', t: (k) => k }
43
})
54

6-
<form method="{{ jrmc.getMethodForm($props, 'POST') }}" {{ $props.serializeExcept(['method', 'object', 'translator']) }}>
5+
<form method="{{ jrmc.getMethodForm($props, 'POST') }}" {{ $props.serializeExcept(['method', 'object']) }}>
76

87
@if(csrfField && $props.get('csrf') !== false)~
98
{{ csrfField() }}

views/components/form/control.edge

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
@!jrmc.form.label({ text: $props.get('label'), class: 'cursor-pointer', for: jrmc.getId($props), required: jrmc.getRequired($props), })
1515
@end~
1616
@elseif($props.has('name'))~
17-
@!jrmc.form.label({ text: jrmc.getLabel($props, $context), class: 'cursor-pointer', for: jrmc.getId($props), required: jrmc.getRequired($props), })
17+
@!jrmc.form.label({ text: jrmc.getLabel($props), class: 'cursor-pointer', for: jrmc.getId($props), required: jrmc.getRequired($props), })
1818
@end~
1919

2020
{{{ await $slots.main() || '' }}}

0 commit comments

Comments
 (0)