Skip to content

Commit c99239c

Browse files
committed
use same order for all configuration-blocks
ensure the following order of code-blocks in a .. configuration-block:: directive: - php-annotations - yaml - xml - php
1 parent fa9139b commit c99239c

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

components/translation/usage.rst

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ is done just as before:
5353

5454
.. configuration-block::
5555

56+
.. code-block:: yaml
57+
58+
'Hello %name%': Bonjour %name%
59+
5660
.. code-block:: xml
5761
5862
<?xml version="1.0"?>
@@ -73,10 +77,6 @@ is done just as before:
7377
'Hello %name%' => 'Bonjour %name%',
7478
];
7579
76-
.. code-block:: yaml
77-
78-
'Hello %name%': Bonjour %name%
79-
8080
.. note::
8181

8282
The placeholders can take on any form as the full message is reconstructed
@@ -109,6 +109,11 @@ recommended format. These files are parsed by one of the loader classes.
109109

110110
.. configuration-block::
111111

112+
.. code-block:: yaml
113+
114+
Symfony is great: J'aime Symfony
115+
symfony.great: J'aime Symfony
116+
112117
.. code-block:: xml
113118
114119
<?xml version="1.0"?>
@@ -127,11 +132,6 @@ recommended format. These files are parsed by one of the loader classes.
127132
</file>
128133
</xliff>
129134
130-
.. code-block:: yaml
131-
132-
Symfony is great: J'aime Symfony
133-
symfony.great: J'aime Symfony
134-
135135
.. code-block:: php
136136
137137
return [

reference/constraints/Uuid.rst

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,6 @@ Basic Usage
2525

2626
.. configuration-block::
2727

28-
.. code-block:: yaml
29-
30-
# src/AppBundle/Resources/config/validation.yml
31-
AppBundle\Entity\File:
32-
properties:
33-
identifier:
34-
- Uuid: ~
35-
3628
.. code-block:: php-annotations
3729
3830
// src/AppBundle/Entity/File.php
@@ -48,6 +40,14 @@ Basic Usage
4840
protected $identifier;
4941
}
5042
43+
.. code-block:: yaml
44+
45+
# src/AppBundle/Resources/config/validation.yml
46+
AppBundle\Entity\File:
47+
properties:
48+
identifier:
49+
- Uuid: ~
50+
5151
.. code-block:: xml
5252
5353
<!-- src/AppBundle/Resources/config/validation.xml -->

translation.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,11 @@ different formats, XLIFF being the recommended format:
126126

127127
.. configuration-block::
128128

129+
.. code-block:: yaml
130+
131+
# messages.fr.yml
132+
Symfony is great: J'aime Symfony
133+
129134
.. code-block:: xml
130135
131136
<!-- messages.fr.xlf -->
@@ -141,11 +146,6 @@ different formats, XLIFF being the recommended format:
141146
</file>
142147
</xliff>
143148
144-
.. code-block:: yaml
145-
146-
# messages.fr.yml
147-
Symfony is great: J'aime Symfony
148-
149149
.. code-block:: php
150150
151151
// messages.fr.php

translation/debug.rst

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,11 @@ you've already setup some translations for the ``fr`` locale inside an AcmeDemoB
4949

5050
.. configuration-block::
5151

52+
.. code-block:: yaml
53+
54+
# src/Acme/AcmeDemoBundle/Resources/translations/messages.fr.yml
55+
Symfony is great: J'aime Symfony
56+
5257
.. code-block:: xml
5358
5459
<!-- src/Acme/AcmeDemoBundle/Resources/translations/messages.fr.xliff -->
@@ -64,11 +69,6 @@ you've already setup some translations for the ``fr`` locale inside an AcmeDemoB
6469
</file>
6570
</xliff>
6671
67-
.. code-block:: yaml
68-
69-
# src/Acme/AcmeDemoBundle/Resources/translations/messages.fr.yml
70-
Symfony is great: J'aime Symfony
71-
7272
.. code-block:: php
7373
7474
// src/Acme/AcmeDemoBundle/Resources/translations/messages.fr.php
@@ -80,6 +80,11 @@ and for the ``en`` locale:
8080

8181
.. configuration-block::
8282

83+
.. code-block:: yaml
84+
85+
# src/Acme/AcmeDemoBundle/Resources/translations/messages.en.yml
86+
Symfony is great: Symfony is great
87+
8388
.. code-block:: xml
8489
8590
<!-- src/Acme/AcmeDemoBundle/Resources/translations/messages.en.xliff -->
@@ -95,11 +100,6 @@ and for the ``en`` locale:
95100
</file>
96101
</xliff>
97102
98-
.. code-block:: yaml
99-
100-
# src/Acme/AcmeDemoBundle/Resources/translations/messages.en.yml
101-
Symfony is great: Symfony is great
102-
103103
.. code-block:: php
104104
105105
// src/Acme/AcmeDemoBundle/Resources/translations/messages.en.php

validation/translations.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,11 @@ Now, create a ``validators`` catalog file in the ``app/Resources/translations``
8888

8989
.. configuration-block::
9090

91+
.. code-block:: yaml
92+
93+
# app/Resources/translations/validators.en.yml
94+
author.name.not_blank: Please enter an author name.
95+
9196
.. code-block:: xml
9297
9398
<!-- app/Resources/translations/validators.en.xlf -->
@@ -103,11 +108,6 @@ Now, create a ``validators`` catalog file in the ``app/Resources/translations``
103108
</file>
104109
</xliff>
105110
106-
.. code-block:: yaml
107-
108-
# app/Resources/translations/validators.en.yml
109-
author.name.not_blank: Please enter an author name.
110-
111111
.. code-block:: php
112112
113113
// app/Resources/translations/validators.en.php

0 commit comments

Comments
 (0)