Skip to content

Commit

Permalink
Merge branch '6.4' into 7.0
Browse files Browse the repository at this point in the history 
* 6.4: (21 commits)
  [ErrorHandler] Add missing self-closing tags on link elements
  Fix merge (bis)
  Fix merge
  Add missing return type
  [FrameworkBundle] ConfigBuilderCacheWarmer should be non-optional
  [HttpClient] Fix pausing responses before they start when using curl
  [Notifier] Updated the NTFY notifier to run without a user parameter
  [Translation] Fix constant domain resolution in PhpAstExtractor
  separate child and parent context in NotificationEmail on writes
  [Mailer] [Mailgun] Fix sender header encoding
  do not overwrite the cache key when it is false
  [Mailer] [Scaleway] Fix attachment handling
  [Mailer] Throw TransportException when unable to read from socket
  [Serializer] Rewrite `AbstractObjectNormalizer::createChildContext()` to use the provided `cache_key` from original context when creating child contexts
  Revert #47715
  [HttpClient] Fix error chunk creation in passthru
  Adjusting and removing the 'review' attribute from the pt_br translation XML.
  [DependencyInjection] Fix loading all env vars from secrets when only a subset is needed
  Fix option filenameMaxLength to the File constraint (Image)
  [Serializer] Take unnamed variadic parameters into account when denormalizing
  ...
  • Loading branch information
@nicolas-grekas
nicolas-grekas committed Jan 29, 2024
2 parents 802d75c + 9c1d8bb commit 03b0c75
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
1 change: 1 addition & 0 deletions Constraints/Image.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class Image extends File
self::EMPTY_ERROR => 'EMPTY_ERROR',
self::TOO_LARGE_ERROR => 'TOO_LARGE_ERROR',
self::INVALID_MIME_TYPE_ERROR => 'INVALID_MIME_TYPE_ERROR',
self::FILENAME_TOO_LONG => 'FILENAME_TOO_LONG',
self::SIZE_NOT_DETECTED_ERROR => 'SIZE_NOT_DETECTED_ERROR',
self::TOO_WIDE_ERROR => 'TOO_WIDE_ERROR',
self::TOO_NARROW_ERROR => 'TOO_NARROW_ERROR',
Expand Down
16 changes: 8 additions & 8 deletions Resources/translations/validators.pt_BR.xlf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</trans-unit>
<trans-unit id="37" resname="This is not a valid IP address.">
<source>This value is not a valid IP address.</source>
<target state="needs-review-translation">Este valor não é um endereço IP válido.</target>
<target>Este valor não é um endereço IP válido.</target>
</trans-unit>
<trans-unit id="38">
<source>This value is not a valid language.</source>
Expand Down Expand Up @@ -192,7 +192,7 @@
</trans-unit>
<trans-unit id="51" resname="No temporary folder was configured in php.ini.">
<source>No temporary folder was configured in php.ini, or the configured folder does not exist.</source>
<target state="needs-review-translation">Não foi configurada uma pasta temporária no php.ini, ou a pasta configurada não existe.</target>
<target>Nenhum diretório temporário foi configurado no php.ini, ou o diretório configurado não existe.</target>
</trans-unit>
<trans-unit id="52">
<source>Cannot write temporary file to disk.</source>
Expand Down Expand Up @@ -224,7 +224,7 @@
</trans-unit>
<trans-unit id="59" resname="This is not a valid International Bank Account Number (IBAN).">
<source>This value is not a valid International Bank Account Number (IBAN).</source>
<target state="needs-review-translation">Este valor não é um Número de Conta Bancária Internacional (IBAN) válido.</target>
<target>Este valor não é um Número de Conta Bancária Internacional (IBAN) válido.</target>
</trans-unit>
<trans-unit id="60">
<source>This value is not a valid ISBN-10.</source>
Expand Down Expand Up @@ -312,15 +312,15 @@
</trans-unit>
<trans-unit id="81" resname="This is not a valid Business Identifier Code (BIC).">
<source>This value is not a valid Business Identifier Code (BIC).</source>
<target state="needs-review-translation">Este valor não é um Código de Identificação de Negócios (BIC) válido.</target>
<target>Este valor não é um Código de Identificação de Negócios (BIC) válido.</target>
</trans-unit>
<trans-unit id="82">
<source>Error</source>
<target>Erro</target>
</trans-unit>
<trans-unit id="83" resname="This is not a valid UUID.">
<source>This value is not a valid UUID.</source>
<target state="needs-review-translation">Este valor não é um UUID válido.</target>
<target>Este valor não é um UUID válido.</target>
</trans-unit>
<trans-unit id="84">
<source>This value should be a multiple of {{ compared_value }}.</source>
Expand Down Expand Up @@ -428,15 +428,15 @@
</trans-unit>
<trans-unit id="110">
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
<target state="needs-review-translation">A extensão do arquivo é inválida ({{ extension }}). As extensões permitidas são {{ extensions }}.</target>
<target>A extensão do arquivo é inválida ({{ extension }}). As extensões permitidas são {{ extensions }}.</target>
</trans-unit>
<trans-unit id="111">
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
<target state="needs-review-translation">A codificação de caracteres detectada é inválida ({{ detected }}). As codificações permitidas são {{ encodings }}.</target>
<target>A codificação de caracteres detectada é inválida ({{ detected }}). As codificações permitidas são {{ encodings }}.</target>
</trans-unit>
<trans-unit id="112">
<source>This value is not a valid MAC address.</source>
<target state="needs-review-translation">Este valor não é um endereço MAC válido.</target>
<target>Este valor não é um endereço MAC válido.</target>
</trans-unit>
</body>
</file>
Expand Down

0 comments on commit 03b0c75

Please sign in to comment.