Merge branch 'MAGETWO-34988' into MAGETWO-26762

vpaladiychuk · vpaladiychuk · commit bd15c940e6d4 · 2015-03-19T11:10:31.000+02:00
diff --git a/lib/internal/Magento/Framework/App/FrontController.php b/lib/internal/Magento/Framework/App/FrontController.php
@@ -86,7 +86,7 @@ public function dispatch(RequestInterface $request)
                     // @todo Message should be clarified
                     $message = $this->appState->getMode() == State::MODE_DEVELOPER
                         ? $e->getMessage()
-                        : (string)__('An error occurred while processing your request');
+                        : (string)new \Magento\Framework\Phrase('An error occurred while processing your request');
                     $result = $this->handleException($e, $actionInstance, $message);
                     break;
                 }

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public function dispatch(RequestInterface $request)`
`86`	`86`	`// @todo Message should be clarified`
`87`	`87`	`$message = $this->appState->getMode() == State::MODE_DEVELOPER`
`88`	`88`	`? $e->getMessage()`
`89`		`- : (string)__('An error occurred while processing your request');`
	`89`	`+ : (string)new \Magento\Framework\Phrase('An error occurred while processing your request');`
`90`	`90`	`$result = $this->handleException($e, $actionInstance, $message);`
`91`	`91`	`break;`
`92`	`92`	`}`