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

[Translation] Fix locales format in CrowdinProvider #45840

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
Mar 26, 2022
Merged

[Translation] Fix locales format in CrowdinProvider #45840

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
4 changes: 2 additions & 2 deletions 4 src/Symfony/Component/Translation/Bridge/Crowdin/CrowdinProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ private function uploadTranslations(int $fileId, string $domain, string $content
* @see https://support.crowdin.com/api/v2/#operation/api.projects.translations.postOnLanguage (Crowdin API)
* @see https://support.crowdin.com/enterprise/api/#operation/api.projects.translations.postOnLanguage (Crowdin Enterprise API)
*/
return $this->client->request('POST', 'translations/'.$locale, [
return $this->client->request('POST', 'translations/'.str_replace('_', '-', $locale), [
'json' => [
'storageId' => $storageId,
'fileId' => $fileId,
Expand All @@ -294,7 +294,7 @@ private function exportProjectTranslations(string $languageId, int $fileId): Res
*/
return $this->client->request('POST', 'translations/exports', [
'json' => [
'targetLanguageId' => $languageId,
'targetLanguageId' => str_replace('_', '-', $languageId),
'fileIds' => [$fileId],
],
]);
Expand Down
132 changes: 99 additions & 33 deletions 132 src/Symfony/Component/Translation/Bridge/Crowdin/Tests/CrowdinProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,10 @@ public function testCompleteWriteProcessUpdateFiles()
$provider->write($translatorBag);
}

public function testCompleteWriteProcessAddFileAndUploadTranslations()
/**
* @dataProvider getResponsesForProcessAddFileAndUploadTranslations
*/
public function testCompleteWriteProcessAddFileAndUploadTranslations(TranslatorBag $translatorBag, string $expectedLocale, string $expectedMessagesTranslationsContent)
{
$this->xliffFileDumper = new XliffFileDumper();

Expand All @@ -237,24 +240,6 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations()
</file>
</xliff>

XLIFF;

$expectedMessagesTranslationsContent = <<<'XLIFF'
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="fr" datatype="plaintext" original="file.ext">
<header>
<tool tool-id="symfony" tool-name="Symfony"/>
</header>
<body>
<trans-unit id="ypeBEso" resname="a">
<source>a</source>
<target>trans_fr_a</target>
</trans-unit>
</body>
</file>
</xliff>

XLIFF;

$responses = [
Expand Down Expand Up @@ -296,23 +281,15 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations()

return new MockResponse(json_encode(['data' => ['id' => 19]]), ['http_code' => 201]);
},
'UploadTranslations' => function (string $method, string $url, array $options = []): ResponseInterface {
'UploadTranslations' => function (string $method, string $url, array $options = []) use ($expectedLocale): ResponseInterface {
$this->assertSame('POST', $method);
$this->assertSame('https://api.crowdin.com/api/v2/projects/1/translations/fr', $url);
$this->assertSame(sprintf('https://api.crowdin.com/api/v2/projects/1/translations/%s', $expectedLocale), $url);
$this->assertSame('{"storageId":19,"fileId":12}', $options['body']);

return new MockResponse();
},
];

$translatorBag = new TranslatorBag();
$translatorBag->addCatalogue(new MessageCatalogue('en', [
'messages' => ['a' => 'trans_en_a'],
]));
$translatorBag->addCatalogue(new MessageCatalogue('fr', [
'messages' => ['a' => 'trans_fr_a'],
]));

$provider = $this->createProvider((new MockHttpClient($responses))->withOptions([
'base_uri' => 'https://api.crowdin.com/api/v2/projects/1/',
'auth_bearer' => 'API_TOKEN',
Expand All @@ -321,10 +298,69 @@ public function testCompleteWriteProcessAddFileAndUploadTranslations()
$provider->write($translatorBag);
}

public function getResponsesForProcessAddFileAndUploadTranslations(): \Generator
{
$arrayLoader = new ArrayLoader();

$translatorBagFr = new TranslatorBag();
$translatorBagFr->addCatalogue($arrayLoader->load([
'a' => 'trans_en_a',
], 'en'));
$translatorBagFr->addCatalogue($arrayLoader->load([
'a' => 'trans_fr_a',
], 'fr'));

yield [$translatorBagFr, 'fr', <<<'XLIFF'
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="fr" datatype="plaintext" original="file.ext">
<header>
<tool tool-id="symfony" tool-name="Symfony"/>
</header>
<body>
<trans-unit id="ypeBEso" resname="a">
<source>a</source>
<target>trans_fr_a</target>
</trans-unit>
</body>
</file>
</xliff>

XLIFF
];

$translatorBagEnGb = new TranslatorBag();
$translatorBagEnGb->addCatalogue($arrayLoader->load([
'a' => 'trans_en_a',
], 'en'));
$translatorBagEnGb->addCatalogue($arrayLoader->load([
'a' => 'trans_en_gb_a',
], 'en_GB'));

yield [$translatorBagEnGb, 'en-GB', <<<'XLIFF'
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="en-GB" datatype="plaintext" original="file.ext">
<header>
<tool tool-id="symfony" tool-name="Symfony"/>
</header>
<body>
<trans-unit id="ypeBEso" resname="a">
<source>a</source>
<target>trans_en_gb_a</target>
</trans-unit>
</body>
</file>
</xliff>

XLIFF
];
}

/**
* @dataProvider getResponsesForOneLocaleAndOneDomain
*/
public function testReadForOneLocaleAndOneDomain(string $locale, string $domain, string $responseContent, TranslatorBag $expectedTranslatorBag)
public function testReadForOneLocaleAndOneDomain(string $locale, string $domain, string $responseContent, TranslatorBag $expectedTranslatorBag, string $expectedTargetLanguageId)
{
$responses = [
'listFiles' => function (string $method, string $url): ResponseInterface {
Expand All @@ -340,10 +376,10 @@ public function testReadForOneLocaleAndOneDomain(string $locale, string $domain,
],
]));
},
'exportProjectTranslations' => function (string $method, string $url, array $options = []): ResponseInterface {
'exportProjectTranslations' => function (string $method, string $url, array $options = []) use ($expectedTargetLanguageId): ResponseInterface {
$this->assertSame('POST', $method);
$this->assertSame('https://api.crowdin.com/api/v2/projects/1/translations/exports', $url);
$this->assertSame('{"targetLanguageId":"fr","fileIds":[12]}', $options['body']);
$this->assertSame(sprintf('{"targetLanguageId":"%s","fileIds":[12]}', $expectedTargetLanguageId), $options['body']);

return new MockResponse(json_encode(['data' => ['url' => 'https://file.url']]));
},
Expand Down Expand Up @@ -401,7 +437,37 @@ public function getResponsesForOneLocaleAndOneDomain(): \Generator
</xliff>
XLIFF
,
$expectedTranslatorBagFr,
$expectedTranslatorBagFr, 'fr',
];

$expectedTranslatorBagEnUs = new TranslatorBag();
$expectedTranslatorBagEnUs->addCatalogue($arrayLoader->load([
'index.hello' => 'Hello',
'index.greetings' => 'Welcome, {firstname}!',
], 'en_GB'));

yield ['en_GB', 'messages', <<<'XLIFF'
<?xml version="1.0" encoding="UTF-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" version="1.2">
<file source-language="en" target-language="en_GB" datatype="database" tool-id="crowdin">
<header>
<tool tool-id="crowdin" tool-name="Crowdin" tool-version="1.0.25 20201211-1" tool-company="Crowdin"/>
</header>
<body>
<trans-unit id="crowdin:5fd89b853ee27904dd6c5f67" resname="index.hello" datatype="plaintext">
<source>index.hello</source>
<target state="translated">Hello</target>
</trans-unit>
<trans-unit id="crowdin:5fd89b8542e5aa5cc27457e2" resname="index.greetings" datatype="plaintext" extradata="crowdin:format=icu">
<source>index.greetings</source>
<target state="translated">Welcome, {firstname}!</target>
</trans-unit>
</body>
</file>
</xliff>
XLIFF
,
$expectedTranslatorBagEnUs, 'en-GB',
];
}

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.