Skip to content

Commit 00c8efa

Browse files
committed
Merge branch '4.3' into 4.4
* 4.3: Use .yaml instead of .yml Update mailer.rst
2 parents e7d22d7 + bda4844 commit 00c8efa

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

mailer.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ called ``css`` that points to the directory where ``email.css`` lives:
453453
454454
paths:
455455
# point this wherever your css files live
456-
css: '%kernel.project_dir%/assets/css'
456+
'%kernel.project_dir%/assets/css': css
457457
458458
.. _mailer-markdown:
459459

translation/message_format.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ In order to use the ICU Message Format, the :ref:`message domain
2525
====================== ===============================
2626
Normal file name ICU Message Format filename
2727
====================== ===============================
28-
``messages.en.yml`` ``messages+intl-icu.en.yml``
28+
``messages.en.yaml`` ``messages+intl-icu.en.yaml``
2929
``messages.fr_FR.xlf`` ``messages+intl-icu.fr_FR.xlf``
30-
``admin.en.yml`` ``admin+intl-icu.en.yml``
30+
``admin.en.yaml`` ``admin+intl-icu.en.yaml``
3131
====================== ===============================
3232

3333
All messages in this file will now be processed by the

0 commit comments

Comments
 (0)