Merge remote-tracking branch 'origin/MAGETWO-64519-PR-8217' into develop-prs

Author: Oleksii Korshenko

app/code/Magento/Translation/Model/Js/DataProvider.php

@@ -6,8 +6,12 @@
 
 namespace Magento\Translation\Model\Js;
 
+use Magento\Framework\Exception\LocalizedException;
+
 /**
  * DataProvider for js translation
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DataProvider implements DataProviderInterface
 {
@@ -103,9 +107,15 @@ public function getData($themePath)
             $read = $this->fileReadFactory->create($filePath[0], \Magento\Framework\Filesystem\DriverPool::FILE);
             $content = $read->readAll();
             foreach ($this->getPhrases($content) as $phrase) {
-                $translatedPhrase = $this->translate->render([$phrase], []);
-                if ($phrase != $translatedPhrase) {
-                    $dictionary[$phrase] = $translatedPhrase;
+                try {
+                    $translatedPhrase = $this->translate->render([$phrase], []);
+                    if ($phrase != $translatedPhrase) {
+                        $dictionary[$phrase] = $translatedPhrase;
+                    }
+                } catch (\Exception $e) {
+                    throw new LocalizedException(
+                        sprintf(__('Error while translating phrase "%s" in file %s.'), $phrase, $filePath[0])
+                    );
                 }
             }
         }
@@ -118,7 +128,7 @@ public function getData($themePath)
      *
      * @param string $content
      * @return string[]
-     * @throws \Exception
+     * @throws \Magento\Framework\Exception\LocalizedException
      */
     protected function getPhrases($content)
     {
@@ -134,8 +144,8 @@ protected function getPhrases($content)
                 }
             }
             if (false === $result) {
-                throw new \Exception(
-                    sprintf('Error while generating js translation dictionary: "%s"', error_get_last())
+                throw new LocalizedException(
+                    sprintf(__('Error while generating js translation dictionary: "%s"'), error_get_last())
                 );
             }
         }