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] trans, add support of domain in $id message #37769

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

Closed
wants to merge 5 commits into from
Closed

[Translation] trans, add support of domain in $id message #37769

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c1fd48b
fix conflicts
Aug 8, 2020
9d3c70b
[ISSUE_37743] trans, add support of domain in $id message
Aug 8, 2020
037af1c
add tests, restore default behaviour for strings with '@' inside id
Aug 8, 2020
97ad4c1
add tests, restore default behaviour for strings with '@' inside id
Aug 8, 2020
2ba25a9
fix conflicts
Aug 8, 2020
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
32 changes: 32 additions & 0 deletions 32 src/Symfony/Component/Translation/Tests/TranslatorTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,18 @@ public function testTrans($expected, $id, $translation, $parameters, $locale, $d
$this->assertEquals($expected, $translator->trans($id, $parameters, $domain, $locale));
}

/**
* @dataProvider getTransWithDomainTests
*/
public function testTransWithDomainInId($expected, $id, $translationId, $translation, $parameters, $locale, $domain)
{
$translator = new Translator('en');
$translator->addLoader('array', new ArrayLoader());
$translator->addResource('array', [(string) $translationId => $translation], $locale, $domain);

$this->assertEquals($expected, $translator->trans($id, $parameters, null, $locale));
}

/**
* @dataProvider getInvalidLocalesTests
*/
Expand Down Expand Up @@ -438,12 +450,32 @@ public function getTransTests()
{
return [
['Symfony est super !', 'Symfony is great!', 'Symfony est super !', [], 'fr', ''],
['Symfony est super !', 'Symfony is @great!', 'Symfony est super !', [], 'fr', ''],
['Symfony est awesome !', 'Symfony is %what%!', 'Symfony est %what% !', ['%what%' => 'awesome'], 'fr', ''],
['Symfony est super !', new StringClass('Symfony is great!'), 'Symfony est super !', [], 'fr', ''],
['', null, '', [], 'fr', ''],
];
}

public function getTransWithDomainTests()
{
return [
['Symfony est super !', 'Symfony is great!@messages', 'Symfony is great!', 'Symfony est super !', [], 'fr', 'messages'],
['Symfony est super !', 'Symfony is great!@symfony', 'Symfony is great!', 'Symfony est super !', [], 'fr', 'symfony'],
['Symfony est super !', 'Symfony is great!@', 'Symfony is great!', 'Symfony est super !', [], 'fr', ''],
['Symfony est super !', 'Symfony is great!@messages', 'Symfony is great!', 'Symfony est super !', [], 'fr', null],
['Symfony est awesome !', 'Symfony is %what%!@messages', 'Symfony is %what%!', 'Symfony est %what% !', ['%what%' => 'awesome'], 'fr', 'messages'],
['Symfony est awesome !', 'Symfony is %what%!@symfony', 'Symfony is %what%!', 'Symfony est %what% !', ['%what%' => 'awesome'], 'fr', 'symfony'],
['Symfony est awesome !', 'Symfony is %what%!@', 'Symfony is %what%!', 'Symfony est %what% !', ['%what%' => 'awesome'], 'fr', ''],
['Symfony est awesome !', 'Symfony is %what%!@messages', 'Symfony is %what%!', 'Symfony est %what% !', ['%what%' => 'awesome'], 'fr', null],
['Symfony est super !', 'Symfony is great!@messages', new StringClass('Symfony is great!'), 'Symfony est super !', [], 'fr', 'messages'],
['Symfony est super !', 'Symfony is great!@symfony', new StringClass('Symfony is great!'), 'Symfony est super !', [], 'fr', 'symfony'],
['Symfony est super !', 'Symfony is great!@', new StringClass('Symfony is great!'), 'Symfony est super !', [], 'fr', ''],
['Symfony est super !', 'Symfony is great!@messages', new StringClass('Symfony is great!'), 'Symfony est super !', [], 'fr', null],
['', null, null, '', [], 'fr', ''],
];
}

public function getFlattenedTransTests()
{
$messages = [
Expand Down
4 changes: 3 additions & 1 deletion 4 src/Symfony/Component/Translation/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,9 @@ public function trans(?string $id, array $parameters = [], string $domain = null
}

if (null === $domain) {
$domain = 'messages';
$parsed = explode('@', $id);
$id = $parsed[0];
$domain = $parsed[1] ?? 'messages';
}

$catalogue = $this->getCatalogue($locale);
Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.