moved message construction to initialize (massiveart#670)

* moved message construction to initialize * Update CHANGELOG.md * removed unneccessary condition
niklasnatter · Jul 4, 2016 · b319e15 · b319e15
1 parent 1953ef8
commit b319e15
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # CHANGELOG for husky
 
 * dev-develop
+    * BUGFIX      #670 Fixed Globalizing timing issue
     * FEATURE     #664 Collapse dropdown button without visible items in list
     * FEATURE     #636 Added possibility to display small labels
     * BUGFIX      #666 Added auto-start on focus

diff --git a/dist/husky.js b/dist/husky.js
@@ -51386,12 +51386,31 @@ define("datepicker-zh-TW", function(){});
             }
 
             return cultureName;
+        },
+
+        initializeLanguages = function(app) {
+            if (!!app.config.culture) {
+                if (!app.config.culture.messages) {
+                    app.config.culture.messages = {};
+                }
+
+                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('');
         };
 
-        return  {
+        return {
             name: 'husky-validation',
 
             initialize: function(app) {
+
                 app.sandbox.globalize = {
                     addCultureInfo: function(cultureName, messages) {
                         cultureName = normalizeCultureName(cultureName);
@@ -51560,25 +51579,9 @@ define("datepicker-zh-TW", function(){});
                     }
 
                     return deferred.promise();
-                }
-            },
-
-            afterAppStart: function(app) {
-                if (!!app.config.culture && !!app.config.culture) {
-                    if (!app.config.culture.messages) {
-                        app.config.culture.messages = {};
-                    }
-
-                    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('');
+                initializeLanguages(app);
             }
         };
     });

diff --git a/dist/husky.min.js b/dist/husky.min.js
diff --git a/husky_extensions/globalize.js b/husky_extensions/globalize.js
@@ -29,12 +29,31 @@
             }
 
             return cultureName;
+        },
+
+        initializeLanguages = function(app) {
+            if (!!app.config.culture) {
+                if (!app.config.culture.messages) {
+                    app.config.culture.messages = {};
+                }
+
+                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('');
         };
 
-        return  {
+        return {
             name: 'husky-validation',
 
             initialize: function(app) {
+
                 app.sandbox.globalize = {
                     addCultureInfo: function(cultureName, messages) {
                         cultureName = normalizeCultureName(cultureName);
@@ -203,25 +222,9 @@
                     }
 
                     return deferred.promise();
-                }
-            },
-
-            afterAppStart: function(app) {
-                if (!!app.config.culture && !!app.config.culture) {
-                    if (!app.config.culture.messages) {
-                        app.config.culture.messages = {};
-                    }
-
-                    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('');
+                initializeLanguages(app);
             }
         };
     });