Merge branch '5.3' into 5.4

* 5.3:
  [String] Add conflict for translation-contracts v3
  fixed help text
This commit is contained in:
Robin Chalas 2022-01-07 01:27:00 +01:00
commit 33d4c4314d
No known key found for this signature in database
GPG Key ID: 89672113756EE03B
2 changed files with 2 additions and 2 deletions

View File

@ -111,7 +111,7 @@ You can overwrite existing translations (and remove the missing ones on local si
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.

View File

@ -103,7 +103,7 @@ You can delete provider translations which are not present locally by using the
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.