[FrameworkBundle] fixed custom domain for translations in php templates #21359

robinlehrmann · 2017-01-20T14:20:43Z

Q	A
Branch?	2.7
Bug fix?	yes
New feature?	no
BC breaks?	no
Deprecations?	no
Tests pass?	yes
Fixed tickets	#20135
License	MIT
Doc PR

xabbuh · 2017-01-21T08:05:25Z

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

@@ -37,7 +39,29 @@ class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
     *
     * @var array
     */
-    protected $sequences = array(
+    protected static $sequences = array(


The static change should be reverted.

xabbuh · 2017-01-21T08:08:05Z

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

@@ -153,26 +198,38 @@ protected function parseTokens($tokens, MessageCatalogue $catalog)
        $tokenIterator = new \ArrayIterator($tokens);

        for ($key = 0; $key < $tokenIterator->count(); ++$key) {
-            foreach ($this->sequences as $sequence) {
+            foreach (self::$sequences as $sequence) {


Must then be reverted too.

xabbuh · 2017-01-21T08:09:44Z

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

@@ -105,13 +129,34 @@ private function seekToNextRelevantToken(\Iterator $tokenIterator)
        }
    }

+    private function seekToMessageParamsEnd(\Iterator $tokenIterator)


maybe better name this seekBehindMessageParams

I would now rename this too (something like skipMethodArgument())

xabbuh · 2017-01-21T08:10:30Z

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

@@ -85,7 +109,7 @@ public function setPrefix($prefix)
     */
    protected function normalizeToken($token)
    {
-        if (isset($token[1]) && 'b"' !== $token) {
+        if ('b"' !== $token && isset($token[1])) {


IMO this should be reverted as it is not part of the bug fix.

xabbuh · 2017-01-21T08:11:18Z

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

     */
-    private function getMessage(\Iterator $tokenIterator)
+    private function provideRawString(\Iterator $tokenIterator)


What about getStringValue() instead?

aitboudad · 2017-01-21T11:53:46Z

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

+        for (; $tokenIterator->valid(); $tokenIterator->next()) {
+            $t = $tokenIterator->current();
+
+            if ('[' === $t[0] || '(' === $t[0]) {


you should not take account of braces inside a string

->trans('msg', [ 'p' => '[ \'' ], 'not_messages')

I added this line to my tests too and it passes.

@aitboudad In your example, $t will be an array consisting of three elements where the value at index 0 is T_CONSTANT_ENCAPSED_STRING if I am not mistaken.

aitboudad · 2017-01-21T11:57:26Z

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

+            '(',
+            self::MESSAGE_TOKEN,
+            ',',
+            T_LNUMBER,


it can be an expression or function call

I added a new test with array_map function and the tests passes. Can you explain what you mean please :) ?

<?php echo $view['translator']->transChoice('msg', 10 + 1, [], 'not_messages'); ?> <?php echo $view['translator']->transChoice('msg', intval(4.5), [], 'not_messages'); ?>

Okay, I added this lines and the Tests don't pass. Thank you!
I will fix it asap.

I guess you can use the same approach here that is already used for skipping the message params.

robinlehrmann

I added some tests and it passes.

robinlehrmann · 2017-02-03T14:40:29Z

Hi, @aitboudad @xabbuh
I've fixed the issue and added some tests for it. Could you review my changes please ?

xabbuh · 2017-02-03T14:52:25Z

src/Symfony/Bundle/FrameworkBundle/Translation/PhpExtractor.php

@@ -24,6 +24,8 @@
 class PhpExtractor extends AbstractFileExtractor implements ExtractorInterface
 {
    const MESSAGE_TOKEN = 300;
+    const MESSAGE_ARGUMENTS_TOKEN = 1000;


I would name this METHOD_ARGUMENTS_TOKEN

xabbuh

👍

Status: Reviewed

fabpot · 2017-02-03T16:30:42Z

Thank you @robinlehrmann.

…php templates (robinlehrmann) This PR was merged into the 2.7 branch. Discussion ---------- [FrameworkBundle] fixed custom domain for translations in php templates | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #20135 | License | MIT | Doc PR | Commits ------- 78c0ec5 [FrameworkBundle] fixed custom domain for translations in php templates

carsonbot added Status: Needs Review FrameworkBundle Bug labels Jan 20, 2017

xabbuh added the Translation label Jan 20, 2017

xabbuh mentioned this pull request Jan 20, 2017

PhpExtractor translations always extracts with "messages" domain #20135

Closed

xabbuh requested changes Jan 21, 2017

View reviewed changes

aitboudad suggested changes Jan 21, 2017

View reviewed changes

robinlehrmann commented Jan 21, 2017

View reviewed changes

nicolas-grekas added this to the 2.7 milestone Jan 24, 2017

xabbuh reviewed Feb 3, 2017

View reviewed changes

[FrameworkBundle] fixed custom domain for translations in php templates

78c0ec5

xabbuh approved these changes Feb 3, 2017

View reviewed changes

aitboudad approved these changes Feb 3, 2017

View reviewed changes

xabbuh added Status: Reviewed and removed Status: Needs Review labels Feb 3, 2017

fabpot merged commit 78c0ec5 into symfony:2.7 Feb 3, 2017

This was referenced Feb 6, 2017

Release v2.7.24 #21541

Merged

Release v2.8.17 #21543

Merged

Release v3.2.3 #21544

Merged

robinlehrmann deleted the issue-20135 branch February 6, 2017 20:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FrameworkBundle] fixed custom domain for translations in php templates #21359

[FrameworkBundle] fixed custom domain for translations in php templates #21359

robinlehrmann commented Jan 20, 2017

xabbuh Jan 21, 2017

robinlehrmann Jan 21, 2017

xabbuh Jan 21, 2017

robinlehrmann Jan 21, 2017

xabbuh Jan 21, 2017

robinlehrmann Jan 21, 2017

xabbuh Feb 3, 2017

xabbuh Jan 21, 2017

robinlehrmann Jan 21, 2017

xabbuh Jan 21, 2017

robinlehrmann Jan 21, 2017

aitboudad Jan 21, 2017

robinlehrmann Jan 21, 2017

xabbuh Jan 22, 2017

aitboudad Jan 21, 2017

robinlehrmann Jan 21, 2017

aitboudad Jan 21, 2017

robinlehrmann Jan 21, 2017

xabbuh Jan 22, 2017

robinlehrmann left a comment

robinlehrmann commented Feb 3, 2017

xabbuh Feb 3, 2017

xabbuh left a comment

fabpot commented Feb 3, 2017

[FrameworkBundle] fixed custom domain for translations in php templates #21359

[FrameworkBundle] fixed custom domain for translations in php templates #21359

Conversation

robinlehrmann commented Jan 20, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

robinlehrmann left a comment

Choose a reason for hiding this comment

robinlehrmann commented Feb 3, 2017

Choose a reason for hiding this comment

xabbuh left a comment

Choose a reason for hiding this comment

fabpot commented Feb 3, 2017