Concatenate JS translations before translating them

Anton Evers · Anton Evers · commit c79b583422d9 · 2017-08-06T14:36:46.000+06:00
This enables support for $.mage.__("concatenating" + "strings");
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -134,7 +134,8 @@ protected function getPhrases($content)
     {
         $phrases = [];
         foreach ($this->config->getPatterns() as $pattern) {
-            $result = preg_match_all($pattern, $content, $matches);
+            $concatenatedContent = preg_replace('~(["\'])\s*?\+\s*?\1~', '', $content);
+            $result = preg_match_all($pattern, $concatenatedContent, $matches);
 
             if ($result) {
                 if (isset($matches[2])) {

Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,8 @@ protected function getPhrases($content)`
`134`	`134`	`{`
`135`	`135`	`$phrases = [];`
`136`	`136`	`foreach ($this->config->getPatterns() as $pattern) {`
`137`		`- $result = preg_match_all($pattern, $content, $matches);`
	`137`	`+ $concatenatedContent = preg_replace('~(["\'])\s?\+\s?\1~', '', $content);`
	`138`	`+ $result = preg_match_all($pattern, $concatenatedContent, $matches);`
`138`	`139`
`139`	`140`	`if ($result) {`
`140`	`141`	`if (isset($matches[2])) {`