Commitdf73ebf

authored and

committed

[Translation] Concatenated translation messages

1 parentaca3d2c commitdf73ebfCopy full SHA for df73ebf

File tree

+25

-6

lines changed

+25

-6

lines changed

Lines changed: 16 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -156,9 +156,14 @@ private function getValue(\Iterator $tokenIterator)`
`156`	`156`	`{`
`157`	`157`	`$message ='';`
`158`	`158`	`$docToken ='';`
	`159`	`+$docPart ='';`
`159`	`160`
`160`	`161`	`for (;$tokenIterator->valid();$tokenIterator->next()) {`
`161`	`162`	`$t =$tokenIterator->current();`
	`163`	`+if ('.' ===$t) {`
	`164`	`+// Concatenate with next token`
	`165`	`+continue;`
	`166`	`+ }`
`162`	`167`	`if (!isset($t[1])) {`
`163`	`168`	`break;`
`164`	`169`	`}`
`@@ -169,19 +174,24 @@ private function getValue(\Iterator $tokenIterator)`
`169`	`174`	`break;`
`170`	`175`	`caseT_ENCAPSED_AND_WHITESPACE:`
`171`	`176`	`caseT_CONSTANT_ENCAPSED_STRING:`
`172`		`-$message .=$t[1];`
	`177`	`+if ('' ===$docToken) {`
	`178`	`+$message .= PhpStringTokenParser::parse($t[1]);`
	`179`	`+ }else {`
	`180`	`+$docPart =$t[1];`
	`181`	`+ }`
`173`	`182`	`break;`
`174`	`183`	`caseT_END_HEREDOC:`
`175`		`-return PhpStringTokenParser::parseDocString($docToken,$message);`
	`184`	`+$message .= PhpStringTokenParser::parseDocString($docToken,$docPart);`
	`185`	`+$docToken ='';`
	`186`	`+$docPart ='';`
	`187`	`+break;`
	`188`	`+caseT_WHITESPACE:`
	`189`	`+break;`
`176`	`190`	`default:`
`177`	`191`	`break2;`
`178`	`192`	`}`
`179`	`193`	`}`
`180`	`194`
`181`		`-if ($message) {`
`182`		`-$message = PhpStringTokenParser::parse($message);`
`183`		`- }`
`184`		`-`
`185`	`195`	`return$message;`
`186`	`196`	`}`
`187`	`197`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ public function testExtraction($resource)`
`51`	`51`	`$expectedHeredoc =>'prefix'.$expectedHeredoc,`
`52`	`52`	`$expectedNowdoc =>'prefix'.$expectedNowdoc,`
`53`	`53`	`'{0} There is no apples\|{1} There is one apple\|]1,Inf[ There are %count% apples' =>'prefix{0} There is no apples\|{1} There is one apple\|]1,Inf[ There are %count% apples',`
	`54`	`+'concatenated message with heredoc and nowdoc' =>'prefixconcatenated message with heredoc and nowdoc',`
`54`	`55`	`],`
`55`	`56`	`'not_messages' => [`
`56`	`57`	`'other-domain-test-no-params-short-array' =>'prefixother-domain-test-no-params-short-array',`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,14 @@`
`32`	`32`	`['%count%' =>10]`
`33`	`33`	`);?>`
`34`	`34`
	`35`	`+<?phpecho$view['translator']->trans('concatenated'.' message'.<<<EOF`
	`36`	`+ with heredoc`
	`37`	`+EOF`
	`38`	`+.<<<'EOF'`
	`39`	`+ and nowdoc`
	`40`	`+EOF`
	`41`	`+);?>`
	`42`	`+`
`35`	`43`	`<?phpecho$view['translator']->trans('other-domain-test-no-params-short-array', [],'not_messages');?>`
`36`	`44`
`37`	`45`	`<?phpecho$view['translator']->trans('other-domain-test-no-params-long-array', [],'not_messages');?>`

Comments

(0)