Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commite5be65f

Browse files
committed
bug#43364 [Translation] Use symfony default locale when pulling translations from providers (Yoann MOROCUTTI)
This PR was squashed before being merged into the 5.3 branch.Discussion----------[Translation] Use symfony default locale when pulling translations from providers| Q | A| ------------- | ---| Branch? | 5.3 <!-- see below -->| Bug fix? | yes| New feature? | no <!-- please update src/**/CHANGELOG.md files -->| Deprecations? | no <!-- please update UPGRADE-*.md and src/**/CHANGELOG.md files -->| Tickets |Fix#43363 <!-- prefix each issue number with "Fix #", no need to create an issue if none exist, explain below instead -->| License | MIT| Doc PR | <!-- required for new features -->When pulling translations from provider, locale source inside the Xll file is replaced with the \Locale::getDefault() instead of using the one configured in Symfony.Inject the default_locale option from the translation pull command to the xlf writer.Commits-------7f89d93 [Translation] Use symfony default locale when pulling translations from providers
2 parents8089778 +7f89d93 commite5be65f

File tree

2 files changed

+79
-2
lines changed

2 files changed

+79
-2
lines changed

‎src/Symfony/Component/Translation/Command/TranslationPullCommand.php‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
119119
$writeOptions = [
120120
'path' =>end($this->transPaths),
121121
'xliff_version' =>$xliffVersion,
122+
'default_locale' =>$this->defaultLocale,
122123
];
123124

124125
if (!$domains) {

‎src/Symfony/Component/Translation/Tests/Command/TranslationPullCommandTest.php‎

Lines changed: 78 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,83 @@ public function testPullForceIntlIcuMessages()
348348
,file_get_contents($filenameFr));
349349
}
350350

351-
privatefunctioncreateCommandTester(ProviderInterface$provider,array$locales = ['en'],array$domains = ['messages']):CommandTester
351+
publicfunctiontestPullMessagesWithDefaultLocale()
352+
{
353+
$arrayLoader =newArrayLoader();
354+
$filenameFr =$this->createFile(['note' =>'NOTE'],'fr');
355+
$filenameEn =$this->createFile(['note' =>'NOTE']);
356+
$locales = ['en','fr'];
357+
$domains = ['messages'];
358+
359+
$providerReadTranslatorBag =newTranslatorBag();
360+
$providerReadTranslatorBag->addCatalogue($arrayLoader->load([
361+
'note' =>'NOTE',
362+
'new.foo' =>'nouveauFoo',
363+
],'fr'));
364+
$providerReadTranslatorBag->addCatalogue($arrayLoader->load([
365+
'note' =>'NOTE',
366+
'new.foo' =>'newFoo',
367+
],'en'));
368+
369+
$provider =$this->createMock(ProviderInterface::class);
370+
$provider->expects($this->once())
371+
->method('read')
372+
->with($domains,$locales)
373+
->willReturn($providerReadTranslatorBag);
374+
375+
$provider->expects($this->once())
376+
->method('__toString')
377+
->willReturn('null://default');
378+
379+
$tester =$this->createCommandTester($provider,$locales,$domains,'fr');
380+
$tester->execute(['--locales' => ['en','fr'],'--domains' => ['messages']]);
381+
382+
$this->assertStringContainsString('[OK] New translations from "null" has been written locally (for "en, fr" locale(s), and "messages" domain(s)).',trim($tester->getDisplay()));
383+
$this->assertXmlStringEqualsXmlString(<<<XLIFF
384+
<?xml version="1.0"?>
385+
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
386+
<file source-language="fr" target-language="en" datatype="plaintext" original="file.ext">
387+
<header>
388+
<tool tool-id="symfony" tool-name="Symfony"/>
389+
</header>
390+
<body>
391+
<trans-unit id="994ixRL" resname="new.foo">
392+
<source>new.foo</source>
393+
<target>newFoo</target>
394+
</trans-unit>
395+
<trans-unit id="7bRlYkK" resname="note">
396+
<source>note</source>
397+
<target>NOTE</target>
398+
</trans-unit>
399+
</body>
400+
</file>
401+
</xliff>
402+
XLIFF
403+
,file_get_contents($filenameEn));
404+
$this->assertXmlStringEqualsXmlString(<<<XLIFF
405+
<?xml version="1.0"?>
406+
<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
407+
<file source-language="fr" target-language="fr" datatype="plaintext" original="file.ext">
408+
<header>
409+
<tool tool-id="symfony" tool-name="Symfony"/>
410+
</header>
411+
<body>
412+
<trans-unit id="994ixRL" resname="new.foo">
413+
<source>new.foo</source>
414+
<target>nouveauFoo</target>
415+
</trans-unit>
416+
<trans-unit id="7bRlYkK" resname="note">
417+
<source>note</source>
418+
<target>NOTE</target>
419+
</trans-unit>
420+
</body>
421+
</file>
422+
</xliff>
423+
XLIFF
424+
,file_get_contents($filenameFr));
425+
}
426+
427+
privatefunctioncreateCommandTester(ProviderInterface$provider,array$locales = ['en'],array$domains = ['messages'],$defaultLocale ='en'):CommandTester
352428
{
353429
$writer =newTranslationWriter();
354430
$writer->addDumper('xlf',newXliffFileDumper());
@@ -360,7 +436,7 @@ private function createCommandTester(ProviderInterface $provider, array $locales
360436
$this->getProviderCollection($provider,$locales,$domains),
361437
$writer,
362438
$reader,
363-
'en',
439+
$defaultLocale,
364440
[$this->translationAppDir.'/translations']
365441
);
366442
$application =newApplication();

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp