Nov 29, 2012 · Apr 27, 2013 · Apr 27, 2013 · Apr 29, 2013 · Apr 29, 2013 · May 12, 2013
diff --git a/book/translation.rst b/book/translation.rst
 Fallback and Default Locale
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

 Alternatively, you can guarantee that a locale is set on the user's session
 by defining a ``default_locale`` for the session service:
 .. caution::

    The ``%var%`` notation of placeholders is required when translating in
    Twig templates.
    Twig templates using the tag.

 .. tip::

diff --git a/components/translation/introduction.rst b/components/translation/introduction.rst
 Installation
 ------------

 You can install the component inmany different ways:
 You can install the component in2 different ways:

 * Use the official Git repository (https://github.com/symfony/Translation);
 * :doc:`Install it via Composer</components/using_components>` (``symfony/translation`` on `Packagist`_).
 As you've seen, message files are organized into the different locales that
 they translate. The message files can also be organized further into "domains".

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

    // ...
    $translator->addLoader('xliff', new XliffLoader());

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

 Usage
 -----

 Read how to use the Translationcomponents in ":doc:`/components/translation/usage`".
 Read how to use the Translationcomponent in ":doc:`/components/translation/usage`".

 .. _Packagist: https://packagist.org/packages/symfony/translation
 .. _`ISO3166 Alpha-2`: http://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
diff --git a/components/translation/usage.rst b/components/translation/usage.rst

 The left delimiter can be ``[`` (inclusive) or ``]`` (exclusive). The right
 delimiter can be ``[`` (exclusive) or ``]`` (inclusive). Beside numbers, you
 can use ``-Inf`` and ``+Inf`` for the infinite.

 Forcing the Translator Locale
 -----------------------------
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,9 +78,9 @@ The locale used in translations is the one stored in the user session.
		Fallback and Default Locale
		~~~~~~~~~~~~~~~~~~~~~~~~~~~

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

		Alternatively, you can guarantee that a locale is set on the user's session
		by defining a ``default_locale`` for the session service:
Expand DownExpand Up		@@ -276,7 +276,7 @@ works when you use a placeholder following the ``%var%`` pattern.
		.. caution::

		The ``%var%`` notation of placeholders is required when translating in
		Twig templates.
		Twig templates using the tag.

		.. tip::

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,7 +11,7 @@ The Translation Component
		Installation
		------------

		You can install the component inmany different ways:
		You can install the component in2 different ways:

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

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

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

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

		Usage
		-----

		Read how to use the Translationcomponents in ":doc:`/components/translation/usage`".
		Read how to use the Translationcomponent in ":doc:`/components/translation/usage`".

		.. _Packagist: https://packagist.org/packages/symfony/translation
		.. _`ISO3166 Alpha-2`: http://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -342,6 +342,7 @@ Or numbers between two other numbers:

		The left delimiter can be ``[`` (inclusive) or ``]`` (exclusive). The right
		delimiter can be ``[`` (exclusive) or ``]`` (inclusive). Beside numbers, you
Copy link Member xabbuhJun 5, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. something's missing here, maybe the sentence fragment from above? Copy link MemberAuthor wouterjJun 5, 2013 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Yew, will fix it
		can use ``-Inf`` and ``+Inf`` for the infinite.

		Forcing the Translator Locale
		-----------------------------
Expand Down