Skip to content

Commit 97dbd5a

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Promote usage of a single translation domain Move sidebar into a real section Removed Translation component documentation
2 parents fa31bfd + 7e88858 commit 97dbd5a

File tree

13 files changed

+192
-688
lines changed

13 files changed

+192
-688
lines changed

_build/redirection_map

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,3 +475,5 @@
475475
/best_practices/web-assets /best_practices
476476
/best_practices/tests /best_practices
477477
/components/debug https://github.com/symfony/debug
478+
/components/translation https://github.com/symfony/translation
479+
/components/translation/usage /translation

bundles/override.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ instead of the original ones.
172172
Translations
173173
------------
174174

175-
Translations are not related to bundles, but to :ref:`translation domains <using-message-domains>`.
175+
Translations are not related to bundles, but to translation domains.
176176
For this reason, you can override any bundle translation file from the main
177177
``translations/`` directory, as long as the new file uses the same domain.
178178

components/form.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ support for very important features:
5555
The Symfony Form component relies on other libraries to solve these problems.
5656
Most of the time you will use Twig and the Symfony
5757
:doc:`HttpFoundation </components/http_foundation>`,
58-
:doc:`Translation </components/translation>` and :doc:`Validator </components/validator>`
58+
:doc:`Translation </translation>` and :doc:`Validator </components/validator>`
5959
components, but you can replace any of these with a different library of your choice.
6060

6161
The following sections explain how to plug these libraries into the form

components/translation.rst

Lines changed: 0 additions & 235 deletions
This file was deleted.

components/translation/custom_formats.rst

Lines changed: 0 additions & 125 deletions
This file was deleted.

0 commit comments

Comments
 (0)