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 7a8f773

Browse filesBrowse files
fabpotfabpot
committed
Merge branch '5.3' into 5.4
* 5.3: Add missing validators translation [Inflector] Fix inflector for "zombies" fix ErrorExcception in CacheWarmerAggregate [Translation] correctly handle intl domains with TargetOperation
2 parents 5745b43 + 10d4e3c commit 7a8f773
Copy full SHA for 7a8f773

File tree

Expand file treeCollapse file tree

5 files changed

+46
-3
lines changed
Filter options
Expand file treeCollapse file tree

5 files changed

+46
-3
lines changed

‎src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpKernel/CacheWarmer/CacheWarmerAggregate.php
+3-1Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,9 @@ public function warmUp(string $cacheDir): array
104104

105105
if (is_file($this->deprecationLogsFilepath)) {
106106
$previousLogs = unserialize(file_get_contents($this->deprecationLogsFilepath));
107-
$collectedLogs = array_merge($previousLogs, $collectedLogs);
107+
if (\is_array($previousLogs)) {
108+
$collectedLogs = array_merge($previousLogs, $collectedLogs);
109+
}
108110
}
109111

110112
file_put_contents($this->deprecationLogsFilepath, serialize(array_values($collectedLogs)));

‎src/Symfony/Component/Inflector/Tests/InflectorTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Inflector/Tests/InflectorTest.php
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,6 +155,7 @@ public function singularizeProvider()
155155
['trees', 'tree'],
156156
['waltzes', ['waltz', 'waltze']],
157157
['wives', 'wife'],
158+
['zombies', 'zombie'],
158159

159160
// test casing: if the first letter was uppercase, it should remain so
160161
['Men', 'Man'],

‎src/Symfony/Component/Translation/Catalogue/TargetOperation.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Catalogue/TargetOperation.php
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ protected function processDomain(string $domain)
4949
foreach ($this->source->all($domain) as $id => $message) {
5050
if ($this->target->has($id, $domain)) {
5151
$this->messages[$domain]['all'][$id] = $message;
52-
$d = $this->target->defines($id, $intlDomain) ? $intlDomain : $domain;
52+
$d = $this->source->defines($id, $intlDomain) ? $intlDomain : $domain;
5353
$this->result->add([$id => $message], $d);
5454
if (null !== $keyMetadata = $this->source->getMetadata($id, $d)) {
5555
$this->result->setMetadata($id, $keyMetadata, $d);

‎src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php

Copy file name to clipboardExpand all lines: src/Symfony/Component/Translation/Tests/Catalogue/TargetOperationTest.php
+33-1Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,45 @@ public function testGetResultWithMixedDomains()
7171
{
7272
$this->assertEquals(
7373
new MessageCatalogue('en', [
74-
'messages+intl-icu' => ['a' => 'old_a'],
74+
'messages' => ['a' => 'old_a'],
7575
]),
7676
$this->createOperation(
7777
new MessageCatalogue('en', ['messages' => ['a' => 'old_a']]),
7878
new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'new_a']])
7979
)->getResult()
8080
);
81+
82+
$this->assertEquals(
83+
new MessageCatalogue('en', [
84+
'messages+intl-icu' => ['a' => 'old_a'],
85+
]),
86+
$this->createOperation(
87+
new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'old_a']]),
88+
new MessageCatalogue('en', ['messages' => ['a' => 'new_a']])
89+
)->getResult()
90+
);
91+
92+
$this->assertEquals(
93+
new MessageCatalogue('en', [
94+
'messages+intl-icu' => ['a' => 'old_a'],
95+
'messages' => ['b' => 'new_b'],
96+
]),
97+
$this->createOperation(
98+
new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'old_a']]),
99+
new MessageCatalogue('en', ['messages' => ['a' => 'new_a', 'b' => 'new_b']])
100+
)->getResult()
101+
);
102+
103+
$this->assertEquals(
104+
new MessageCatalogue('en', [
105+
'messages' => ['a' => 'old_a'],
106+
'messages+intl-icu' => ['b' => 'new_b'],
107+
]),
108+
$this->createOperation(
109+
new MessageCatalogue('en', ['messages' => ['a' => 'old_a']]),
110+
new MessageCatalogue('en', ['messages+intl-icu' => ['a' => 'new_a', 'b' => 'new_b']])
111+
)->getResult()
112+
);
81113
}
82114

83115
public function testGetResultWithMetadata()

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

Copy file name to clipboardExpand all lines: src/Symfony/Component/Validator/Resources/translations/validators.hr.xlf
+8Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,14 @@
394394
<source>This value is not a valid CSS color.</source>
395395
<target>Ova vrijednost nije važeća CSS boja.</target>
396396
</trans-unit>
397+
<trans-unit id="102">
398+
<source>This value is not a valid CIDR notation.</source>
399+
<target>Ova vrijednost nije valjana CIDR notacija.</target>
400+
</trans-unit>
401+
<trans-unit id="103">
402+
<source>The value of the netmask should be between {{ min }} and {{ max }}.</source>
403+
<target>Vrijednost mrežne maske trebala bi biti između {{ min }} i {{ max }}.</target>
404+
</trans-unit>
397405
</body>
398406
</file>
399407
</xliff>

0 commit comments

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