8000 [Translation] Allow usage of Provider domains if possible by welcoMattic · Pull Request #45171 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[Translation] Allow usage of Provider domains if possible #45171

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
Apr 12, 2022
Merged

[Translation] Allow usage of Provider domains if possible #45171

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
9 changes: 8 additions & 1 deletion src/Symfony/Component/Translation/Command/TranslationPushCommand.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Style\SymfonyStyle;
use Symfony\Component\Translation\Provider\FilteringProvider;
use Symfony\Component\Translation\Provider\TranslationProviderCollection;
use Symfony\Component\Translation\Reader\TranslationReaderInterface;
use Symfony\Component\Translation\TranslatorBag;
Expand Down Expand Up @@ -133,7 +134,13 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$localTranslations = $this->readLocalTranslations($locales, $domains, $this->transPaths);

if (!$domains) {
$domains = $this->getDomainsFromTranslatorBag($localTranslations);
if ($provider instanceof FilteringProvider) {
$domains = $provider->getDomains();
}

if (!$domains) {
$domains = $this->getDomainsFromTranslatorBag($localTranslations);
}
}

if (!$deleteMissing && $force) {
Expand Down
64 changes: 64 additions & 0 deletions src/Symfony/Component/Translation/Tests/Command/TranslationPushCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
use Symfony\Component\Translation\Command\TranslationPushCommand;
use Symfony\Component\Translation\Loader\ArrayLoader;
use Symfony\Component\Translation\Loader\XliffFileLoader;
use Symfony\Component\Translation\Provider\FilteringProvider;
use Symfony\Component\Translation\Provider\ProviderInterface;
use Symfony\Component\Translation\Provider\TranslationProviderCollection;
use Symfony\Component\Translation\Reader\TranslationReader;
use Symfony\Component\Translation\TranslatorBag;

Expand Down Expand Up @@ -259,6 +261,68 @@ public function testPushForceAndDeleteMissingMessages()
$this->assertStringContainsString('[OK] All local translations has been sent to "null" (for "en, fr" locale(s), and "messages" domain(s)).', trim($tester->getDisplay()));
}

public function testPushWithProviderDomains()
{
$arrayLoader = new ArrayLoader();
$xliffLoader = new XliffFileLoader();
$locales = ['en', 'fr'];
$domains = ['messages'];

// Simulate existing messages on Provider
$providerReadTranslatorBag = new TranslatorBag();
$providerReadTranslatorBag->addCatalogue($arrayLoader->load(['note' => 'NOTE'], 'en'));
$providerReadTranslatorBag->addCatalogue($arrayLoader->load(['note' => 'NOTE'], 'fr'));

$provider = $this->createMock(FilteringProvider::class);
$provider->expects($this->once())
->method('read')
->with($domains, $locales)
->willReturn($providerReadTranslatorBag);
$provider->expects($this->once())
->method('getDomains')
->willReturn(['messages']);

$filenameEn = $this->createFile([
'note' => 'NOTE',
'new.foo' => 'newFoo',
]);
$filenameFr = $this->createFile([
'note' => 'NOTE',
'new.foo' => 'nouveauFoo',
], 'fr');
$localTranslatorBag = new TranslatorBag();
$localTranslatorBag->addCatalogue($xliffLoader->load($filenameEn, 'en'));
$localTranslatorBag->addCatalogue($xliffLoader->load($filenameFr, 'fr'));

$provider->expects($this->once())
->method('write')
->with($localTranslatorBag->diff($providerReadTranslatorBag));

$provider->expects($this->once())
->method('__toString')
->willReturn('null://default');

$reader = new TranslationReader();
$reader->addLoader('xlf', new XliffFileLoader());

$command = new TranslationPushCommand(
new TranslationProviderCollection([
'loco' => $provider,
]),
$reader,
[$this->translationAppDir.'/translations'],
$locales
);

$application = new Application();
$application->add($command);
$tester = new CommandTester($application->find('translation:push'));

$tester->execute(['--locales' => ['en', 'fr']]);

$this->assertStringContainsString('[OK] New local translations has been sent to "null" (for "en, fr" locale(s), and "messages" domain(s)).', trim($tester->getDisplay()));
}

/**
* @dataProvider provideCompletionSuggestions
*/
Expand Down
0