updated client to prerelease version

i18next · May 17, 2013 · 9180184 · 9180184
1 parent a2c174c
commit 9180184
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 42 deletions.
diff --git a/lib/dep/i18next-1.6.2.min.js b/lib/dep/i18next-1.6.2.min.js
diff --git a/lib/dep/i18next-1.6.2.js → lib/dep/i18next-1.6.3_pre.js b/lib/dep/i18next-1.6.2.js → lib/dep/i18next-1.6.3_pre.js
@@ -1,4 +1,4 @@
-// i18next, v1.6.2
+// i18next, v1.6.3_pre
 // Copyright (c)2013 Jan Mühlemann (jamuhl).
 // Distributed under MIT license
 // http://i18next.com
@@ -1088,7 +1088,7 @@
             }
         }
 
-        if (found === undefined && !options.isFallbackLookup && (o.fallbackToDefaultNS === true || (o.fallbackNS && o.fallbackNS.length))) { 
+        if (found === undefined && !options.isFallbackLookup && (o.fallbackToDefaultNS === true || (o.fallbackNS && o.fallbackNS.length > 0))) { 
             // set flag for fallback lookup - avoid recursion
             options.isFallbackLookup = true;
 
@@ -1297,9 +1297,9 @@
 
             var urls = [];
 
-            if (o.sendMissingTo === 'fallback') {
+            if (o.sendMissingTo === 'fallback' && o.fallbackLng !== false) {
                 urls.push({lng: o.fallbackLng, url: applyReplacement(o.resPostPath, { lng: o.fallbackLng, ns: ns })});
-            } else if (o.sendMissingTo === 'current') {
+            } else if (o.sendMissingTo === 'current' || (o.sendMissingTo === 'fallback' && o.fallbackLng === false) ) {
                 urls.push({lng: lng, url: applyReplacement(o.resPostPath, { lng: lng, ns: ns })});
             } else if (o.sendMissingTo === 'all') {
                 for (var i = 0, l = lngs.length; i < l; i++) {

diff --git a/lib/dep/i18next-1.6.3_pre.min.js b/lib/dep/i18next-1.6.3_pre.min.js
diff --git a/lib/i18nextWrapper.js b/lib/i18nextWrapper.js
@@ -1,7 +1,7 @@
 (function() {
 
     // when updating dep/i18next.xx.js update version here
-    var i18nVersion = '1.6.2';
+    var i18nVersion = '1.6.3_pre';
 
     var i18n = require('./dep/i18next-' + i18nVersion)
       , url = require('url')

diff --git a/sample/locales/de-DE/new.ns.special.json b/sample/locales/de-DE/new.ns.special.json
diff --git a/sample/locales/en-US/new.ns.special.json b/sample/locales/en-US/new.ns.special.json
diff --git a/sample/server.js b/sample/server.js
@@ -60,7 +60,7 @@ i18n.init({
     resSetPath: 'locales/__lng__/new.__ns__.json',
     saveMissing: true,
     debug: true,
-    sendMissingTo: 'all'
+    sendMissingTo: 'fallback'
 });
 
 // Configuration