Skip to content

Commit a2a5247

Browse files
committed
Merge branch '5.4' into 6.4
* 5.4: [Validator] Add `WordCount` constraint French translation [Validator] Add German translation for `WordCount` constraint add validation message translations for the WordCount constraint restrict the maximum length of the X-Debug-Exception header
2 parents b99c855 + a260689 commit a2a5247

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+458
-2
lines changed

src/Symfony/Component/ErrorHandler/ErrorRenderer/HtmlErrorRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public function render(\Throwable $exception): FlattenException
6161
{
6262
$headers = ['Content-Type' => 'text/html; charset='.$this->charset];
6363
if (\is_bool($this->debug) ? $this->debug : ($this->debug)($exception)) {
64-
$headers['X-Debug-Exception'] = rawurlencode($exception->getMessage());
64+
$headers['X-Debug-Exception'] = rawurlencode(substr($exception->getMessage(), 0, 2000));
6565
$headers['X-Debug-Exception-File'] = rawurlencode($exception->getFile()).':'.$exception->getLine();
6666
}
6767

src/Symfony/Component/ErrorHandler/ErrorRenderer/SerializerErrorRenderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public function render(\Throwable $exception): FlattenException
4747
$headers = ['Vary' => 'Accept'];
4848
$debug = \is_bool($this->debug) ? $this->debug : ($this->debug)($exception);
4949
if ($debug) {
50-
$headers['X-Debug-Exception'] = rawurlencode($exception->getMessage());
50+
$headers['X-Debug-Exception'] = rawurlencode(substr($exception->getMessage(), 0, 2000));
5151
$headers['X-Debug-Exception-File'] = rawurlencode($exception->getFile()).':'.$exception->getLine();
5252
}
5353

src/Symfony/Component/Validator/Resources/translations/validators.af.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@
442442
<source>This URL is missing a top-level domain.</source>
443443
<target state="needs-review-translation">Die URL mis 'n topvlakdomein.</target>
444444
</trans-unit>
445+
<trans-unit id="114">
446+
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447+
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
448+
</trans-unit>
449+
<trans-unit id="115">
450+
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451+
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
452+
</trans-unit>
445453
</body>
446454
</file>
447455
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@
442442
<source>This URL is missing a top-level domain.</source>
443443
<target>هذا الرابط يفتقر إلى نطاق المستوى الأعلى.</target>
444444
</trans-unit>
445+
<trans-unit id="114">
446+
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447+
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
448+
</trans-unit>
449+
<trans-unit id="115">
450+
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451+
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
452+
</trans-unit>
445453
</body>
446454
</file>
447455
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.az.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@
442442
<source>This URL is missing a top-level domain.</source>
443443
<target state="needs-review-translation">Bu URL yuxarı səviyyəli domeni çatışmır.</target>
444444
</trans-unit>
445+
<trans-unit id="114">
446+
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447+
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
448+
</trans-unit>
449+
<trans-unit id="115">
450+
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451+
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
452+
</trans-unit>
445453
</body>
446454
</file>
447455
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.be.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@
442442
<source>This URL is missing a top-level domain.</source>
443443
<target state="needs-review-translation">Гэтаму URL бракуе дамен верхняга ўзроўню.</target>
444444
</trans-unit>
445+
<trans-unit id="114">
446+
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447+
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
448+
</trans-unit>
449+
<trans-unit id="115">
450+
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451+
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
452+
</trans-unit>
445453
</body>
446454
</file>
447455
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@
442442
<source>This URL is missing a top-level domain.</source>
443443
<target>На този URL липсва домейн от най-високо ниво.</target>
444444
</trans-unit>
445+
<trans-unit id="114">
446+
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447+
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
448+
</trans-unit>
449+
<trans-unit id="115">
450+
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451+
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
452+
</trans-unit>
445453
</body>
446454
</file>
447455
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@
442442
<source>This URL is missing a top-level domain.</source>
443443
<target state="needs-review-translation">Ovom URL-u nedostaje domena najvišeg nivoa.</target>
444444
</trans-unit>
445+
<trans-unit id="114">
446+
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447+
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
448+
</trans-unit>
449+
<trans-unit id="115">
450+
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451+
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
452+
</trans-unit>
445453
</body>
446454
</file>
447455
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@
442442
<source>This URL is missing a top-level domain.</source>
443443
<target>Aquesta URL no conté un domini de primer nivell.</target>
444444
</trans-unit>
445+
<trans-unit id="114">
446+
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447+
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
448+
</trans-unit>
449+
<trans-unit id="115">
450+
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451+
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
452+
</trans-unit>
445453
</body>
446454
</file>
447455
</xliff>

src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,14 @@
442442
<source>This URL is missing a top-level domain.</source>
443443
<target state="needs-review-translation">Této URL chybí doména nejvyššího řádu.</target>
444444
</trans-unit>
445+
<trans-unit id="114">
446+
<source>This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</source>
447+
<target state="needs-translation">This value is too short. It should contain at least one word.|This value is too short. It should contain at least {{ min }} words.</target>
448+
</trans-unit>
449+
<trans-unit id="115">
450+
<source>This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</source>
451+
<target state="needs-translation">This value is too long. It should contain one word.|This value is too long. It should contain {{ max }} words or less.</target>
452+
</trans-unit>
445453
</body>
446454
</file>
447455
</xliff>

0 commit comments

Comments
 (0)