Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit321fe55

Browse files
committed
Merge branch '5.4' into 6.2
* 5.4: Fix broken links Fix markup Fix translation refs
2 parents0e04fed +aee8f75 commit321fe55

File tree

3 files changed

+10
-11
lines changed

3 files changed

+10
-11
lines changed

‎reference/dic_tags.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ register it as a service, then tag it with ``kernel.fragment_renderer``.
618618
kernel.locale_aware
619619
-------------------
620620

621-
**Purpose**: To access and use the current:doc:`locale</translation/locale>`
621+
**Purpose**: To access and use the current:ref:`locale<translation-locale>`
622622

623623
Setting and retrieving the locale can be done via configuration or using
624624
container parameters, listeners, route parameters or the current request.

‎routing.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1946,7 +1946,7 @@ Localized Routes (i18n)
19461946
-----------------------
19471947

19481948
If your application is translated into multiple languages, each route can define
1949-
a different URL per each:doc:`translation locale</translation/locale>`. This
1949+
a different URL per each:ref:`translation locale<translation-locale>`. This
19501950
avoids the need for duplicating routes, which also reduces the potential bugs:
19511951

19521952
..configuration-block::

‎translation.rst‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ The translation process has several steps:
4242
#.:ref:`Create translation resources/files<translation-resources>`
4343
for each supported locale that translate each message in the application;
4444

45-
#. Determine,:doc:`set and manage the user's locale</translation/locale>`
45+
#. Determine,:ref:`set and manage the user's locale<translation-locale>`
4646
for the request and optionally
4747
:ref:`on the user's entire session<locale-sticky-session>`.
4848

@@ -410,9 +410,9 @@ You can also specify the message domain and pass some additional variables:
410410
411411
..caution::
412412

413-
Using the translation tag has the same effect as the filter, but with one
414-
major difference: automatic output escaping is **not** applied to translations
415-
using a tag.
413+
Using the translation tag has the same effect as the filter, but with one
414+
major difference: automatic output escaping is **not** applied to translations
415+
using a tag.
416416

417417
Forcing the Translator Locale
418418
-----------------------------
@@ -569,9 +569,8 @@ if you're generating translations with specialized programs or teams.
569569
..note::
570570

571571
You can also store translations in a database; it can be handled by
572-
Doctrine through the `Translatable Extension`_ or the `Translatable
573-
Behavior`_ (PHP 5.4+). For more information, see the documentation for
574-
these libraries.
572+
Doctrine through the `Translatable Extension`_ or the `Translatable Behavior`_
573+
(PHP 5.4+). For more information, see the documentation for these libraries.
575574

576575
For any other storage, you need to provide a custom class implementing the
577576
:class:`Symfony\\Component\\Translation\\Loader\\LoaderInterface`
@@ -696,8 +695,8 @@ configure the ``providers`` option:
696695
..tip::
697696

698697
If you use Lokalise as a provider and a locale format following the `ISO
699-
639-1`_ (e.g. "en" or "fr"), you have to set the `Custom Language Name
700-
setting`_in Lokalise for each of your locales, in order to override the
698+
639-1`_ (e.g. "en" or "fr"), you have to set the `Custom Language Name setting`_
699+
in Lokalise for each of your locales, in order to override the
701700
default value (which follow the `ISO 639-1`_ succeeded by a sub-code in
702701
capital letters that specifies the national variety (e.g. "GB" or "US"
703702
according to `ISO 3166-1 alpha-2`_)).

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp