Explicitly call translator interface for form labels.

This helps us to extract the translation keys.

src/Form/Part/OrderdetailType.php

@@ -45,36 +45,45 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function foo\func;
 
 class OrderdetailType extends AbstractType
 {
+    protected $trans;
+
+    public function __construct(TranslatorInterface $trans)
+    {
+        $this->trans = $trans;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         /** @var Orderdetail $orderdetail */
         $orderdetail = $builder->getData();
 
         $builder->add('supplierpartnr', TextType::class, [
-            'label' => 'orderdetails.edit.supplierpartnr',
+            'label' => $this->trans->trans('orderdetails.edit.supplierpartnr'),
+            'attr' => ['placeholder' =>  $this->trans->trans('orderdetails.edit.supplierpartnr.placeholder')],
             'required' => false,
             'empty_data' => ""
         ]);
 
         $builder->add('supplier', StructuralEntityType::class, [
             'class' => Supplier::class, 'disable_not_selectable' => true,
-            'label' => 'orderdetails.edit.supplier'
+            'label' =>  $this->trans->trans('orderdetails.edit.supplier')
         ]);
 
         $builder->add('supplier_product_url', UrlType::class, [
             'required' => false,
             'empty_data' => "",
-            'label' => 'orderdetails.edit.url'
+            'label' =>  $this->trans->trans('orderdetails.edit.url')
         ]);
 
         $builder->add('obsolete', CheckboxType::class, [
             'required' => false,
             'label_attr' => ['class' => 'checkbox-custom'],
-            'label' => 'orderdetails.edit.obsolete'
+            'label' =>  $this->trans->trans('orderdetails.edit.obsolete')
         ]);
 
 

src/Form/Part/PartBaseType.php

@@ -91,59 +91,104 @@ class PartBaseType extends AbstractType
 
         //Common section
         $builder
-            ->add('name', TextType::class, ['empty_data' => '', 'label' => 'name.label',
-                'attr' => ['placeholder' => 'part.name.placeholder'],
-                'disabled' => !$this->security->isGranted('name.edit', $part), ])
-            ->add('description', CKEditorType::class, ['required' => false, 'empty_data' => '',
-                'label' => 'description.label', 'help' => 'bbcode.hint', 'config_name' => 'description_config',
-                'attr' => ['placeholder' => 'part.description.placeholder', 'rows' => 2],
-                'disabled' => !$this->security->isGranted('description.edit', $part) ])
-            ->add('minAmount', SIUnitType::class,
-                ['attr' => ['min' => 0, 'placeholder' => 'part.mininstock.placeholder'], 'label' => 'mininstock.label',
-                    'measurement_unit' => $part->getPartUnit(),
-                    'disabled' => !$this->security->isGranted('mininstock.edit', $part), ])
-            ->add('category', StructuralEntityType::class, ['class' => Category::class,
-                'label' => 'category.label', 'disable_not_selectable' => true,
-                'disabled' => !$this->security->isGranted('move', $part), ])
-            ->add('footprint', StructuralEntityType::class, ['class' => Footprint::class, 'required' => false,
-                'label' => 'footprint.label', 'disable_not_selectable' => true,
-                'disabled' => !$this->security->isGranted('move', $part), ])
-            ->add('tags', TextType::class, ['required' => false, 'label' => 'part.tags', 'empty_data' => "",
+            ->add('name', TextType::class, [
+                'empty_data' => '',
+                'label' =>  $this->trans->trans('part.edit.name'),
+                'attr' => ['placeholder' => $this->trans->trans('part.edit.name.placeholder')],
+                'disabled' => !$this->security->isGranted('name.edit', $part),
+            ])
+            ->add('description', CKEditorType::class, [
+                'required' => false,
+                'empty_data' => '',
+                'label' => $this->trans->trans('part.edit.description'),
+                'config_name' => 'description_config',
+                'attr' => ['placeholder' => $this->trans->trans('part.edit.description.placeholder'), 'rows' => 2],
+                'disabled' => !$this->security->isGranted('description.edit', $part)
+            ])
+            ->add('minAmount', SIUnitType::class, [
+                'attr' => ['min' => 0, 'placeholder' => $this->trans->trans('part.editmininstock.placeholder')],
+                'label' => $this->trans->trans('part.edit.mininstock'),
+                'measurement_unit' => $part->getPartUnit(),
+                'disabled' => !$this->security->isGranted('mininstock.edit', $part),
+            ])
+            ->add('category', StructuralEntityType::class, [
+                'class' => Category::class,
+                'label' => $this->trans->trans('part.edit.category'),
+                'disable_not_selectable' => true,
+                'disabled' => !$this->security->isGranted('move', $part),
+            ])
+            ->add('footprint', StructuralEntityType::class, [
+                'class' => Footprint::class,
+                'required' => false,
+                'label' => $this->trans->trans('part.edit.footprint'),
+                'disable_not_selectable' => true,
+                'disabled' => !$this->security->isGranted('move', $part),
+            ])
+            ->add('tags', TextType::class, [
+                'required' => false,
+                'label' => $this->trans->trans('part.edit.tags'),
+                'empty_data' => "",
                 'attr' => ['data-role' => 'tagsinput'],
-                'disabled' => !$this->security->isGranted('edit', $part) ]);
+                'disabled' => !$this->security->isGranted('edit', $part)
+            ]);
 
         //Manufacturer section
-        $builder->add('manufacturer', StructuralEntityType::class, ['class' => Manufacturer::class,
-            'required' => false, 'label' => 'manufacturer.label', 'disable_not_selectable' => true,
-            'disabled' => !$this->security->isGranted('manufacturer.edit', $part), ])
-            ->add('manufacturer_product_url', UrlType::class, ['required' => false, 'empty_data' => '',
-                'label' => 'manufacturer_url.label',
-                'disabled' => !$this->security->isGranted('manufacturer.edit', $part), ])
-            ->add('manufacturer_product_number', TextType::class, ['required' => false,
-                'empty_data' => '', 'label' => 'part.mpn',
+        $builder->add('manufacturer', StructuralEntityType::class, [
+            'class' => Manufacturer::class,
+            'required' => false,
+            'label' => $this->trans->trans('part.edit.manufacturer.label'),
+            'disable_not_selectable' => true,
+            'disabled' => !$this->security->isGranted('manufacturer.edit', $part)
+        ])
+            ->add('manufacturer_product_url', UrlType::class, [
+                'required' => false,
+                'empty_data' => '',
+                'label' => $this->trans->trans('part.edit.manufacturer_url.label'),
+                'disabled' => !$this->security->isGranted('manufacturer.edit', $part),
+            ])
+            ->add('manufacturer_product_number', TextType::class, [
+                'required' => false,
+                'empty_data' => '',
+                'label' => $this->trans->trans('part.edit.mpn'),
                 'disabled' => !$this->security->isGranted('manufacturer.edit', $part)])
             ->add('manufacturing_status', ChoiceType::class, [
-                'label' => 'part.manufacturing_status',
+                'label' => $this->trans->trans('part.edit.manufacturing_status'),
                 'choices' => $status_choices,
                 'required' => false,
                 'disabled' => !$this->security->isGranted('manufacturer.edit', $part)
             ]);
 
         //Advanced section
-        $builder->add('needsReview', CheckboxType::class, ['label_attr'=> ['class' => 'checkbox-custom'],
-            'required' => false, 'label' => 'part.edit.needs_review'])
-            ->add('favorite', CheckboxType::class, ['label_attr'=> ['class' => 'checkbox-custom'],
-                'required' => false, 'label' => 'part.edit.is_favorite'])
-            ->add('mass', SIUnitType::class, ['unit' => 'g',
-                'label' => 'part.mass', 'required' => false])
-            ->add('partUnit', StructuralEntityType::class, ['class'=> MeasurementUnit::class,
-                'required' => false, 'disable_not_selectable' => true, 'label' => 'part.partUnit']);
+        $builder->add('needsReview', CheckboxType::class, [
+            'label_attr' => ['class' => 'checkbox-custom'],
+            'required' => false,
+            'label' => $this->trans->trans('part.edit.needs_review')
+        ])
+            ->add('favorite', CheckboxType::class, [
+                'label_attr' => ['class' => 'checkbox-custom'],
+                'required' => false,
+                'label' => $this->trans->trans('part.edit.is_favorite')
+            ])
+            ->add('mass', SIUnitType::class, [
+                'unit' => 'g',
+                'label' => $this->trans->trans('part.edit.mass'),
+                'required' => false
+            ])
+            ->add('partUnit', StructuralEntityType::class, [
+                'class' => MeasurementUnit::class,
+                'required' => false,
+                'disable_not_selectable' => true,
+                'label' => $this->trans->trans('part.edit.partUnit')
+            ]);
 
 
         //Comment section
-        $builder->add('comment', CKEditorType::class, ['required' => false,
-            'label' => 'comment.label', 'attr' => ['rows' => 4], 'help' => 'bbcode.hint',
-            'disabled' => !$this->security->isGranted('comment.edit', $part), 'empty_data' => '']);
+        $builder->add('comment', CKEditorType::class, [
+            'required' => false,
+            'label' => $this->trans->trans('part.edit.comment'),
+            'attr' => ['rows' => 4],
+            'disabled' => !$this->security->isGranted('comment.edit', $part), 'empty_data' => ''
+        ]);
 
         //Part Lots section
         $builder->add('partLots', CollectionType::class, [
@@ -169,7 +214,7 @@ class PartBaseType extends AbstractType
 
         $builder->add('master_picture_attachment', EntityType::class, [
             'required' => false,
-            'label' => 'part.edit.master_attachment',
+            'label' => $this->trans->trans('part.edit.master_attachment'),
             'class' => PartAttachment::class,
             'attr' => ['class' => 'selectpicker'],
             'choice_attr' => function ($choice, $key, $value) {
@@ -200,8 +245,8 @@ class PartBaseType extends AbstractType
 
         $builder
             //Buttons
-            ->add('save', SubmitType::class, ['label' => 'part.edit.save'])
-            ->add('reset', ResetType::class, ['label' => 'part.edit.reset']);
+            ->add('save', SubmitType::class, ['label' => $this->trans->trans('part.edit.save')])
+            ->add('reset', ResetType::class, ['label' => $this->trans->trans('part.edit.reset')]);
     }
 
     public function configureOptions(OptionsResolver $resolver)

src/Form/Part/PartLotType.php

@@ -51,45 +51,63 @@ use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
 use Symfony\Component\Form\FormInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use function GuzzleHttp\Promise\queue;
 
 class PartLotType extends AbstractType
 {
+    protected $trans;
+
+    public function __construct(TranslatorInterface $trans)
+    {
+        $this->trans = $trans;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $builder->add('description', TextType::class, ['label' => 'part_lot.edit.description',
-            'required' => false, 'empty_data' => "", 'attr' => ['class' => 'form-control-sm']]);
+        $builder->add('description', TextType::class, [
+            'label' => $this->trans->trans('part_lot.edit.description'),
+            'required' => false,
+            'empty_data' => "",
+            'attr' => ['class' => 'form-control-sm']
+        ]);
 
         $builder->add('storage_location', StructuralEntityType::class, ['class' => Storelocation::class,
-            'label' => 'part_lot.edit.location',
+            'label' => $this->trans->trans('part_lot.edit.location'),
             'required' => false,
             'disable_not_selectable' => true,
-            'attr' => ['class' => 'selectpicker form-control-sm', 'data-live-search' => true]]);
+            'attr' => ['class' => 'selectpicker form-control-sm', 'data-live-search' => true]
+        ]);
 
 
         $builder->add('amount', SIUnitType::class, [
             'measurement_unit' => $options['measurement_unit'],
-            'label' => 'part_lot.edit.amount',
+            'label' => $this->trans->trans('part_lot.edit.amount'),
             'attr' => ['class' => 'form-control-sm']
         ]);
 
         $builder->add('instock_unknown', CheckboxType::class, ['required' => false,
-            'label' => 'part_lot.edit.instock_unknown',
+            'label' => $this->trans->trans('part_lot.edit.instock_unknown'),
             'attr' => ['class' => 'form-control-sm'],
-            'label_attr' => ['class' => 'checkbox-custom']]);
+            'label_attr' => ['class' => 'checkbox-custom']
+        ]);
 
         $builder->add('needs_refill', CheckboxType::class, ['label_attr' => ['class' => 'checkbox-custom'],
-            'label' => 'part_lot.edit.needs_refill',
+            'label' => $this->trans->trans('part_lot.edit.needs_refill'),
             'attr' => ['class' => 'form-control-sm'],
-            'required' => false]);
+            'required' => false
+        ]);
+
         $builder->add('expirationDate', DateTimeType::class, [
-            'label' => 'part_lot.edit.expiration_date',
+            'label' => $this->trans->trans('part_lot.edit.expiration_date'),
             'attr' => [],
             'required' => false]);
 
-        $builder->add('comment', TextType::class, ['label' => 'part_lot.edit.comment',
+        $builder->add('comment', TextType::class, [
+            'label' => $this->trans->trans('part_lot.edit.comment'),
             'attr' => ['class' => 'form-control-sm'],
-            'required' => false, 'empty_data' => ""]);
+            'required' => false, 'empty_data' => ""
+        ]);
     }
 
 

src/Form/Part/PricedetailType.php

@@ -44,6 +44,7 @@ use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\Extension\Core\Type\NumberType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PricedetailType extends AbstractType
 {