🐛 Fix bugs with I18Next

* Make the app wait until the locale is loaded * Change load path for locales
Laverna · Jun 16, 2016 · 53453c4 · 53453c4
1 parent 3341652
commit 53453c4
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/app/scripts/helpers/i18next.js b/app/scripts/helpers/i18next.js
@@ -23,19 +23,27 @@ define([
          * Initialize i18next
          */
         init: function() {
-            $.t = i18n.t.bind(i18n);
+            var defer = Q.defer();
+            $.t       = i18n.t.bind(i18n);
 
-            return i18n
+            i18n
             .use(XHR)
-            .init({
-                lng          : __.getLang(),
-                fallbackLng  : ['en'],
-                ns           : [''],
-                defaultNS    : '',
-                backend      : {
-                    loadPath : '../locales/{{lng}}/translation.json'
+            .init(
+                {
+                    lng          : __.getLang(),
+                    fallbackLng  : ['en'],
+                    ns           : [''],
+                    defaultNS    : '',
+                    backend      : {
+                        loadPath : 'locales/{{lng}}/translation.json'
+                    },
                 },
-            });
+                function() {
+                    defer.resolve();
+                }
+            );
+
+            return defer.promise;
         },
 
         /**