globalize exclude en

massiveart · Oct 4, 2013 · 3438364 · 3438364
1 parent 05eec49
commit 3438364
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 14 deletions.
diff --git a/assets/js/husky/dist/husky.js b/assets/js/husky/dist/husky.js
@@ -24151,9 +24151,15 @@ define('husky_extensions/collection',[],function() {
                     },
 
                     culture: function(cultureName) {
-                        require(['cultures/globalize.culture.' + cultureName], function() {
+                        var setLanguage = function() {
                             Globalize.culture(cultureName);
-                        }.bind(this));
+                        };
+
+                        if (cultureName !== 'en') {
+                            require(['cultures/globalize.culture.' + cultureName], setLanguage.bind(this));
+                        } else {
+                            setLanguage();
+                        }
                     }
                 };
 
@@ -24166,10 +24172,15 @@ define('husky_extensions/collection',[],function() {
                 };
 
                 app.setLanguage = function(cultureName, messages) {
-                    require(['cultures/globalize.culture.' + cultureName], function() {
+                    var setLanguage = function() {
                         Globalize.culture(cultureName);
                         app.sandbox.globalize.addCultureInfo(cultureName, messages);
-                    }.bind(this));
+                    };
+                    if (cultureName !== 'en') {
+                        require(['cultures/globalize.culture.' + cultureName], setLanguage.bind(this));
+                    } else {
+                        setLanguage();
+                    }
                 };
             },
 

diff --git a/assets/js/husky/dist/husky.min.js b/assets/js/husky/dist/husky.min.js
diff --git a/dist/husky.js b/dist/husky.js
@@ -24151,9 +24151,15 @@ define('husky_extensions/collection',[],function() {
                     },
 
                     culture: function(cultureName) {
-                        require(['cultures/globalize.culture.' + cultureName], function() {
+                        var setLanguage = function() {
                             Globalize.culture(cultureName);
-                        }.bind(this));
+                        };
+
+                        if (cultureName !== 'en') {
+                            require(['cultures/globalize.culture.' + cultureName], setLanguage.bind(this));
+                        } else {
+                            setLanguage();
+                        }
                     }
                 };
 
@@ -24166,10 +24172,15 @@ define('husky_extensions/collection',[],function() {
                 };
 
                 app.setLanguage = function(cultureName, messages) {
-                    require(['cultures/globalize.culture.' + cultureName], function() {
+                    var setLanguage = function() {
                         Globalize.culture(cultureName);
                         app.sandbox.globalize.addCultureInfo(cultureName, messages);
-                    }.bind(this));
+                    };
+                    if (cultureName !== 'en') {
+                        require(['cultures/globalize.culture.' + cultureName], setLanguage.bind(this));
+                    } else {
+                        setLanguage();
+                    }
                 };
             },
 

diff --git a/dist/husky.min.js b/dist/husky.min.js
diff --git a/husky_extensions/globalize.js b/husky_extensions/globalize.js
@@ -22,9 +22,15 @@
                     },
 
                     culture: function(cultureName) {
-                        require(['cultures/globalize.culture.' + cultureName], function() {
+                        var setLanguage = function() {
                             Globalize.culture(cultureName);
-                        }.bind(this));
+                        };
+
+                        if (cultureName !== 'en') {
+                            require(['cultures/globalize.culture.' + cultureName], setLanguage.bind(this));
+                        } else {
+                            setLanguage();
+                        }
                     }
                 };
 
@@ -37,10 +43,15 @@
                 };
 
                 app.setLanguage = function(cultureName, messages) {
-                    require(['cultures/globalize.culture.' + cultureName], function() {
+                    var setLanguage = function() {
                         Globalize.culture(cultureName);
                         app.sandbox.globalize.addCultureInfo(cultureName, messages);
-                    }.bind(this));
+                    };
+                    if (cultureName !== 'en') {
+                        require(['cultures/globalize.culture.' + cultureName], setLanguage.bind(this));
+                    } else {
+                        setLanguage();
+                    }
                 };
             },