MAGETWO-30169: Gather all phrases and compile a file

Author: sivaschenko

app/code/Magento/Translation/Block/Js.php

@@ -6,61 +6,30 @@
 
 namespace Magento\Translation\Block;
 
-use Magento\Framework\Translate\InlineInterface as InlineTranslator;
-use Magento\Translation\Model\Js as DataProvider;
 use Magento\Framework\View\Element\Template;
 use Magento\Translation\Model\Js\Config;
 
-class Js extends \Magento\Framework\View\Element\Template
+class Js extends Template
 {
-    /**
-     * Data provider model
-     *
-     * @var DataProvider
-     */
-    protected $dataProvider;
-
-    /**
-     * Inline translator
-     *
-     * @var InlineTranslator
-     */
-    protected $translateInline;
-
     /**
      * @var Config
      */
     protected $config;
 
     /**
      * @param Template\Context $context
-     * @param DataProvider $dataProvider
-     * @param InlineTranslator $translateInline
+     * @param Config $config
      * @param array $data
      */
     public function __construct(
         Template\Context $context,
-        DataProvider $dataProvider,
-        InlineTranslator $translateInline,
         Config $config,
         array $data = []
     ) {
         parent::__construct($context, $data);
-        $this->dataProvider = $dataProvider;
-        $this->translateInline = $translateInline;
         $this->config = $config;
     }
 
-    /**
-     * @return string
-     */
-    public function getTranslatedJson()
-    {
-        $data = $this->dataProvider->getTranslateData();
-        $this->translateInline->processResponseBody($data);
-        return \Zend_Json::encode($data);
-    }
-
     /**
      * Is js translation set to dictionary mode
      *

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

@@ -42,11 +42,11 @@ public function __construct(State $appState, Config $config)
     /**
      * Get translation data
      */
-    public function getData()
+    public function getData($themePath)
     {
         $dictionary = [];
 
-        $files = $this->filesUtility->getJsFilesForArea($this->appState->getAreaCode());
+        $files = $this->filesUtility->getJsFiles($this->appState->getAreaCode(), $themePath);
         foreach ($files as $filePath) {
             foreach ($this->getPhrases(file_get_contents($filePath)) as $phrase) {
                 $translatedPhrase = (string) __($phrase);

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

@@ -13,5 +13,5 @@ interface DataProviderInterface
      *
      * @return string[]
      */
-    public function getData();
+    public function getData($themePath);
 }

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

@@ -9,6 +9,7 @@
 use Magento\Translation\Model\Js\Config;
 use Magento\Translation\Model\Js\DataProviderInterface;
 use Magento\Framework\View\Asset\PreProcessor\Chain;
+use Magento\Framework\View\Asset\File\FallbackContext;
 
 /**
  * PreProcessor responsible for providing js translation dictionary
@@ -46,7 +47,9 @@ public function __construct(
     public function process(Chain $chain)
     {
         if ($this->isDictionaryPath($chain->getTargetAssetPath())) {
-            $chain->setContent(json_encode($this->dataProvider->getData()));
+            $context = $chain->getAsset()->getContext();
+            $themePath = ($context instanceof FallbackContext) ? $context->getThemePath() : '*/*';
+            $chain->setContent(json_encode($this->dataProvider->getData($themePath)));
             $chain->setContentType('json');
         }
     }

app/code/Magento/Translation/Model/Json/PreProcessor.php

@@ -16,7 +16,7 @@
                 </invalid_caches>
             </translate_inline>
             <js>
-                <translate_strategy>publishing</translate_strategy>
+                <translate_strategy>embedded</translate_strategy>
             </js>
         </dev>
     </default>

app/code/Magento/Translation/etc/config.xml

@@ -459,18 +459,18 @@ public function getPageTypeFiles($incomingParams = [], $asDataSet = true)
     /**
      * Returns list of Javascript files in Magento
      *
+     * @param string $area
+     * @param string $themePath
+     * @param string $namespace
+     * @param string $module
      * @return array
      */
-    public function getJsFiles()
+    public function getJsFiles($area = '*', $themePath = '*/*', $namespace = '*', $module = '*')
     {
-        $key = __METHOD__ . $this->_path;
+        $key = $area . $themePath . $namespace . $module . __METHOD__ . $this->_path;
         if (isset(self::$_cache[$key])) {
             return self::$_cache[$key];
         }
-        $namespace = '*';
-        $module = '*';
-        $area = '*';
-        $themePath = '*/*';
         $files = self::getFiles(
             [
                 "{$this->_path}/app/code/{$namespace}/{$module}/view/{$area}/web",

lib/internal/Magento/Framework/Test/Utility/Files.php

@@ -152,12 +152,12 @@ public function createAsset($fileId, array $params = [])
             $module = $params['module'];
         }
         $isSecure = isset($params['_secure']) ? (bool) $params['_secure'] : null;
-        $themePath = $this->design->getThemePath($params['themeModel']);
+        $themePath = isset($params['theme']) ? $params['theme'] : $this->design->getThemePath($params['themeModel']);
         $context = $this->getFallbackContext(
             UrlInterface::URL_TYPE_STATIC,
             $isSecure,
             $params['area'],
-            $themePath,
+            $themePath ,
             $params['locale']
         );
         return new File(