Skip to content

Commit 770e3b8

Browse files
committed
Merge branch '7.4' into 8.0
* 7.4: (40 commits) [PropertyInfo] treat mixed[] the same as array when getting types from docblocks treat `mixed[]` the same as `array` when getting types from docblocks install ext-zstd on PHP 8.5 as well fix merge [Console] Fix profile invokable command sync ControllerHelper docblock with latest AbstractController changes fix: Typehint for `createForm` in abstractController [Notifier][Mercure] Add support for Mercure 0.7 register attribute loader arguments in a forward-compatible way ensure compatibility with RelayCluster 0.20.0 mark test using a Redis connection as an integration test ensure compatibility with Relay extension 0.20.0 [FrameworkBundle] Allow backed enum to be used in initial_marking workflow configuration [DependencyInjection] Fix `query_string` env processor for URLs without query string [HttpFoundation] Fix Expires response header for EventStream Bump Symfony version to 7.4.1 Update VERSION for 7.4.0 Update CHANGELOG for 7.4.0 - [DependencyInjection] Fix state corruption in PhpFileLoader during recursive imports ...
2 parents 82ab368 + 2d01ca0 commit 770e3b8

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

PseudoLocalizationTranslator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ final class PseudoLocalizationTranslator implements TranslatorInterface, Transla
5555
* * parse_html:
5656
* type: boolean
5757
* default: false
58-
* description: parse the translated string as HTML - looking for HTML tags has a performance impact but allows to preserve them from alterations - it also allows to compute the visible translated string length which is useful to correctly expand ot when it contains HTML
58+
* description: parse the translated string as HTML - looking for HTML tags has a performance impact but allows to preserve them from alterations - it also allows to compute the visible translated string length which is useful to correctly expand or when it contains HTML
5959
* warning: unclosed tags are unsupported, they will be fixed (closed) by the parser - eg, "foo <div>bar" => "foo <div>bar</div>"
6060
*
6161
* * localizable_html_attributes:

Resources/data/parents.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"en_DG": "en_001",
2424
"en_DK": "en_150",
2525
"en_DM": "en_001",
26+
"en_EE": "en_150",
2627
"en_ER": "en_001",
2728
"en_ES": "en_150",
2829
"en_FI": "en_150",
@@ -32,6 +33,7 @@
3233
"en_FR": "en_150",
3334
"en_GB": "en_001",
3435
"en_GD": "en_001",
36+
"en_GE": "en_150",
3537
"en_GG": "en_001",
3638
"en_GH": "en_001",
3739
"en_GI": "en_001",
@@ -56,6 +58,8 @@
5658
"en_LC": "en_001",
5759
"en_LR": "en_001",
5860
"en_LS": "en_001",
61+
"en_LT": "en_150",
62+
"en_LV": "en_150",
5963
"en_MG": "en_001",
6064
"en_MO": "en_001",
6165
"en_MS": "en_001",
@@ -98,6 +102,7 @@
98102
"en_TT": "en_001",
99103
"en_TV": "en_001",
100104
"en_TZ": "en_001",
105+
"en_UA": "en_150",
101106
"en_UG": "en_001",
102107
"en_VC": "en_001",
103108
"en_VG": "en_001",
@@ -130,6 +135,7 @@
130135
"es_VE": "es_419",
131136
"ff_Adlm": "root",
132137
"hi_Latn": "en_IN",
138+
"kk_Arab": "root",
133139
"ks_Deva": "root",
134140
"nb": "no",
135141
"nn": "no",

0 commit comments

Comments
 (0)