Merge branch '6.1' into 6.2

javiereguiluz · javiereguiluz · commit 139fb1344da1 · 2022-06-18T11:57:56.000+02:00
* 6.1:
  [Form] Document using TranslatableMessage in form Fields
diff --git a/reference/forms/types/options/choice_label.rst.inc b/reference/forms/types/options/choice_label.rst.inc
@@ -25,9 +25,15 @@ more control::
 
             // or if you want to translate some key
             //return 'form.choice.'.$key;
+            //return new TranslatableMessage($key, false === $choice ? [] : ['%status%' => $value], 'store');
         },
     ]);
 
+.. versionadded:: 5.2
+
+    The support for ``TranslatableMessage`` objects in ``choice_label`` was
+    introduced in Symfony 5.2.
+
 This method is called for *each* choice, passing you the ``$choice`` and
 ``$key`` from the choices array (additional ``$value`` is related to `choice_value`_).
 This will give you:
diff --git a/reference/forms/types/options/label.rst.inc b/reference/forms/types/options/label.rst.inc
@@ -1,10 +1,26 @@
 ``label``
 ~~~~~~~~~
 
-**type**: ``string`` **default**: The label is "guessed" from the field name
+**type**: ``string`` or ``TranslatableMessage`` **default**: The label is "guessed" from the field name
 
 Sets the label that will be used when rendering the field. Setting to ``false``
-will suppress the label. The label can also be set in the template:
+will suppress the label.
+
+    use Symfony\Component\Translation\TranslatableMessage;
+
+    $builder
+        ->add('zipCode', null, [
+            'label' => 'The ZIP/Postal code',
+            // optionally, you can use TranslatableMessage objects as the label content
+            'label' => new TranslatableMessage('address.zipCode', ['%country%' => $country], 'address'),
+        ])
+
+.. versionadded:: 5.2
+
+    The support for ``TranslatableMessage`` objects in ``label`` was
+    introduced in Symfony 5.2.
+
+The label can also be set in the template:
 
 .. configuration-block::
 
