Merge branch '5.3' into 5.4

chalasr · chalasr · commit 33d4c4314d70 · 2022-01-07T01:28:17.000+01:00
* 5.3:
  [String] Add conflict for translation-contracts v3
  fixed help text
diff --git a/src/Symfony/Component/Translation/Command/TranslationPullCommand.php b/src/Symfony/Component/Translation/Command/TranslationPullCommand.php
@@ -111,7 +111,7 @@ protected function configure()
 
 Full example:
 
-  <info>php %command.full_name% provider --force --domains=messages,validators --locales=en</>
+  <info>php %command.full_name% provider --force --domains=messages --domains=validators --locales=en</>
 
 This command pulls all translations associated with the <comment>messages</> and <comment>validators</> domains for the <comment>en</> locale.
 Local translations for the specified domains and locale are deleted if they're not present on the provider and overwritten if it's the case.
diff --git a/src/Symfony/Component/Translation/Command/TranslationPushCommand.php b/src/Symfony/Component/Translation/Command/TranslationPushCommand.php
@@ -103,7 +103,7 @@ protected function configure()
 
 Full example:
 
-  <info>php %command.full_name% provider --force --delete-missing --domains=messages,validators --locales=en</>
+  <info>php %command.full_name% provider --force --delete-missing --domains=messages --domains=validators --locales=en</>
 
 This command pushes all translations associated with the <comment>messages</> and <comment>validators</> domains for the <comment>en</> locale.
 Provider translations for the specified domains and locale are deleted if they're not present locally and overwritten if it's the case.
