ENGCOM-4073: Reverting javascript translation refactoring which broke…

… javascript translation #20109
magento · Feb 7, 2019 · d8a56c4 · d8a56c4
2 parents 8997e69 + 493ecc6
commit d8a56c4
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 61 deletions.
diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
@@ -8,7 +8,6 @@
 
 use Magento\Framework\View\Element\Template;
 use Magento\Translation\Model\Js\Config;
-use Magento\Framework\Escaper;
 
 /**
  * @api

diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -9,19 +9,50 @@
 /** @var \Magento\Translation\Block\Js $block */
 ?>
 <?php if ($block->dictionaryEnabled()): ?>
+    <script>
+        require.config({
+            deps: [
+                'jquery',
+                'mage/translate',
+                'jquery/jquery-storageapi'
+            ],
+            callback: function ($) {
+                'use strict';
+
+                var dependencies = [],
+                    versionObj;
+
+                $.initNamespaceStorage('mage-translation-storage');
+                $.initNamespaceStorage('mage-translation-file-version');
+                versionObj = $.localStorage.get('mage-translation-file-version');
+
+                <?php $version = $block->getTranslationFileVersion(); ?>
+
+                if (versionObj.version !== '<?= /* @escapeNotVerified */ $block->escapeJsQuote($version) ?>') {
+                    dependencies.push(
+                        'text!<?= /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME ?>'
+                    );
 
-<?php
-  $version = $block->getTranslationFileVersion();
-  $fileName = Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME;
-?>
-    <script type="text/x-magento-init">
-        {
-            "*": {
-                "mage/translate-init": {
-                    "dictionaryFile": "text!<?= $block->escapeJs($fileName); ?>",
-                    "version": "<?= $block->escapeJs($version) ?>"
                 }
+
+                require.config({
+                    deps: dependencies,
+                    callback: function (string) {
+                        if (typeof string === 'string') {
+                            $.mage.translate.add(JSON.parse(string));
+                            $.localStorage.set('mage-translation-storage', string);
+                            $.localStorage.set(
+                                'mage-translation-file-version',
+                                {
+                                    version: '<?= /* @escapeNotVerified */ $block->escapeJsQuote($version) ?>'
+                                }
+                            );
+                        } else {
+                            $.mage.translate.add($.localStorage.get('mage-translation-storage'));
+                        }
+                    }
+                });
             }
-        }
+        });
     </script>
 <?php endif; ?>
diff --git a/lib/web/mage/translate-init.js b/lib/web/mage/translate-init.js