Skip to content

Commit e568ad4

Browse files
committed
Merge branch '4.4' into 5.3
* 4.4: Added italian missing translation Fix persian (fa) translation Add missing translation for Estonian Add validator missing french translation Add missing translation [Security][Validator] Add missing translations for Gallician (gl) Update validators.ar.xlf bug #43038 [Validator] Fixes URL validation for single-char subdomains.
2 parents 7ceecf7 + 992a0fe commit e568ad4

File tree

9 files changed

+96
-66
lines changed

9 files changed

+96
-66
lines changed

Constraints/UrlValidator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class UrlValidator extends ConstraintValidator
2525
(%s):// # protocol
2626
(((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+:)?((?:[\_\.\pL\pN-]|%%[0-9A-Fa-f]{2})+)@)? # basic auth
2727
(
28-
([\pL\pN\pS]+\.?[\pL\pN\pS\-\_]+)+(\.?([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
28+
([\pL\pN\pS\-\_]+\.)*(([\pL\pN]|xn\-\-[\pL\pN-]+)+\.?) # a domain name
2929
| # or
3030
\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} # an IP address
3131
| # or

Resources/translations/validators.ar.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>يجب أن تكون هذه القيمة تعبيرًا صالحًا.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>هذه القيمة ليست لون CSS صالحًا.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

Resources/translations/validators.en.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>This value should be a valid expression.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>This value is not a valid CSS color.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

Resources/translations/validators.et.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>See väärtus pole korrektne avaldis.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>See väärtus pole korrektne CSS-i värv.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

Resources/translations/validators.fa.xlf

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

Resources/translations/validators.fr.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Cette valeur doit être une expression valide.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Cette valeur n'est pas une couleur CSS valide.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

Resources/translations/validators.gl.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,6 +386,10 @@
386386
<source>This value is not a valid International Securities Identification Number (ISIN).</source>
387387
<target>Este valor non é un número de identificación de valores internacionais (ISIN) válido.</target>
388388
</trans-unit>
389+
<trans-unit id="100">
390+
<source>This value should be a valid expression.</source>
391+
<target>Este valor debe ser unha expresión válida.</target>
392+
</trans-unit>
389393
</body>
390394
</file>
391395
</xliff>

Resources/translations/validators.it.xlf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,10 @@
390390
<source>This value should be a valid expression.</source>
391391
<target>Questo valore dovrebbe essere un'espressione valida.</target>
392392
</trans-unit>
393+
<trans-unit id="101">
394+
<source>This value is not a valid CSS color.</source>
395+
<target>Questo valore non è un colore CSS valido.</target>
396+
</trans-unit>
393397
</body>
394398
</file>
395399
</xliff>

Tests/Constraints/UrlValidatorTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,10 @@ public function getValidUrls()
101101
['http://a.pl'],
102102
['http://www.example.com'],
103103
['http://tt.example.com'],
104+
['http://m.example.com'],
105+
['http://m.m.m.example.com'],
106+
['http://example.m.example.com'],
107+
['https://long-string_with+symbols.m.example.com'],
104108
['http://www.example.com.'],
105109
['http://www.example.museum'],
106110
['https://example.com/'],
@@ -263,6 +267,8 @@ public function getInvalidUrls()
263267
['http://'],
264268
['http://www..com'],
265269
['http://www..example.com'],
270+
['http://www..m.example.com'],
271+
['http://.m.example.com'],
266272
['http://wwww.example..com'],
267273
['http://.www.example.com'],
268274
];

0 commit comments

Comments
 (0)