MAGETWO-69515: Static files are deployed too slow for multiple locales

Author: Karpenko, Oleksandr

app/code/Magento/Deploy/Service/DeployRequireJsConfig.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Deploy\Service;
 
+use Magento\Framework\Locale\ResolverInterfaceFactory;
+use Magento\Framework\Locale\ResolverInterface;
 use Magento\RequireJs\Model\FileManagerFactory;
 use Magento\Framework\View\DesignInterfaceFactory;
 use Magento\Framework\View\Design\Theme\ListInterface;
@@ -46,6 +48,11 @@ class DeployRequireJsConfig
      */
     private $requireJsConfigFactory;
 
+    /**
+     * @var ResolverInterfaceFactory
+     */
+    private $localeFactory;
+
     /**
      * DeployRequireJsConfig constructor
      *
@@ -54,31 +61,40 @@ class DeployRequireJsConfig
      * @param RepositoryFactory $assetRepoFactory
      * @param FileManagerFactory $fileManagerFactory
      * @param ConfigFactory $requireJsConfigFactory
+     * @param ResolverInterfaceFactory $localeFactory
      */
     public function __construct(
         ListInterface $themeList,
         DesignInterfaceFactory $designFactory,
         RepositoryFactory $assetRepoFactory,
         FileManagerFactory $fileManagerFactory,
-        ConfigFactory $requireJsConfigFactory
+        ConfigFactory $requireJsConfigFactory,
+        ResolverInterfaceFactory $localeFactory
     ) {
         $this->themeList = $themeList;
         $this->designFactory = $designFactory;
         $this->assetRepoFactory = $assetRepoFactory;
         $this->fileManagerFactory = $fileManagerFactory;
         $this->requireJsConfigFactory = $requireJsConfigFactory;
+        $this->localeFactory = $localeFactory;
     }
 
     /**
      * @param string $areaCode
      * @param string $themePath
+     * @param string $localeCode
      * @return bool true on success
      */
-    public function deploy($areaCode, $themePath)
+    public function deploy($areaCode, $themePath, $localeCode)
     {
         /** @var \Magento\Framework\View\Design\ThemeInterface $theme */
         $theme = $this->themeList->getThemeByFullPath($areaCode . '/' . $themePath);
+        /** @var \Magento\Theme\Model\View\Design $design */
         $design = $this->designFactory->create()->setDesignTheme($theme, $areaCode);
+        /** @var ResolverInterface $locale */
+        $locale = $this->localeFactory->create();
+        $locale->setLocale($localeCode);
+        $design->setLocale($locale);
 
         $assetRepo = $this->assetRepoFactory->create(['design' => $design]);
         /** @var \Magento\RequireJs\Model\FileManager $fileManager */

app/code/Magento/Deploy/Service/DeployStaticContent.php

@@ -115,7 +115,7 @@ public function deploy(array $options)
             ]);
             foreach ($packages as $package) {
                 if (!$package->isVirtual()) {
-                    $deployRjsConfig->deploy($package->getArea(), $package->getTheme());
+                    $deployRjsConfig->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
                     $deployI18n->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
                     $deployBundle->deploy($package->getArea(), $package->getTheme(), $package->getLocale());
                 }

app/code/Magento/Theme/Model/View/Design.php

@@ -256,6 +256,16 @@ public function getLocale()
         return $this->_locale->getLocale();
     }
 
+    /**
+     * @param \Magento\Framework\Locale\ResolverInterface $locale
+     * @return $this
+     */
+    public function setLocale(\Magento\Framework\Locale\ResolverInterface $locale)
+    {
+        $this->_locale = $locale;
+        return $this;
+    }
+
     /**
      * {@inheritdoc}
      */