Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 28c0168

Browse filesBrowse files
xabbuhxabbuh
committed
Merge branch '6.4' into 7.2
* 6.4: Review translations for Chinese (zh_TW) review translation messages(be) Update Turkish translation for Twig template validation message Remove translations for slug validation error add missing $extensions and $extensionsMessage to the Image constraint
2 parents 920035e + 6013f04 commit 28c0168
Copy full SHA for 28c0168

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Dismiss banner
Expand file treeCollapse file tree

60 files changed

+100
-247
lines changed

‎src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Security/Core/Resources/translations/security.be.xlf
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
</trans-unit>
7777
<trans-unit id="20">
7878
<source>Too many failed login attempts, please try again in %minutes% minutes.</source>
79-
<target state="needs-review-translation">Занадта шмат няўдалых спробаў уваходу, калі ласка, паспрабуйце зноў праз %minutes% хвіліну.|Занадта шмат няўдалых спробаў уваходу, калі ласка, паспрабуйце зноў праз %minutes% хвіліны.|Занадта шмат няўдалых спробаў уваходу, калі ласка, паспрабуйце зноў праз %minutes% хвілін.</target>
79+
<target>Занадта вялікая колькасць няўдалых спробаў уваходу. Калі ласка, паспрабуйце зноў праз %minutes% хвіліну.|Занадта вялікая колькасць няўдалых спробаў уваходу. Калі ласка, паспрабуйце зноў праз %minutes% хвіліны.|Занадта вялікая колькасць няўдалых спробаў уваходу. Калі ласка, паспрабуйце зноў праз %minutes% хвілін.</target>
8080
</trans-unit>
8181
</body>
8282
</file>

‎src/Symfony/Component/Validator/Constraints/Image.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Constraints/Image.php
+9-1Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ public function __construct(
165165
?string $corruptedMessage = null,
166166
?array $groups = null,
167167
mixed $payload = null,
168+
array|string|null $extensions = null,
169+
?string $extensionsMessage = null,
168170
) {
169171
parent::__construct(
170172
$options,
@@ -187,7 +189,9 @@ public function __construct(
187189
$uploadExtensionErrorMessage,
188190
$uploadErrorMessage,
189191
$groups,
190-
$payload
192+
$payload,
193+
$extensions,
194+
$extensionsMessage,
191195
);
192196

193197
$this->minWidth = $minWidth ?? $this->minWidth;
@@ -216,6 +220,10 @@ public function __construct(
216220
$this->allowPortraitMessage = $allowPortraitMessage ?? $this->allowPortraitMessage;
217221
$this->corruptedMessage = $corruptedMessage ?? $this->corruptedMessage;
218222

223+
if (null === $this->mimeTypes && [] === $this->extensions) {
224+
$this->mimeTypes = 'image/*';
225+
}
226+
219227
if (!\in_array('image/*', (array) $this->mimeTypes, true) && !\array_key_exists('mimeTypesMessage', $options ?? []) && null === $mimeTypesMessage) {
220228
$this->mimeTypesMessage = 'The mime type of the file is invalid ({{ type }}). Allowed mime types are {{ types }}.';
221229
}

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.af.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target state="needs-review-translation">Hierdie waarde mag nie na week "{{ max }}" kom nie.</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target state="needs-review-translation">Hierdie waarde is nie 'n geldige slug nie.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Hierdie waarde is nie 'n geldige Twig-sjabloon nie.</target>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.ar.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target>يجب ألا تكون هذه القيمة بعد الأسبوع "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target>هذه القيمة ليست رمزا صالحا.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">هذه القيمة ليست نموذج Twig صالح.</target>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.az.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target state="needs-review-translation">Bu dəyər "{{ max }}" həftəsindən sonra olmamalıdır.</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target state="needs-review-translation">Bu dəyər etibarlı slug deyil.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Bu dəyər etibarlı Twig şablonu deyil.</target>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.be.xlf
+15-19Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
</trans-unit>
137137
<trans-unit id="37" resname="This is not a valid IP address.">
138138
<source>This value is not a valid IP address.</source>
139-
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным IP-адрасам.</target>
139+
<target>Гэта значэнне не з'яўляецца сапраўдным IP-адрасам.</target>
140140
</trans-unit>
141141
<trans-unit id="38">
142142
<source>This value is not a valid language.</source>
@@ -224,7 +224,7 @@
224224
</trans-unit>
225225
<trans-unit id="59" resname="This is not a valid International Bank Account Number (IBAN).">
226226
<source>This value is not a valid International Bank Account Number (IBAN).</source>
227-
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным міжнародным нумарам банкаўскага рахунку (IBAN).</target>
227+
<target>Гэта значэнне не з'яўляецца сапраўдным міжнародным нумарам банкаўскага рахунку (IBAN).</target>
228228
</trans-unit>
229229
<trans-unit id="60">
230230
<source>This value is not a valid ISBN-10.</source>
@@ -312,15 +312,15 @@
312312
</trans-unit>
313313
<trans-unit id="81" resname="This is not a valid Business Identifier Code (BIC).">
314314
<source>This value is not a valid Business Identifier Code (BIC).</source>
315-
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным кодам ідэнтыфікацыі бізнесу (BIC).</target>
315+
<target>Гэта значэнне не з'яўляецца сапраўдным кодам ідэнтыфікацыі банка (BIC).</target>
316316
</trans-unit>
317317
<trans-unit id="82">
318318
<source>Error</source>
319319
<target>Памылка</target>
320320
</trans-unit>
321321
<trans-unit id="83" resname="This is not a valid UUID.">
322322
<source>This value is not a valid UUID.</source>
323-
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным UUID.</target>
323+
<target>Гэта значэнне не з'яўляецца сапраўдным UUID.</target>
324324
</trans-unit>
325325
<trans-unit id="84">
326326
<source>This value should be a multiple of {{ compared_value }}.</source>
@@ -428,51 +428,47 @@
428428
</trans-unit>
429429
<trans-unit id="110">
430430
<source>The extension of the file is invalid ({{ extension }}). Allowed extensions are {{ extensions }}.</source>
431-
<target state="needs-review-translation">Пашырэнне файла няслушнае ({{ extension }}). Дазволеныя пашырэнні: {{ extensions }}.</target>
431+
<target>Пашырэнне файла недапушчальнае ({{ extension }}). Дазволеныя пашырэнні: {{ extensions }}.</target>
432432
</trans-unit>
433433
<trans-unit id="111">
434434
<source>The detected character encoding is invalid ({{ detected }}). Allowed encodings are {{ encodings }}.</source>
435-
<target state="needs-review-translation">Выяўленая кадыроўка знакаў няслушная ({{ detected }}). Дазволеныя кадыроўкі: {{ encodings }}.</target>
435+
<target>Выяўленая кадзіроўка недапушчальная ({{ detected }}). Дазволеныя кадзіроўкі: {{ encodings }}.</target>
436436
</trans-unit>
437437
<trans-unit id="112">
438438
<source>This value is not a valid MAC address.</source>
439-
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным MAC-адрасам.</target>
439+
<target>Гэта значэнне не з'яўляецца сапраўдным MAC-адрасам.</target>
440440
</trans-unit>
441441
<trans-unit id="113">
442442
<source>This URL is missing a top-level domain.</source>
443-
<target state="needs-review-translation">Гэтаму URL бракуе дамен верхняга ўзроўню.</target>
443+
<target>Гэтаму URL бракуе дамен верхняга ўзроўню.</target>
444444
</trans-unit>
445445
<trans-unit id="114">
446446
<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-review-translation">Гэта значэнне занадта кароткае. Яно павінна ўтрымліваць хаця б адно слова.|Гэта значэнне занадта кароткае. Яно павінна ўтрымліваць хаця б {{ min }} словы.</target>
447+
<target>Гэта значэнне занадта кароткае. Яно павінна ўтрымліваць хаця б адно слова.|Гэта значэнне занадта кароткае. Яно павінна ўтрымліваць хаця б {{ min }} слоў.</target>
448448
</trans-unit>
449449
<trans-unit id="115">
450450
<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-review-translation">Гэта значэнне занадта доўгае. Яно павінна ўтрымліваць адно слова.|Гэта значэнне занадта доўгае. Яно павінна ўтрымліваць {{ max }} словы або менш.</target>
451+
<target>Гэта значэнне занадта доўгае. Яно павінна ўтрымліваць адно слова.|Гэта значэнне занадта доўгае. Яно павінна ўтрымліваць {{ max }} слоў або менш.</target>
452452
</trans-unit>
453453
<trans-unit id="116">
454454
<source>This value does not represent a valid week in the ISO 8601 format.</source>
455-
<target state="needs-review-translation">Гэта значэнне не адпавядае правільнаму тыдні ў фармаце ISO 8601.</target>
455+
<target>Гэта значэнне не адпавядае сапраўднаму тыдню ў фармаце ISO 8601.</target>
456456
</trans-unit>
457457
<trans-unit id="117">
458458
<source>This value is not a valid week.</source>
459-
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным тыднем.</target>
459+
<target>Гэта значэнне не з'яўляецца сапраўдным тыднем.</target>
460460
</trans-unit>
461461
<trans-unit id="118">
462462
<source>This value should not be before week "{{ min }}".</source>
463-
<target state="needs-review-translation">Гэта значэнне не павінна быць раней за тыдзень "{{ min }}".</target>
463+
<target>Гэта значэнне не павінна быць раней за тыдзень "{{ min }}".</target>
464464
</trans-unit>
465465
<trans-unit id="119">
466466
<source>This value should not be after week "{{ max }}".</source>
467-
<target state="needs-review-translation">Гэта значэнне не павінна быць пасля тыдня "{{ max }}".</target>
468-
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным слугам.</target>
467+
<target>Гэта значэнне не павінна быць пасля тыдня "{{ max }}".</target>
472468
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475-
<target state="needs-review-translation">Гэта значэнне не з'яўляецца сапраўдным шаблонам Twig.</target>
471+
<target>Гэта значэнне не з'яўляецца сапраўдным шаблонам Twig.</target>
476472
</trans-unit>
477473
</body>
478474
</file>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target state="needs-review-translation">Тази стойност не трябва да бъде след седмица "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target state="needs-review-translation">Тази стойност не е валиден слаг.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Тази стойност не е валиден Twig шаблон.</target>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.bs.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target state="needs-review-translation">Ova vrijednost ne bi trebala biti nakon sedmice "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target state="needs-review-translation">Ova vrijednost nije važeći slug.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Ova vrijednost nije važeći Twig šablon.</target>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.ca.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target>Aquest valor no ha de ser posterior a la setmana "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target state="needs-review-translation">Aquest valor no és un slug vàlid.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Aquest valor no és una plantilla Twig vàlida.</target>

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.cs.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target>Tato hodnota by neměla být týden za "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target>Tato hodnota není platný slug.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Tato hodnota není platná šablona Twig.</target>

‎src/Symfony/Component/Validator/Resources/translations/validators.cy.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.cy.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target state="needs-review-translation">Ni ddylai'r gwerth hwn fod ar ôl yr wythnos "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target state="needs-review-translation">Nid yw'r gwerth hwn yn slug dilys.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Nid yw'r gwerth hwn yn dempled Twig dilys.</target>

‎src/Symfony/Component/Validator/Resources/translations/validators.da.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.da.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target state="needs-review-translation">Denne værdi bør ikke være efter uge "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target state="needs-review-translation">Denne værdi er ikke en gyldig slug.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Denne værdi er ikke en gyldig Twig-skabelon.</target>

‎src/Symfony/Component/Validator/Resources/translations/validators.de.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.de.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target>Dieser Wert darf nicht nach der Woche "{{ max }}" sein.</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target>Dieser Wert ist kein gültiger Slug.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target>Dieser Wert ist kein valides Twig-Template.</target>

‎src/Symfony/Component/Validator/Resources/translations/validators.el.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.el.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target>Αυτή η τιμή δεν πρέπει να είναι μετά την εβδομάδα "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target>Αυτή η τιμή δεν είναι έγκυρο slug.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target state="needs-review-translation">Αυτή η τιμή δεν είναι έγκυρο πρότυπο Twig.</target>

‎src/Symfony/Component/Validator/Resources/translations/validators.en.xlf

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.en.xlf
-4Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,6 @@
466466
<source>This value should not be after week "{{ max }}".</source>
467467
<target>This value should not be after week "{{ max }}".</target>
468468
</trans-unit>
469-
<trans-unit id="120">
470-
<source>This value is not a valid slug.</source>
471-
<target>This value is not a valid slug.</target>
472-
</trans-unit>
473469
<trans-unit id="121">
474470
<source>This value is not a valid Twig template.</source>
475471
<target>This value is not a valid Twig template.</target>

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.