MAGETWO-47439: [Github] i18n:collect-phrases -m can't find many important magento phrases #2630

Hayder Sharhan · Hayder Sharhan · commit 81d6668a4eca · 2016-01-27T18:18:24.000-06:00
- Revised regex.
diff --git a/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expectedPhrases.csv b/dev/tests/integration/testsuite/Magento/Setup/Console/Command/_files/expectedPhrases.csv
@@ -11,9 +11,9 @@
 "first part of concat second part third part with two placeholders %1, %2","first part of concat second part third part with two placeholders %1, %2"
 "string with escaped \'single quotes\'","string with escaped \'single quotes\'"
 "string with placeholder in escaped single quotes \'%1\'","string with placeholder in escaped single quotes \'%1\'"
-"string with \"double quotes\"","string with \"double quotes\""
-"string with placeholder in double quotes \"%1\"","string with placeholder in double quotes \"%1\""
-"string with \'single quotes\'","string with \'single quotes\'"
-"string with placeholder in single quotes \'%1\'","string with placeholder in single quotes \'%1\'"
+"string with ""double quotes""","string with ""double quotes"""
+"string with placeholder in double quotes ""%1""","string with placeholder in double quotes ""%1"""
+"string with 'single quotes'","string with 'single quotes'"
+"string with placeholder in single quotes '%1'","string with placeholder in single quotes '%1'"
 "string with escaped \"double quotes\"","string with escaped \"double quotes\""
 "string with placeholder in escaped double quotes \"%1\"","string with placeholder in escaped double quotes \"%1\""
diff --git a/setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php b/setup/src/Magento/Setup/Module/I18n/Dictionary/Phrase.php
@@ -270,7 +270,7 @@ private function getCompiledString($string)
     {
         $encloseQuote = $this->getQuote() == Phrase::QUOTE_DOUBLE ? Phrase::QUOTE_DOUBLE : Phrase::QUOTE_SINGLE;
         //find all occurrences of ' and ", with no \ before it.
-        preg_match_all('/[^\\\\][\'"]|[\'\"][^\\\\]/', $string, $matches);
+        preg_match_all('/[^\\\\]' . $encloseQuote . '|' . $encloseQuote . '[^\\\\]/', $string, $matches);
         if (count($matches[0])) {
             $string = preg_replace('/([^\\\\])' . $encloseQuote . ' ?\. ?' . $encloseQuote . '/', '$1', $string);
             $string = addslashes($string);

Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ private function getCompiledString($string)`
`270`	`270`	`{`
`271`	`271`	`$encloseQuote = $this->getQuote() == Phrase::QUOTE_DOUBLE ? Phrase::QUOTE_DOUBLE : Phrase::QUOTE_SINGLE;`
`272`	`272`	`//find all occurrences of ' and ", with no \ before it.`
`273`		`- preg_match_all('/[^\\\\][\'"]\|[\'\"][^\\\\]/', $string, $matches);`
	`273`	`+ preg_match_all('/[^\\\\]' . $encloseQuote . '\|' . $encloseQuote . '[^\\\\]/', $string, $matches);`
`274`	`274`	`if (count($matches[0])) {`
`275`	`275`	`$string = preg_replace('/([^\\\\])' . $encloseQuote . ' ?\. ?' . $encloseQuote . '/', '$1', $string);`
`276`	`276`	`$string = addslashes($string);`