diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md index 1bc5d3bdefa3c..ef081372089ce 100644 --- a/src/Symfony/Bridge/Twig/CHANGELOG.md +++ b/src/Symfony/Bridge/Twig/CHANGELOG.md @@ -7,7 +7,7 @@ CHANGELOG * added the `impersonation_exit_url()` and `impersonation_exit_path()` functions. They return a URL that allows to switch back to the original user. * added the `workflow_transition()` function to easily retrieve a specific transition object * added support for translating `TranslatableInterface` objects - * added the `t()` function to easily create `Translatable` objects + * added the `t()` function to easily create `TranslatableMessage` objects * Added support for extracting messages from the `t()` function * Added `field_*` Twig functions to access string values from Form fields diff --git a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php index 66486fa19d307..55241b06651e4 100644 --- a/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php +++ b/src/Symfony/Bridge/Twig/Extension/TranslationExtension.php @@ -15,7 +15,7 @@ use Symfony\Bridge\Twig\NodeVisitor\TranslationNodeVisitor; use Symfony\Bridge\Twig\TokenParser\TransDefaultDomainTokenParser; use Symfony\Bridge\Twig\TokenParser\TransTokenParser; -use Symfony\Component\Translation\Translatable; +use Symfony\Component\Translation\TranslatableMessage; use Symfony\Contracts\Translation\TranslatableInterface; use Symfony\Contracts\Translation\TranslatorInterface; use Symfony\Contracts\Translation\TranslatorTrait; @@ -133,12 +133,12 @@ public function trans($message, $arguments = [], string $domain = null, string $ return $this->getTranslator()->trans($message, $arguments, $domain, $locale); } - public function createTranslatable(string $message, array $parameters = [], string $domain = null): Translatable + public function createTranslatable(string $message, array $parameters = [], string $domain = null): TranslatableMessage { - if (!class_exists(Translatable::class)) { + if (!class_exists(TranslatableMessage::class)) { throw new \LogicException(sprintf('You cannot use the "%s" as the Translation Component is not installed. Try running "composer require symfony/translation".', __CLASS__)); } - return new Translatable($message, $parameters, $domain); + return new TranslatableMessage($message, $parameters, $domain); } } diff --git a/src/Symfony/Component/Translation/CHANGELOG.md b/src/Symfony/Component/Translation/CHANGELOG.md index 1af8a664ad822..b1eb2da062ad5 100644 --- a/src/Symfony/Component/Translation/CHANGELOG.md +++ b/src/Symfony/Component/Translation/CHANGELOG.md @@ -6,9 +6,9 @@ CHANGELOG * added support for calling `trans` with ICU formatted messages * added `PseudoLocalizationTranslator` - * added `Translatable` objects that represent a message that can be translated - * added the `t()` function to easily create `Translatable` objects - * Added support for extracting messages from `Translatable` objects + * added `TranslatableMessage` objects that represent a message that can be translated + * added the `t()` function to easily create `TranslatableMessage` objects + * Added support for extracting messages from `TranslatableMessage` objects 5.1.0 ----- diff --git a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php index 8d2e2f778f8f3..0245711837d99 100644 --- a/src/Symfony/Component/Translation/Extractor/PhpExtractor.php +++ b/src/Symfony/Component/Translation/Extractor/PhpExtractor.php @@ -56,7 +56,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface ], [ 'new', - 'Translatable', + 'TranslatableMessage', '(', self::MESSAGE_TOKEN, ',', @@ -66,7 +66,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface ], [ 'new', - 'Translatable', + 'TranslatableMessage', '(', self::MESSAGE_TOKEN, ], @@ -79,7 +79,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface '\\', 'Translation', '\\', - 'Translatable', + 'TranslatableMessage', '(', self::MESSAGE_TOKEN, ',', @@ -89,7 +89,7 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface ], [ 'new', - '\Symfony\Component\Translation\Translatable', + '\Symfony\Component\Translation\TranslatableMessage', '(', self::MESSAGE_TOKEN, ',', @@ -106,13 +106,13 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface '\\', 'Translation', '\\', - 'Translatable', + 'TranslatableMessage', '(', self::MESSAGE_TOKEN, ], [ 'new', - '\Symfony\Component\Translation\Translatable', + '\Symfony\Component\Translation\TranslatableMessage', '(', self::MESSAGE_TOKEN, ], diff --git a/src/Symfony/Component/Translation/Resources/functions.php b/src/Symfony/Component/Translation/Resources/functions.php index 25da6010b5adf..7ce806b7d1301 100644 --- a/src/Symfony/Component/Translation/Resources/functions.php +++ b/src/Symfony/Component/Translation/Resources/functions.php @@ -14,7 +14,7 @@ /** * @author Nate Wiebe */ -function t(string $message, array $parameters = [], string $domain = null): Translatable +function t(string $message, array $parameters = [], string $domain = null): TranslatableMessage { - return new Translatable($message, $parameters, $domain); + return new TranslatableMessage($message, $parameters, $domain); } diff --git a/src/Symfony/Component/Translation/Tests/TranslatableTest.php b/src/Symfony/Component/Translation/Tests/TranslatableTest.php index 231df66cd51db..015464cf30a29 100644 --- a/src/Symfony/Component/Translation/Tests/TranslatableTest.php +++ b/src/Symfony/Component/Translation/Tests/TranslatableTest.php @@ -13,7 +13,7 @@ use PHPUnit\Framework\TestCase; use Symfony\Component\Translation\Loader\ArrayLoader; -use Symfony\Component\Translation\Translatable; +use Symfony\Component\Translation\TranslatableMessage; use Symfony\Component\Translation\Translator; class TranslatableTest extends TestCase @@ -44,14 +44,14 @@ public function testFlattenedTrans($expected, $messages, $translatable) public function testToString() { - $this->assertSame('Symfony is great!', (string) new Translatable('Symfony is great!')); + $this->assertSame('Symfony is great!', (string) new TranslatableMessage('Symfony is great!')); } public function getTransTests() { return [ - ['Symfony est super !', new Translatable('Symfony is great!', [], ''), 'Symfony est super !', 'fr'], - ['Symfony est awesome !', new Translatable('Symfony is %what%!', ['%what%' => 'awesome'], ''), 'Symfony est %what% !', 'fr'], + ['Symfony est super !', new TranslatableMessage('Symfony is great!', [], ''), 'Symfony est super !', 'fr'], + ['Symfony est awesome !', new TranslatableMessage('Symfony is %what%!', ['%what%' => 'awesome'], ''), 'Symfony est %what% !', 'fr'], ]; } @@ -72,9 +72,9 @@ public function getFlattenedTransTests() ]; return [ - ['Symfony est super!', $messages, new Translatable('symfony.is.great', [], '')], - ['Foo Bar Baz', $messages, new Translatable('foo.bar.baz', [], '')], - ['Foo Baz', $messages, new Translatable('foo.baz', [], '')], + ['Symfony est super!', $messages, new TranslatableMessage('symfony.is.great', [], '')], + ['Foo Bar Baz', $messages, new TranslatableMessage('foo.bar.baz', [], '')], + ['Foo Baz', $messages, new TranslatableMessage('foo.baz', [], '')], ]; } } diff --git a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translatable-fqn.html.php b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translatable-fqn.html.php index d5d43e9d34b11..87a64c42f1eec 100644 --- a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translatable-fqn.html.php +++ b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translatable-fqn.html.php @@ -1,32 +1,32 @@ This template is used for translation message extraction tests - - - + + - - - - - - + - - + - + - 'bar'], 'not_messages'); ?> + 'bar'], 'not_messages'); ?> - 'bar'], 'not_messages'); ?> + 'bar'], 'not_messages'); ?> - (int) '123'], 'not_messages'); ?> + (int) '123'], 'not_messages'); ?> - + diff --git a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translatable.html.php b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translatable.html.php index 15e603190801c..828707e26ed02 100644 --- a/src/Symfony/Component/Translation/Tests/fixtures/extractor/translatable.html.php +++ b/src/Symfony/Component/Translation/Tests/fixtures/extractor/translatable.html.php @@ -1,32 +1,32 @@ This template is used for translation message extraction tests - - - + + - - - - - - + - - + - + - 'bar'], 'not_messages'); ?> + 'bar'], 'not_messages'); ?> - 'bar'], 'not_messages'); ?> + 'bar'], 'not_messages'); ?> - (int) '123'], 'not_messages'); ?> + (int) '123'], 'not_messages'); ?> - + diff --git a/src/Symfony/Component/Translation/Translatable.php b/src/Symfony/Component/Translation/TranslatableMessage.php similarity index 95% rename from src/Symfony/Component/Translation/Translatable.php rename to src/Symfony/Component/Translation/TranslatableMessage.php index eceb4c3423b4c..82ae6d7243885 100644 --- a/src/Symfony/Component/Translation/Translatable.php +++ b/src/Symfony/Component/Translation/TranslatableMessage.php @@ -17,7 +17,7 @@ /** * @author Nate Wiebe */ -class Translatable implements TranslatableInterface +class TranslatableMessage implements TranslatableInterface { private $message; private $parameters;