fixed timing of localization initialization (#660)

massiveart · Jun 15, 2016 · dac3617 · dac3617
1 parent 9124277
commit dac3617
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # CHANGELOG for husky
 
 * dev-master
+    * HOTFIX      #660 Fixed timing of localization initialization
     * ENHANCEMENT #657 Added new function 'records.set' for datagrid
 
 * 0.19.3 (2016-06-01)

diff --git a/dist/husky.js b/dist/husky.js
@@ -51104,15 +51104,26 @@ define("datepicker-zh-TW", function(){});
                 app.setLanguage = function(cultureName, messages, defaultMessages) {
                     cultureName = normalizeCultureName(cultureName);
 
-                    if (cultureName !== 'en') {
-                        require(['cultures/globalize.culture.' + cultureName]);
-                    }
 
                     Globalize.culture(cultureName);
 
                     app.sandbox.globalize.addCultureInfo(cultureName, messages);
                     app.sandbox.globalize.addCultureInfo('default', defaultMessages);
                 };
+
+                app.loadLanguage = function(cultureName) {
+                    var deferred = $.Deferred();
+
+                    if (cultureName !== 'en') {
+                        require(['cultures/globalize.culture.' + cultureName], function() {
+                            deferred.resolve();
+                        });
+                    } else {
+                        deferred.resolve();
+                    }
+
+                    return deferred.promise();
+                }
             },
 
             afterAppStart: function(app) {
@@ -51121,11 +51132,13 @@ define("datepicker-zh-TW", function(){});
                         app.config.culture.messages = {};
                     }
 
-                    app.setLanguage(
-                        app.config.culture.name,
-                        app.config.culture.messages,
-                        app.config.culture.defaultMessages
-                    );
+                    app.loadLanguage(app.config.culture.name).then(function() {
+                        app.setLanguage(
+                            app.config.culture.name,
+                            app.config.culture.messages,
+                            app.config.culture.defaultMessages
+                        );
+                    });
                 }
 
                 app.sandbox.globalize.setCurrency('');

diff --git a/dist/husky.min.js b/dist/husky.min.js
diff --git a/husky_extensions/globalize.js b/husky_extensions/globalize.js
@@ -184,15 +184,26 @@
                 app.setLanguage = function(cultureName, messages, defaultMessages) {
                     cultureName = normalizeCultureName(cultureName);
 
-                    if (cultureName !== 'en') {
-                        require(['cultures/globalize.culture.' + cultureName]);
-                    }
 
                     Globalize.culture(cultureName);
 
                     app.sandbox.globalize.addCultureInfo(cultureName, messages);
                     app.sandbox.globalize.addCultureInfo('default', defaultMessages);
                 };
+
+                app.loadLanguage = function(cultureName) {
+                    var deferred = $.Deferred();
+
+                    if (cultureName !== 'en') {
+                        require(['cultures/globalize.culture.' + cultureName], function() {
+                            deferred.resolve();
+                        });
+                    } else {
+                        deferred.resolve();
+                    }
+
+                    return deferred.promise();
+                }
             },
 
             afterAppStart: function(app) {
@@ -201,11 +212,13 @@
                         app.config.culture.messages = {};
                     }
 
-                    app.setLanguage(
-                        app.config.culture.name,
-                        app.config.culture.messages,
-                        app.config.culture.defaultMessages
-                    );
+                    app.loadLanguage(app.config.culture.name).then(function() {
+                        app.setLanguage(
+                            app.config.culture.name,
+                            app.config.culture.messages,
+                            app.config.culture.defaultMessages
+                        );
+                    });
                 }
 
                 app.sandbox.globalize.setCurrency('');