Skip to content

Commit ca03ee0

Browse files
committed
Merge branch '5.3' into 5.4
* 5.3: [Translation] Improve Translation Providers docs [Process] Remove paragraph from bad merge
2 parents 0ad0508 + 1faab5d commit ca03ee0

File tree

2 files changed

+14
-16
lines changed

2 files changed

+14
-16
lines changed

components/process.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -418,22 +418,6 @@ instead::
418418
);
419419
$process->run();
420420

421-
Using a Prepared Command Line
422-
-----------------------------
423-
424-
You can run a process by using a prepared command line with double quote
425-
variable notation. This allows you to use placeholders so that only the
426-
parameterized values can be changed, but not the rest of the script::
427-
428-
use Symfony\Component\Process\Process;
429-
430-
$process = Process::fromShellCommandline('echo "$name"');
431-
$process->run(null, ['name' => 'Elsa']);
432-
433-
.. caution::
434-
435-
A prepared command line will not be escaped automatically!
436-
437421
Process Timeout
438422
---------------
439423

translation.rst

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -713,6 +713,18 @@ configure the ``providers`` option:
713713
],
714714
]);
715715
716+
.. tip::
717+
718+
If you use Lokalise as provider and a locale format following the `ISO 639-1`_ (e.g., "en" or "fr"),
719+
you have to set the `Custom Language Name setting`_ in Lokalise for each of your locales,
720+
in order to override the default value (which follow the `ISO 639-1`_ succeeded by a sub-code
721+
in capital letters that specifies the national variety (e.g., "GB" or "US" according to `ISO 3166-1 alpha-2`_)).
722+
723+
.. tip::
724+
725+
If you use PoEditor as provider, you have to define a `Default Reference Language`_ in your project,
726+
otherwise your translations could not be correctly exported.
727+
716728
Pushing and Pulling Translations
717729
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
718730

@@ -879,3 +891,5 @@ Learn more
879891
.. _`ISO 639-1`: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
880892
.. _`Translatable Extension`: https://github.com/doctrine-extensions/DoctrineExtensions/blob/main/doc/translatable.md
881893
.. _`Translatable Behavior`: https://github.com/KnpLabs/DoctrineBehaviors
894+
.. _`Default Reference Language`: https://poeditor.com/kb/setting-a-default-reference-language
895+
.. _`Custom Language Name setting`: https://docs.lokalise.com/en/articles/1400492-uploading-files#custom-language-codes

0 commit comments

Comments
 (0)