Skip to content

Commit f5cfc9b

Browse files
xavierlacotxavierlacot
authored
Merge pull request #11 from jolicode/chore/improved-bridges-translations
improved bridges translations
2 parents 67fbc3e + bd54c6a commit f5cfc9b

20 files changed

+101
-38
lines changed

‎src/Bridge/EasyAdmin/src/Form/Type/CreateDirectoryType.php‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ public function configureOptions(OptionsResolver $resolver): void
2626
'directory' => '',
2727
'parentDirectory' => '',
2828
'intent' => 'explore',
29+
'translation_domain' => 'JoliMediaEasyAdminBundle',
2930
]);
3031
}
3132

@@ -34,13 +35,18 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
3435
{
3536
$builder
3637
->add('directory', TextType::class, [
38+
'attr' => [
39+
'class' => 'form-control',
40+
'placeholder' => 'directory.placeholder',
41+
],
3742
'constraints' => [
3843
new NotBlank(),
3944
new Length(
4045
min: 1,
4146
max: 255,
4247
),
4348
],
49+
'required' => true,
4450
])
4551
->add('parentDirectory', HiddenType::class)
4652
->add('intent', HiddenType::class, [
@@ -57,7 +63,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
5763
'class' => 'btn btn-primary',
5864
],
5965
'label' => 'directory.create_this_directory',
60-
'translation_domain' => 'JoliMediaEasyAdminBundle',
6166
])
6267
;
6368
}

‎src/Bridge/EasyAdmin/src/Form/Type/DeleteDirectoryType.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public function configureOptions(OptionsResolver $resolver): void
2121
{
2222
$resolver->setDefaults([
2323
'path' => '',
24+
'translation_domain' => 'JoliMediaEasyAdminBundle',
2425
]);
2526
}
2627

‎src/Bridge/EasyAdmin/src/Form/Type/DeleteType.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public function configureOptions(OptionsResolver $resolver): void
2020
{
2121
$resolver->setDefaults([
2222
'path' => '',
23+
'translation_domain' => 'JoliMediaEasyAdminBundle',
2324
]);
2425
}
2526

‎src/Bridge/EasyAdmin/src/Form/Type/MediaChoiceType.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ public function configureOptions(OptionsResolver $resolver): void
5151
$resolver->setDefaults([
5252
'folder' => '',
5353
'library' => null,
54+
'translation_domain' => 'JoliMediaEasyAdminBundle',
5455
]);
5556
}
5657

‎src/Bridge/EasyAdmin/src/Form/Type/MoveType.php‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
use Symfony\Component\Form\AbstractType;
66
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
77
use Symfony\Component\Form\FormBuilderInterface;
8+
use Symfony\Component\OptionsResolver\OptionsResolver;
89
use Symfony\Component\Validator\Constraints\NotBlank;
910

1011
class MoveType extends AbstractType
@@ -29,4 +30,12 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
2930
])
3031
;
3132
}
33+
34+
#[\Override]
35+
public function configureOptions(OptionsResolver $resolver): void
36+
{
37+
$resolver->setDefaults([
38+
'translation_domain' => 'JoliMediaEasyAdminBundle',
39+
]);
40+
}
3241
}

‎src/Bridge/EasyAdmin/src/Form/Type/RenameDirectoryType.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
88
use Symfony\Component\Form\Extension\Core\Type\TextType;
99
use Symfony\Component\Form\FormBuilderInterface;
10+
use Symfony\Component\OptionsResolver\OptionsResolver;
1011
use Symfony\Component\Validator\Constraints\Length;
1112
use Symfony\Component\Validator\Constraints\NotBlank;
1213

@@ -28,6 +29,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
2829
],
2930
])
3031
->add('to', TextType::class, [
32+
'attr' => [
33+
'class' => 'form-control',
34+
'placeholder' => 'directory.rename.placeholder',
35+
],
3136
'required' => true,
3237
'constraints' => [
3338
new NotBlank(),
@@ -42,8 +47,15 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
4247
'class' => 'btn btn-primary',
4348
],
4449
'label' => 'action.rename_directory',
45-
'translation_domain' => 'JoliMediaEasyAdminBundle',
4650
])
4751
;
4852
}
53+
54+
#[\Override]
55+
public function configureOptions(OptionsResolver $resolver): void
56+
{
57+
$resolver->setDefaults([
58+
'translation_domain' => 'JoliMediaEasyAdminBundle',
59+
]);
60+
}
4961
}

‎src/Bridge/EasyAdmin/src/Form/Type/RenameType.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
77
use Symfony\Component\Form\Extension\Core\Type\TextType;
88
use Symfony\Component\Form\FormBuilderInterface;
9+
use Symfony\Component\OptionsResolver\OptionsResolver;
910
use Symfony\Component\Validator\Constraints\Length;
1011
use Symfony\Component\Validator\Constraints\NotBlank;
1112

@@ -21,6 +22,10 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
2122
{
2223
$builder
2324
->add('to', TextType::class, [
25+
'attr' => [
26+
'class' => 'form-control',
27+
'placeholder' => 'media.placeholder',
28+
],
2429
'required' => true,
2530
'constraints' => [
2631
new NotBlank(),
@@ -35,8 +40,15 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
3540
'class' => 'btn btn-primary',
3641
],
3742
'label' => 'action.rename_file',
38-
'translation_domain' => 'JoliMediaEasyAdminBundle',
3943
])
4044
;
4145
}
46+
47+
#[\Override]
48+
public function configureOptions(OptionsResolver $resolver): void
49+
{
50+
$resolver->setDefaults([
51+
'translation_domain' => 'JoliMediaEasyAdminBundle',
52+
]);
53+
}
4254
}

‎src/Bridge/EasyAdmin/src/Form/Type/UploadType.php‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
use Symfony\Component\Form\Extension\Core\Type\FileType;
88
use Symfony\Component\Form\Extension\Core\Type\HiddenType;
99
use Symfony\Component\Form\FormBuilderInterface;
10+
use Symfony\Component\OptionsResolver\OptionsResolver;
1011
use Symfony\Component\Validator\Constraints\File;
12+
use Symfony\Component\Validator\Constraints\NotNull;
1113

1214
class UploadType extends AbstractType
1315
{
@@ -30,6 +32,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
3032
$builder
3133
->add('path', HiddenType::class, [
3234
'required' => true,
35+
'constraints' => [
36+
new NotNull(),
37+
],
3338
])
3439
->add('file', FileType::class, [
3540
'required' => true,
@@ -42,4 +47,12 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
4247
])
4348
;
4449
}
50+
51+
#[\Override]
52+
public function configureOptions(OptionsResolver $resolver): void
53+
{
54+
$resolver->setDefaults([
55+
'translation_domain' => 'JoliMediaEasyAdminBundle',
56+
]);
57+
}
4558
}

‎src/Bridge/EasyAdmin/templates/explore.html.twig‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,7 @@
9494
{% block rename_directory_container %}
9595
<div class="rename-directory-container">
9696
{{ form_start(rename_directory_form, { action: ea_url().setRoute('joli_media_easy_admin_rename_directory') }) }}
97-
{{ form_widget(rename_directory_form.to, {
98-
attr: {
99-
class: 'form-control',
100-
placeholder: 'directory.rename.placeholder'|trans,
101-
'aria-label': 'directory.rename.placeholder'|trans,
102-
},
103-
required: true,
104-
}) }}
97+
{{ form_widget(rename_directory_form.to) }}
10598
{{ form_widget(rename_directory_form.from) }}
10699
{{ form_widget(rename_directory_form.submit) }}
107100
{{ form_end(rename_directory_form) }}

‎src/Bridge/EasyAdmin/templates/list.html.twig‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -165,14 +165,7 @@
165165
</div>
166166
<div class="new-directory-container">
167167
{{ form_start(create_directory_form, { action: ea_url().setRoute('joli_media_easy_admin_create_directory') }) }}
168-
{{ form_widget(create_directory_form.directory, {
169-
attr: {
170-
class: 'form-control',
171-
placeholder: 'directory.placeholder'|trans,
172-
'aria-label': 'directory.placeholder'|trans,
173-
},
174-
required: true,
175-
}) }}
168+
{{ form_widget(create_directory_form.directory) }}
176169
{{ form_widget(create_directory_form.submit) }}
177170
{{ form_end(create_directory_form) }}
178171
</div>

0 commit comments

Comments
 (0)