Skip to content

Commit a3d0d90

Browse files
committed
Merge branch '4.4' into 5.0
* 4.4: Microupdate on broken bullet point
2 parents 7cb1051 + 6439f06 commit a3d0d90

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

translation.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -248,12 +248,12 @@ using the ``trans()`` method:
248248

249249
#. The ``locale`` of the current user, which is stored on the request is determined;
250250

251-
* A catalog (e.g. big collection) of translated messages is loaded from translation
252-
resources defined for the ``locale`` (e.g. ``fr_FR``). Messages from the
253-
:ref:`fallback locale <translation-fallback>` are also loaded and
254-
added to the catalog if they don't already exist. The end result is a large
255-
"dictionary" of translations. This catalog is cached in production to
256-
minimize performance impact.
251+
#. A catalog (e.g. big collection) of translated messages is loaded from translation
252+
resources defined for the ``locale`` (e.g. ``fr_FR``). Messages from the
253+
:ref:`fallback locale <translation-fallback>` are also loaded and
254+
added to the catalog if they don't already exist. The end result is a large
255+
"dictionary" of translations. This catalog is cached in production to
256+
minimize performance impact.
257257

258258
#. If the message is located in the catalog, the translation is returned. If
259259
not, the translator returns the original message.

0 commit comments

Comments
 (0)