From cca8f2aa12f6a5a756488ecef4bdb5384acbe6a7 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 17 Sep 2019 18:23:35 +0300
Subject: [PATCH] [Embedded] Fix loading translations

---
 apps/documenteditor/embed/index.html            | 9 ++++++++-
 apps/documenteditor/embed/index.html.deploy     | 8 +++++++-
 apps/documenteditor/embed/js/application.js     | 7 ++++---
 apps/presentationeditor/embed/index.html        | 9 ++++++++-
 apps/presentationeditor/embed/index.html.deploy | 9 +++++++--
 apps/presentationeditor/embed/js/application.js | 8 ++++----
 apps/spreadsheeteditor/embed/index.html         | 9 ++++++++-
 apps/spreadsheeteditor/embed/index.html.deploy  | 9 +++++++--
 apps/spreadsheeteditor/embed/js/application.js  | 7 ++++---
 9 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/apps/documenteditor/embed/index.html b/apps/documenteditor/embed/index.html
index 4042fb812..7b276bdb1 100644
--- a/apps/documenteditor/embed/index.html
+++ b/apps/documenteditor/embed/index.html
@@ -190,7 +190,7 @@
 
       <!-- debug begin -->
       <script type="text/javascript">var less=less||{};less.env='development';</script>
-      <script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>
+      <script src="../../../vendor/less/dist/less-2.7.1.js" type="text/javascript"></script>
       <!-- debug end -->
 
        <script>
@@ -334,6 +334,13 @@
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
 
+      <script src="../../../vendor/requirejs/require.js"></script>
+      <script>
+          require.config({
+              baseUrl: '../../'
+          });
+      </script>
+
       <script type="text/javascript" src="../sdk_dev_scripts.js"></script>
       <script>
           window.sdk_dev_scrpipts.forEach(function(item){
diff --git a/apps/documenteditor/embed/index.html.deploy b/apps/documenteditor/embed/index.html.deploy
index bac45e2be..f66c00573 100644
--- a/apps/documenteditor/embed/index.html.deploy
+++ b/apps/documenteditor/embed/index.html.deploy
@@ -320,10 +320,16 @@
 
       <!--vendor-->
       <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
+      <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
       <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
+      <script src="../../../vendor/requirejs/require.js"></script>
+      <script>
+          require.config({
+              baseUrl: '../../'
+          });
+      </script>
 
       <!--sdk-->
       <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
diff --git a/apps/documenteditor/embed/js/application.js b/apps/documenteditor/embed/js/application.js
index 9045fe155..63d642fb2 100644
--- a/apps/documenteditor/embed/js/application.js
+++ b/apps/documenteditor/embed/js/application.js
@@ -31,7 +31,8 @@
  *
 */
 +function ($) {
-    Common.Locale.apply();
-    DE.ApplicationView.create();
-    DE.ApplicationController.create();
+    Common.Locale.apply(function() {
+        DE.ApplicationView.create();
+        DE.ApplicationController.create();
+    });
 }();
diff --git a/apps/presentationeditor/embed/index.html b/apps/presentationeditor/embed/index.html
index e82a7d950..53212081e 100644
--- a/apps/presentationeditor/embed/index.html
+++ b/apps/presentationeditor/embed/index.html
@@ -189,7 +189,7 @@
 
       <!-- debug begin -->
       <script type="text/javascript">var less=less||{};less.env='development';</script>
-      <script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>
+      <script src="../../../vendor/less/dist/less-2.7.1.js" type="text/javascript"></script>
       <!-- debug end -->
 
       <script>
@@ -336,6 +336,13 @@
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
 
+      <script src="../../../vendor/requirejs/require.js"></script>
+      <script>
+          require.config({
+              baseUrl: '../../'
+          });
+      </script>
+
       <script type="text/javascript" src="../sdk_dev_scripts.js"></script>
       <script>
           window.sdk_dev_scrpipts.forEach(function(item){
diff --git a/apps/presentationeditor/embed/index.html.deploy b/apps/presentationeditor/embed/index.html.deploy
index d0dd00e6c..519b44e18 100644
--- a/apps/presentationeditor/embed/index.html.deploy
+++ b/apps/presentationeditor/embed/index.html.deploy
@@ -324,11 +324,16 @@
 
       <!--vendor-->
       <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
+      <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
       <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
-
+      <script src="../../../vendor/requirejs/require.js"></script>
+      <script>
+          require.config({
+              baseUrl: '../../'
+          });
+      </script>
       <!--sdk-->
       <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
       <script type="text/javascript" src="../../../../sdkjs/slide/sdk-all-min.js"></script>
diff --git a/apps/presentationeditor/embed/js/application.js b/apps/presentationeditor/embed/js/application.js
index 73a13c863..bbff1ddfe 100644
--- a/apps/presentationeditor/embed/js/application.js
+++ b/apps/presentationeditor/embed/js/application.js
@@ -31,8 +31,8 @@
  *
 */
 (function ($) {
-    Common.Locale.apply();
-    PE.ApplicationView.create();
-    PE.ApplicationController.create();
-
+    Common.Locale.apply(function() {
+        PE.ApplicationView.create();
+        PE.ApplicationController.create();
+    });
 })(window.jQuery);
diff --git a/apps/spreadsheeteditor/embed/index.html b/apps/spreadsheeteditor/embed/index.html
index 746b49971..4cf8f08ef 100644
--- a/apps/spreadsheeteditor/embed/index.html
+++ b/apps/spreadsheeteditor/embed/index.html
@@ -190,7 +190,7 @@
 
       <!-- debug begin -->
       <script type="text/javascript">var less=less||{};less.env='development';</script>
-      <script src="../../../vendor/less/dist/less-1.5.1.js" type="text/javascript"></script>
+      <script src="../../../vendor/less/dist/less-2.7.1.js" type="text/javascript"></script>
       <!-- debug end -->
 
       <script>
@@ -337,6 +337,13 @@
       <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
       <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
 
+      <script src="../../../vendor/requirejs/require.js"></script>
+      <script>
+          require.config({
+              baseUrl: '../../'
+          });
+      </script>
+
       <script type="text/javascript" src="../sdk_dev_scripts.js"></script>
       <script>
           window.sdk_dev_scrpipts.forEach(function(item){
diff --git a/apps/spreadsheeteditor/embed/index.html.deploy b/apps/spreadsheeteditor/embed/index.html.deploy
index 0ff36eae5..536173a9e 100644
--- a/apps/spreadsheeteditor/embed/index.html.deploy
+++ b/apps/spreadsheeteditor/embed/index.html.deploy
@@ -321,14 +321,19 @@
 
       <!--vendor-->
       <script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
-      <script type="text/javascript" src="../../../vendor/jquery/jquery.browser.min.js"></script>
+      <script type="text/javascript" src="../../../vendor/jquery.browser/dist/jquery.browser.min.js"></script>
       <script type="text/javascript" src="../../../vendor/bootstrap/dist/js/bootstrap.min.js"></script>
       <script type="text/javascript" src="../../../vendor/sockjs/sockjs.min.js"></script>
       <script type="text/javascript" src="../../../vendor/underscore/underscore-min.js"></script>
       <script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>
       <script type="text/javascript" src="../../../vendor/jszip/jszip.min.js"></script>
       <script type="text/javascript" src="../../../vendor/jszip-utils/jszip-utils.min.js"></script>
-
+      <script src="../../../vendor/requirejs/require.js"></script>
+      <script>
+          require.config({
+              baseUrl: '../../'
+          });
+      </script>
       <!--sdk-->
       <link rel="stylesheet" type="text/css" href="../../../../sdkjs/cell/css/main.css"/>
       <script type="text/javascript" src="../../../../sdkjs/common/AllFonts.js"></script>
diff --git a/apps/spreadsheeteditor/embed/js/application.js b/apps/spreadsheeteditor/embed/js/application.js
index 4327c07ca..4d4a37bf3 100644
--- a/apps/spreadsheeteditor/embed/js/application.js
+++ b/apps/spreadsheeteditor/embed/js/application.js
@@ -33,9 +33,10 @@
 (function ($) {
 
     $(function(){
-        Common.Locale.apply();
-        SSE.ApplicationView.create();
-        SSE.ApplicationController.create();
+        Common.Locale.apply(function() {
+            SSE.ApplicationView.create();
+            SSE.ApplicationController.create();
+        });
     })
 
 })(window.jQuery);