Skip to content

Commit 218915f

Browse files
Henry Snoekwouterj
Henry Snoek
authored andcommitted
refer to Symfony instead of Symfony2
With Symfony version 3.x it doesn't make sense to refer to Symfony2 in the documentation.
1 parent b6d27ea commit 218915f

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

components/expression_language.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ How can the Expression Engine Help Me?
2121
--------------------------------------
2222

2323
The purpose of the component is to allow users to use expressions inside
24-
configuration for more complex logic. For some examples, the Symfony2 Framework
24+
configuration for more complex logic. For some examples, the Symfony Framework
2525
uses expressions in security, for validation rules and in route matching.
2626

2727
Besides using the component in the framework itself, the ExpressionLanguage

translation/debug.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ tag or filter usages in Twig templates:
1515

1616
.. code-block:: jinja
1717
18-
{% trans %}Symfony2 is great{% endtrans %}
18+
{% trans %}Symfony is great{% endtrans %}
1919
20-
{{ 'Symfony2 is great'|trans }}
20+
{{ 'Symfony is great'|trans }}
2121
22-
{{ 'Symfony2 is great'|transchoice(1) }}
22+
{{ 'Symfony is great'|transchoice(1) }}
2323
24-
{% transchoice 1 %}Symfony2 is great{% endtranschoice %}
24+
{% transchoice 1 %}Symfony is great{% endtranschoice %}
2525
2626
It will also detect the following translator usages in PHP templates:
2727

2828
.. code-block:: php
2929
30-
$view['translator']->trans("Symfony2 is great");
30+
$view['translator']->trans("Symfony is great");
3131
32-
$view['translator']->transChoice('Symfony2 is great', 1);
32+
$view['translator']->transChoice('Symfony is great', 1);
3333
3434
.. caution::
3535

@@ -41,7 +41,7 @@ It will also detect the following translator usages in PHP templates:
4141

4242
.. code-block:: jinja
4343
44-
{% set message = 'Symfony2 is great' %}
44+
{% set message = 'Symfony is great' %}
4545
{{ message|trans }}
4646
4747
Suppose your application's default_locale is ``fr`` and you have configured
@@ -59,8 +59,8 @@ you've already setup some translations for the ``fr`` locale inside an AcmeDemoB
5959
<file source-language="en" datatype="plaintext" original="file.ext">
6060
<body>
6161
<trans-unit id="1">
62-
<source>Symfony2 is great</source>
63-
<target>J'aime Symfony2</target>
62+
<source>Symfony is great</source>
63+
<target>J'aime Symfony</target>
6464
</trans-unit>
6565
</body>
6666
</file>
@@ -70,13 +70,13 @@ you've already setup some translations for the ``fr`` locale inside an AcmeDemoB
7070
.. code-block:: yaml
7171
7272
# src/Acme/AcmeDemoBundle/Resources/translations/messages.fr.yml
73-
Symfony2 is great: J'aime Symfony2
73+
Symfony is great: J'aime Symfony
7474
7575
.. code-block:: php
7676
7777
// src/Acme/AcmeDemoBundle/Resources/translations/messages.fr.php
7878
return array(
79-
'Symfony2 is great' => 'J\'aime Symfony2',
79+
'Symfony is great' => 'J\'aime Symfony',
8080
);
8181
8282
and for the ``en`` locale:
@@ -91,8 +91,8 @@ and for the ``en`` locale:
9191
<file source-language="en" datatype="plaintext" original="file.ext">
9292
<body>
9393
<trans-unit id="1">
94-
<source>Symfony2 is great</source>
95-
<target>Symfony2 is great</target>
94+
<source>Symfony is great</source>
95+
<target>Symfony is great</target>
9696
</trans-unit>
9797
</body>
9898
</file>
@@ -101,13 +101,13 @@ and for the ``en`` locale:
101101
.. code-block:: yaml
102102
103103
# src/Acme/AcmeDemoBundle/Resources/translations/messages.en.yml
104-
Symfony2 is great: Symfony2 is great
104+
Symfony is great: Symfony is great
105105
106106
.. code-block:: php
107107
108108
// src/Acme/AcmeDemoBundle/Resources/translations/messages.en.php
109109
return array(
110-
'Symfony2 is great' => 'Symfony2 is great',
110+
'Symfony is great' => 'Symfony is great',
111111
);
112112
113113
To inspect all messages in the ``fr`` locale for the AcmeDemoBundle, run:
@@ -128,7 +128,7 @@ It shows you a table with the result when translating the message in the ``fr``
128128
locale and the result when the fallback locale ``en`` would be used. On top
129129
of that, it will also show you when the translation is the same as the fallback
130130
translation (this could indicate that the message was not correctly translated).
131-
Furthermore, it indicates that the message ``Symfony2 is great`` is unused
131+
Furthermore, it indicates that the message ``Symfony is great`` is unused
132132
because it is translated, but you haven't used it anywhere yet.
133133

134134
Now, if you translate the message in one of your templates, you will get this
@@ -140,7 +140,7 @@ output:
140140
The state is empty which means the message is translated in the ``fr`` locale
141141
and used in one or more templates.
142142

143-
If you delete the message ``Symfony2 is great`` from your translation file
143+
If you delete the message ``Symfony is great`` from your translation file
144144
for the ``fr`` locale and run the command, you will get:
145145

146146
.. image:: /_images/translation/debug_3.png

0 commit comments

Comments
 (0)