Skip to content

Commit 4c7d86a

Browse files
wouterjweaverryan
authored andcommitted
Fixed things mentioned by the great @xabbuh
1 parent 1d0e7b3 commit 4c7d86a

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

book/translation.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ typically set via a ``_locale`` attribute on your routes (see :ref:`book-transla
9595
Fallback and Default Locale
9696
~~~~~~~~~~~~~~~~~~~~~~~~~~~
9797

98-
If the locale hasn't been set explicitly in the session, the ``fallback_locale``
99-
configuration parameter will be used by the ``Translator``. The parameter
100-
defaults to ``en`` (see `Configuration`_).
98+
If the locale hasn't been set, the ``fallback`` configuration parameter will
99+
be used by the ``Translator``. The parameter defaults to ``en`` (see
100+
`Configuration`_).
101101

102102
Alternatively, you can guarantee that a locale is set on each user's request
103103
by defining a ``default_locale`` for the framework:
@@ -328,7 +328,7 @@ works when you use a placeholder following the ``%var%`` pattern.
328328
.. caution::
329329

330330
The ``%var%`` notation of placeholders is required when translating in
331-
Twig templates.
331+
Twig templates using the tag.
332332

333333
.. tip::
334334

components/translation/introduction.rst

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The Translation Component
1111
Installation
1212
------------
1313

14-
You can install the component in many different ways:
14+
You can install the component in 2 different ways:
1515

1616
* Use the official Git repository (https://github.com/symfony/Translation);
1717
* :doc:`Install it via Composer</components/using_components>` (``symfony/translation`` on `Packagist`_).
@@ -156,10 +156,11 @@ Using Message Domains
156156
As you've seen, message files are organized into the different locales that
157157
they translate. The message files can also be organized further into "domains".
158158

159-
The domain is specific in the fourth argument of the ``addResource()`` method.
160-
The default domain is ``messages``. For example, suppose that, for organization,
161-
translations were split into three different domains: ``messages``, ``admin``
162-
and ``navigation``. The French translation would be loaded like this::
159+
The domain is specified in the fourth argument of the ``addResource()``
160+
method. The default domain is ``messages``. For example, suppose that, for
161+
organization, translations were split into three different domains:
162+
``messages``, ``admin`` and ``navigation``. The French translation would be
163+
loaded like this::
163164

164165
// ...
165166
$translator->addLoader('xliff', new XliffLoader());
@@ -175,12 +176,11 @@ you must specify the domain as the third argument of ``trans()``::
175176

176177
Symfony2 will now look for the message in the ``admin`` domain of the
177178
specified locale.
178-
can use ``-Inf`` and ``+Inf`` for the infinite.
179179

180180
Usage
181181
-----
182182

183-
Read how to use the Translation components in ":doc:`/components/translation/usage`".
183+
Read how to use the Translation component in ":doc:`/components/translation/usage`".
184184

185185
.. _Packagist: https://packagist.org/packages/symfony/translation
186186
.. _`ISO3166 Alpha-2`: http://en.wikipedia.org/wiki/ISO_3166-1#Current_codes

components/translation/usage.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,6 +342,7 @@ Or numbers between two other numbers:
342342
343343
The left delimiter can be ``[`` (inclusive) or ``]`` (exclusive). The right
344344
delimiter can be ``[`` (exclusive) or ``]`` (inclusive). Beside numbers, you
345+
can use ``-Inf`` and ``+Inf`` for the infinite.
345346

346347
Forcing the Translator Locale
347348
-----------------------------

0 commit comments

Comments
 (0)