Commitae14433

committed

Merge branch '6.1' into 6.2

* 6.1: Fix path to bundle translations [Mailer] Update mailer.rst

2 parentsfd19324 +0273118 commitae14433Copy full SHA for ae14433

File tree

-2

lines changed

-2

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -330,7 +330,9 @@ and create an :class:`Symfony\\Component\\Mime\\Email` object::
`330`	`330`	`}`
`331`	`331`	`}`
`332`	`332`
`333`		`-That's it! The message will be sent via the transport you configured.`
	`333`	`+That's it! The message will be sent via the transport you configured. If the`
	`334`	+transport is configured to:ref:`send emails asynchronously<mailer-sending-messages-async>`,
	`335`	+the message won't be actually sent until:doc:`a worker consumes it<messenger-worker>`.
`334`	`336`
`335`	`337`	`Email Addresses`
`336`	`338`	`~~~~~~~~~~~~~~~`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,8 @@ Translation Resource/File Names and Locations`
`485`	`485`	`Symfony looks for message files (i.e. translations) in the following default locations:`
`486`	`486`
`487`	`487`	* the ``translations/`` directory (at the root of the project);
`488`		-* the ``Resources/translations/`` directory inside of any bundle.
	`488`	+* the ``translations/`` directory inside of any bundle (and also their
	`489`	+ ``Resources/translations/`` directory, which is no longer recommended for bundles).
`489`	`490`
`490`	`491`	`The locations are listed here with the highest priority first. That is, you can`
`491`	`492`	`override the translation messages of a bundle in the first directory.`

Comments

(0)