- {{trans "%name," name=$billing.name}}
+ {{trans "%name," name=$order_data.customer_name}}
{{trans "Thank you for your order from %store_name." store_name=$store.frontend_name}}
{{trans 'If you have questions about your order, you can email us at %store_email' store_email=$store_email |raw}}{{depend store_phone}} {{trans 'or call us at %store_phone' store_phone=$store_phone |raw}}{{/depend}}.
diff --git a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
index ed8f592b59638..64e9a61831956 100644
--- a/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
+++ b/app/code/Magento/Sales/view/frontend/email/creditmemo_update_guest.html
@@ -8,7 +8,7 @@
+
+
+
+
+
diff --git a/app/code/Magento/Theme/etc/webapi_soap/di.xml b/app/code/Magento/Theme/etc/webapi_soap/di.xml
new file mode 100644
index 0000000000000..8abda8502238d
--- /dev/null
+++ b/app/code/Magento/Theme/etc/webapi_soap/di.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml
index 14002028d9da4..13917561629bc 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/NewsletterWYSIWYGSection.xml
@@ -8,6 +8,6 @@
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/ProductWYSIWYGSection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/ProductWYSIWYGSection.xml
index 9ce4e067169ec..bc666d3590a8f 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/ProductWYSIWYGSection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/ProductWYSIWYGSection.xml
@@ -7,7 +7,7 @@
-->
-
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
index cb46bed781e5a..38b2d907ecf44 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Section/AdminTinymce3FileldsSection/TinyMCESection.xml
@@ -8,7 +8,7 @@
diff --git a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
index 9c4e7bf3a646a..01b2101d3346c 100644
--- a/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
+++ b/app/code/Magento/Tinymce3/Test/Mftf/Test/AdminSwitchWYSIWYGOptionsTest.xml
@@ -8,7 +8,7 @@
-
+
@@ -17,6 +17,9 @@
+
+ TinyMCE3 is no longer supported
+
@@ -63,8 +66,8 @@
-
-
+
+
diff --git a/app/code/Magento/Tinymce3/etc/adminhtml/di.xml b/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
index 53ab66c7ef21f..bcccf44594103 100644
--- a/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
+++ b/app/code/Magento/Tinymce3/etc/adminhtml/di.xml
@@ -39,14 +39,4 @@
-
-
-
- -
-
- Magento\Tinymce3\Model\Config\Source\Wysiwyg\Editor::WYSIWYG_EDITOR_CONFIG_VALUE
- - TinyMCE 3 (deprecated)
-
-
-
-
diff --git a/app/code/Magento/Tinymce3/etc/di.xml b/app/code/Magento/Tinymce3/etc/di.xml
index e03d865ce4e01..0b1175b0cd94c 100644
--- a/app/code/Magento/Tinymce3/etc/di.xml
+++ b/app/code/Magento/Tinymce3/etc/di.xml
@@ -6,11 +6,4 @@
*/
-->
-
-
-
-
-
-
-
diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
index e193e675885c2..fa3d6905f5868 100644
--- a/app/code/Magento/Translation/Block/Js.php
+++ b/app/code/Magento/Translation/Block/Js.php
@@ -14,6 +14,10 @@
*
* @api
* @since 100.0.2
+ * @deprecated logic was refactored in order to not use localstorage at all.
+ *
+ * You can see details in app/code/Magento/Translation/view/base/web/js/mage-translation-dictionary.js
+ * These block and view file were left in order to keep backward compatibility
*/
class Js extends Template
{
diff --git a/app/code/Magento/Translation/view/base/requirejs-config.js b/app/code/Magento/Translation/view/base/requirejs-config.js
new file mode 100644
index 0000000000000..682c3fca81117
--- /dev/null
+++ b/app/code/Magento/Translation/view/base/requirejs-config.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+ map: {
+ '*': {
+ mageTranslationDictionary: 'Magento_Translation/js/mage-translation-dictionary'
+ }
+ },
+ deps: [
+ 'mageTranslationDictionary'
+ ]
+};
diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
index bd74db151387d..98997398c0938 100644
--- a/app/code/Magento/Translation/view/base/templates/translate.phtml
+++ b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -7,61 +7,8 @@
/**
* @var \Magento\Translation\Block\Js $block
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @deprecated logic was refactored in order to not use localstorage at all.
+ *
+ * You can see details in app/code/Magento/Translation/view/base/web/js/mage-translation-dictionary.js
+ * These block and view file were left in order to keep backward compatibility
*/
-?>
-
-dictionaryEnabled()) {
- $version = $block->getTranslationFileVersion();
- $escapedVersion = $block->escapeJs($version);
- $dictionaryFileName = /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME;
-
- $scriptString = << |