Merge remote-tracking branch 'remotes/api/MAGETWO-44053-GITHUB-Bug-i18n-phrases-with-apostrophes-in-Knockout-templates-are-untranslatable-and-my-fix-1951' into API-Bug-Branch

Cari Spruiell · Cari Spruiell · commit c5633264e8e7 · 2015-10-24T14:47:57.000-05:00
diff --git a/app/code/Magento/Translation/Model/Js/DataProvider.php b/app/code/Magento/Translation/Model/Js/DataProvider.php
@@ -129,7 +129,7 @@ protected function getPhrases($content)
             if ($result) {
                 if (isset($matches[2])) {
                     foreach ($matches[2] as $match) {
-                        $phrases[] = $match;
+                        $phrases[] = str_replace('\\\'', '\'', $match);
                     }
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ protected function getPhrases($content)`
`129`	`129`	`if ($result) {`
`130`	`130`	`if (isset($matches[2])) {`
`131`	`131`	`foreach ($matches[2] as $match) {`
`132`		`- $phrases[] = $match;`
	`132`	`+ $phrases[] = str_replace('\\\'', '\'', $match);`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`}`