Skip to content

Commit 46660f7

Browse files
committed
Merge branch '6.4' into 7.1
* 6.4: Update translations
2 parents 7764612 + 8dfe867 commit 46660f7

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

translation.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ different formats:
145145
.. code-block:: yaml
146146
147147
# translations/messages.fr.yaml
148-
Symfony is great: J'aime Symfony
148+
Symfony is great: Symfony est génial
149149
150150
.. code-block:: xml
151151
@@ -156,7 +156,7 @@ different formats:
156156
<body>
157157
<trans-unit id="symfony_is_great">
158158
<source>Symfony is great</source>
159-
<target>J'aime Symfony</target>
159+
<target>Symfony est génial</target>
160160
</trans-unit>
161161
</body>
162162
</file>
@@ -166,14 +166,14 @@ different formats:
166166
167167
// translations/messages.fr.php
168168
return [
169-
'Symfony is great' => "J'aime Symfony",
169+
'Symfony is great' => 'Symfony est génial',
170170
];
171171
172172
You can find more information on where these files
173173
:ref:`should be located <translation-resource-locations>`.
174174

175175
Now, if the language of the user's locale is French (e.g. ``fr_FR`` or ``fr_BE``),
176-
the message will be translated into ``J'aime Symfony``. You can also translate
176+
the message will be translated into ``Symfony est génial``. You can also translate
177177
the message inside your :ref:`templates <translation-in-templates>`.
178178

179179
.. _translation-real-vs-keyword-messages:
@@ -1192,7 +1192,7 @@ for the ``fr`` locale:
11921192
<body>
11931193
<trans-unit id="1">
11941194
<source>Symfony is great</source>
1195-
<target>J'aime Symfony</target>
1195+
<target>Symfony est génial</target>
11961196
</trans-unit>
11971197
</body>
11981198
</file>
@@ -1201,13 +1201,13 @@ for the ``fr`` locale:
12011201
.. code-block:: yaml
12021202
12031203
# translations/messages.fr.yaml
1204-
Symfony is great: J'aime Symfony
1204+
Symfony is great: Symfony est génial
12051205
12061206
.. code-block:: php
12071207
12081208
// translations/messages.fr.php
12091209
return [
1210-
'Symfony is great' => 'J\'aime Symfony',
1210+
'Symfony is great' => 'Symfony est génial',
12111211
];
12121212
12131213
and for the ``en`` locale:
@@ -1250,7 +1250,7 @@ To inspect all messages in the ``fr`` locale for the application, run:
12501250
--------- ------------------ ---------------------- -------------------------------
12511251
State Id Message Preview (fr) Fallback Message Preview (en)
12521252
--------- ------------------ ---------------------- -------------------------------
1253-
unused Symfony is great J'aime Symfony Symfony is great
1253+
unused Symfony is great Symfony est génial Symfony is great
12541254
--------- ------------------ ---------------------- -------------------------------
12551255
12561256
It shows you a table with the result when translating the message in the ``fr``
@@ -1270,7 +1270,7 @@ output:
12701270
--------- ------------------ ---------------------- -------------------------------
12711271
State Id Message Preview (fr) Fallback Message Preview (en)
12721272
--------- ------------------ ---------------------- -------------------------------
1273-
Symfony is great J'aime Symfony Symfony is great
1273+
Symfony is great Symfony est génial Symfony is great
12741274
--------- ------------------ ---------------------- -------------------------------
12751275
12761276
The state is empty which means the message is translated in the ``fr`` locale

0 commit comments

Comments
 (0)