Skip to content

Commit 666ee59

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: notifier - do not display todo doc on site [Translation] Translatable parameters
2 parents f6bd7eb + f8b48c9 commit 666ee59

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

notifier.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -778,9 +778,9 @@ all configured texter and chatter transports only in the ``dev`` (and/or
778778
slack: 'null://null'
779779
780780
.. TODO
781-
- Using the message bus for asynchronous notification
782-
- Describe notifier monolog handler
783-
- Describe notification_on_failed_messages integration
781+
.. - Using the message bus for asynchronous notification
782+
.. - Describe notifier monolog handler
783+
.. - Describe notification_on_failed_messages integration
784784
785785
Learn more
786786
----------

translation.rst

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,6 +345,10 @@ Templates are now much simpler because you can pass translatable objects to the
345345
<h1>{{ message|trans }}</h1>
346346
<p>{{ status|trans }}</p>
347347

348+
.. tip::
349+
350+
The translation parameters can also be a :class:`Symfony\\Component\\Translation\\TranslatableMessage`.
351+
348352
.. tip::
349353

350354
There's also a :ref:`function called t() <reference-twig-function-t>`,

0 commit comments

Comments
 (0)