8000 [Translation] fix dumping catalogues cache by nicolas-grekas · Pull Request #29300 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Translation] fix dumping catalogues cache #29300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 26, 2018
Merged

[Translation] fix dumping catalogues cache #29300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/Symfony/Component/Translation/Tests/TranslatorCacheTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,17 @@ public function testThatACacheIsUsed($debug)
$translator = new Translator($locale, null, $this->tmpDir, $debug);
$translator->addLoader($format, new ArrayLoader());
$translator->addResource($format, array($msgid => 'OK'), $locale);
$translator->addResource($format, array($msgid.'+intl' => 'OK'), $locale, 'messages+intl-icu');
$translator->trans($msgid);
$translator->trans($msgid.'+intl', array(), 'messages+intl-icu');

// Try again and see we get a valid result whilst no loader can be used
$translator = new Translator($locale, null, $this->tmpDir, $debug);
$translator->addLoader($format, $this->createFailingLoader());
$translator->addResource($format, array($msgid => 'OK'), $locale);
$translator->addResource($format, array($msgid.'+intl' => 'OK'), $locale, 'messages+intl-icu');
$this->assertEquals('OK', $translator->trans($msgid), '-> caching does not work in '.($debug ? 'debug' : 'production'));
$this->assertEquals('OK', $translator->trans($msgid.'+intl', array(), 'messages+intl-icu'));
}

public function testCatalogueIsReloadedWhenResourcesAreNoLongerFresh()
Expand Down Expand Up @@ -212,6 +216,7 @@ public function testPrimaryAndFallbackCataloguesContainTheSameMessagesRegardless
$translator->addResource('array', array('foo' => 'foo (a)'), 'a');
$translator->addResource('array', array('foo' => 'foo (b)'), 'b');
$translator->addResource('array', array('bar' => 'bar (b)'), 'b');
$translator->addResource('array', array('baz' => 'baz (b)'), 'b', 'messages+intl-icu');

$catalogue = $translator->getCatalogue('a');
$this->assertFalse($catalogue->defines('bar')); // Sure, the "a" catalogue does not contain that message.
Expand All @@ -230,12 +235,14 @@ public function testPrimaryAndFallbackCataloguesContainTheSameMessagesRegardless
$translator->addResource('array', array('foo' => 'foo (a)'), 'a');
$translator->addResource('array', array('foo' => 'foo (b)'), 'b');
$translator->addResource('array', array('bar' => 'bar (b)'), 'b');
$translator->addResource('array', array('baz' => 'baz (b)'), 'b', 'messages+intl-icu');

$catalogue = $translator->getCatalogue('a');
$this->assertFalse($catalogue->defines('bar'));

$fallback = $catalogue->getFallbackCatalogue();
$this->assertTrue($fallback->defines('foo'));
$this->assertTrue($fallback->defines('baz', 'messages+intl-icu'));
}

public function testRefreshCacheWhenResourcesAreNoLongerFresh()
Expand Down
23 changes: 20 additions & 3 deletions src/Symfony/Component/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ private function dumpCatalogue($locale, ConfigCacheInterface $cache): void
EOF
,
$locale,
var_export($this->catalogues[$locale]->all(), true),
var_export($this->getAllMessages($this->catalogues[$locale]), true),
$fallbackContent
);

Expand All @@ -379,7 +379,7 @@ private function getFallbackContent(MessageCatalogue $catalogue): string
,
$fallbackSuffix,
$fallback,
var_export($fallbackCatalogue->all(), true),
var_export($this->getAllMessages($fallbackCatalogue), true),
$currentSuffix,
$fallbackSuffix
);
Expand Down Expand Up @@ -418,7 +418,7 @@ private function loadFallbackCatalogues($locale): void
$this->initializeCatalogue($fallback);
}

$fallbackCatalogue = new MessageCatalogue($fallback, $this->catalogues[$fallback]->all());
$fallbackCatalogue = new MessageCatalogue($fallback, $this->getAllMessages($this->catalogues[$fallback]));
foreach ($this->catalogues[$fallback]->getResources() as $resource) {
$fallbackCatalogue->addResource($resource);
}
Expand Down Expand Up @@ -487,4 +487,21 @@ private function getConfigCacheFactory(): ConfigCacheFactoryInterface

return $this->configCacheFactory;
}

private function getAllMessages(MessageCatalogueInterface $catalogue): array
{
$allMessages = array();

foreach ($catalogue->all() as $domain => $messages) {
if ($intlMessages = $catalogue->all($domain.MessageCatalogue::INTL_DOMAIN_SUFFIX)) {
$allMessages[$domain.MessageCatalogue::INTL_DOMAIN_SUFFIX] = $intlMessages;
$messages = array_diff_key($messages, $intlMessages);
}
if ($messages) {
$allMessages[$domain] = $messages;
}
}

return $allMessages;
}
}
0