Skip to content

Commit 7a79bc7

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

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
@@ -795,9 +795,9 @@ all configured texter and chatter transports only in the ``dev`` (and/or
795795
slack: 'null://null'
796796
797797
.. TODO
798-
- Using the message bus for asynchronous notification
799-
- Describe notifier monolog handler
800-
- Describe notification_on_failed_messages integration
798+
.. - Using the message bus for asynchronous notification
799+
.. - Describe notifier monolog handler
800+
.. - Describe notification_on_failed_messages integration
801801
802802
Learn more
803803
----------

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)