Skip to content

Commit afd90ab

Browse files
committed
Merge branch '5.4' into 6.0
* 5.4: Added italian missing translation [Security] Fix `TraceableAuthenticator::createToken()` argument type Fix persian (fa) translation [Notifier][RocketChat] Fix undefined index for message id 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 [Notifier] Fix 'Undefined array key' error in FirebaseTransport bug #43038 [Validator] Fixes URL validation for single-char subdomains.
2 parents 0c3ff27 + 6227f99 commit afd90ab

File tree

6 files changed

+84
-66
lines changed

6 files changed

+84
-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.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>

0 commit comments

Comments
 (0)