MC-19247: Broken translations with advanced bundling

adifucan · adifucan · commit 309274063bb5 · 2019-09-23T16:54:20.000-05:00
- Remove translation dependency from theme module;
diff --git a/app/code/Magento/Theme/composer.json b/app/code/Magento/Theme/composer.json
@@ -15,7 +15,6 @@
         "magento/module-media-storage": "*",
         "magento/module-require-js": "*",
         "magento/module-store": "*",
-        "magento/module-translation": "*",
         "magento/module-ui": "*",
         "magento/module-widget": "*"
     },
diff --git a/app/code/Magento/Theme/view/frontend/layout/default.xml b/app/code/Magento/Theme/view/frontend/layout/default.xml
@@ -11,7 +11,6 @@
         <block name="require.js" class="Magento\Framework\View\Element\Template" template="Magento_Theme::page/js/require_js.phtml" />
         <referenceContainer name="after.body.start">
             <block class="Magento\RequireJs\Block\Html\Head\Config" name="requirejs-config"/>
-            <block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>
             <block class="Magento\Framework\View\Element\Js\Cookie" name="js_cookies" template="Magento_Theme::js/cookie.phtml"/>
             <block class="Magento\Theme\Block\Html\Notices" name="global_notices" template="Magento_Theme::html/notices.phtml"/>
         </referenceContainer>
diff --git a/app/code/Magento/Translation/ViewModel/Dictionary.php b/app/code/Magento/Translation/ViewModel/Dictionary.php
@@ -68,14 +68,13 @@ public function __construct(
      */
     public function getTranslationDictionary(): string
     {
+        $asset = $this->assetRepo->createAsset(JsConfig::DICTIONARY_FILE_NAME);
         if ($this->appState->getMode() === AppState::MODE_PRODUCTION) {
-            $asset = $this->assetRepo->createAsset(JsConfig::DICTIONARY_FILE_NAME);
             $staticViewFilePath = $this->filesystem->getDirectoryRead(
                 DirectoryList::STATIC_VIEW
             )->getAbsolutePath();
             $content = $this->filesystemDriver->fileGetContents($staticViewFilePath . $asset->getPath());
         } else {
-            $asset = $this->assetRepo->createAsset(JsConfig::DICTIONARY_FILE_NAME);
             $content = $asset->getContent();
         }
 
diff --git a/app/code/Magento/Translation/view/frontend/layout/default.xml b/app/code/Magento/Translation/view/frontend/layout/default.xml
@@ -8,6 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
         <referenceBlock name="head.additional">
+            <block class="Magento\Translation\Block\Html\Head\Config" name="translate-config"/>
             <block name="translation_dictionary" template="Magento_Translation::dictionary.phtml" before="-">
                 <arguments>
                     <argument name="dictionary_view_model" xsi:type="object">Magento\Translation\ViewModel\Dictionary</argument>
