From 7c8828cb13c19d6a53f1205d845783fab6a7ae2e Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Tue, 17 Sep 2019 18:22:45 +0300
Subject: [PATCH] [Common] Fix loading translations (for IE)

---
 apps/common/locale.js | 54 ++++++++++++++++++++++++++++---------------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/apps/common/locale.js b/apps/common/locale.js
index 3e3bdda3b..64f75666c 100644
--- a/apps/common/locale.js
+++ b/apps/common/locale.js
@@ -36,27 +36,36 @@ if (Common === undefined) {
 
 Common.Locale = new(function() {
     "use strict";
-    var l10n = {};
+    var l10n = null;
+    var loadcallback,
+        apply = false;
 
-    var _applyLocalization = function() {
+    var _applyLocalization = function(callback) {
         try {
-            for (var prop in l10n) {
-                var p = prop.split('.');
-                if (p && p.length > 2) {
+            console.log('_applyLocalization');
+            callback && (loadcallback = callback);
+            if (l10n) {
+                console.log('_apply ok');
+                for (var prop in l10n) {
+                    var p = prop.split('.');
+                    if (p && p.length > 2) {
 
-                    var obj = window;
-                    for (var i = 0; i < p.length - 1; ++i) {
-                        if (obj[p[i]] === undefined) {
-                            obj[p[i]] = new Object();
+                        var obj = window;
+                        for (var i = 0; i < p.length - 1; ++i) {
+                            if (obj[p[i]] === undefined) {
+                                obj[p[i]] = new Object();
+                            }
+                            obj = obj[p[i]];
                         }
-                        obj = obj[p[i]];
-                    }
 
-                    if (obj) {
-                        obj[p[p.length - 1]] = l10n[prop];
+                        if (obj) {
+                            obj[p[p.length - 1]] = l10n[prop];
+                        }
                     }
                 }
-            }
+                loadcallback && loadcallback();
+            } else
+                apply = true;
         }
         catch (e) {
         }
@@ -64,7 +73,7 @@ Common.Locale = new(function() {
 
     var _get = function(prop, scope) {
         var res = '';
-        if (scope && scope.name) {
+        if (l10n && scope && scope.name) {
             res = l10n[scope.name + '.' + prop];
         }
 
@@ -99,10 +108,13 @@ Common.Locale = new(function() {
                     throw new Error('loaded');
                 }
             }).then(function(json) {
-                if ( !!json ) l10n = json;
+                l10n = json || {};
+                apply && _applyLocalization();
             }).catch(function(e) {
+                l10n = l10n || {};
+                apply && _applyLocalization();
                 if ( e.message == 'loaded' ) {
-
+                    console.log('loaded');
                 } else
                     console.log('fetch error: ' + e);
             });
@@ -110,7 +122,13 @@ Common.Locale = new(function() {
 
     if ( !window.fetch ) {
         /* use fetch polifill if native method isn't supported */
-        require(['../vendor/fetch/fetch.umd'], _requireLang);
+        var polyfills = ['../vendor/fetch/fetch.umd'];
+        if ( !window.Promise ) {
+            require(['//cdn.jsdelivr.net/npm/es6-promise@4/dist/es6-promise.auto.min.js'],
+                function () {
+                    require(polyfills, _requireLang);
+                });
+        } else require(polyfills, _requireLang);
     } else _requireLang();
 
     return {