From ad4603ddb42cee5ded0343676f5e79764e439105 Mon Sep 17 00:00:00 2001 From: rolux Date: Thu, 9 May 2013 19:02:28 +0200 Subject: [PATCH] Ox.load: when loading modules, set locale --- source/Ox/js/Core.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/Ox/js/Core.js b/source/Ox/js/Core.js index 399986b9..6b119027 100644 --- a/source/Ox/js/Core.js +++ b/source/Ox/js/Core.js @@ -33,7 +33,7 @@ Ox.load Loads one or more modules @*/ Ox.load = function() { var callback = arguments[arguments.length - 1], - length, loaded = 0, modules = {}, succeeded = 0, + length, loaded = 0, localeFiles = [], modules = {}, succeeded = 0, type = Ox.typeOf(arguments[0]); function done(success) { Ox.documentReady(function() { @@ -66,7 +66,11 @@ Ox.load = function() { function() { Ox.load[module](options, function(success) { succeeded += success; - ++loaded == length && callback(succeeded == length); + if (++loaded == length) { + Ox.setLocale(Ox.LOCALE, function() { + callback(succeeded == length); + }); + } }); } );