next-i18next - npm Package Compare versions

Comparing version 0.16.0 to 0.17.0

dist/hocs/app-with-translation.js

@@ -103,3 +103,3 @@ "use strict";
         _regenerator.default.mark(function _callee(_ref) {
-          var Component, ctx, initObject, pageProps, regularProps, _ref2, wrappedPageProps, rest, req, initialI18nStore, initialLanguage, _req$i18n$languages, namespacesRequired, _pageProps;
+          var Component, ctx, initObject, pageProps, regularProps, _ref2, wrappedPageProps, rest, req, initialI18nStore, initialLanguage, namespacesRequired, _pageProps, fallbackLng;
 
@@ -151,17 +151,16 @@ return _regenerator.default.wrap(function _callee$(_context) {
                   if (!(req && req.i18n)) {
-                    _context.next = 25;
+                    _context.next = 24;
                     break;
                   }
 
-                  // First language in array is current lang
-                  _req$i18n$languages = (0, _slicedToArray2.default)(req.i18n.languages, 1);
-                  initialLanguage = _req$i18n$languages[0];
-                  _context.next = 23;
+                  initialLanguage = (0, _utils.lngFromReq)(req); // Perform a lang change in case we're not on the right lang
+
+                  _context.next = 22;
                   return i18n.changeLanguage(initialLanguage);
 
-                case 23:
-                  _context.next = 26;
+                case 22:
+                  _context.next = 25;
                   break;
 
-                case 25:
+                case 24:
                   if (Array.isArray(i18n.languages) && i18n.languages.length > 0) {
@@ -171,3 +170,3 @@ initialLanguage = i18n.language;
 
-                case 26:
+                case 25:
                   // Step 2: Determine namespace dependencies
@@ -193,3 +192,3 @@ namespacesRequired = config.ns;
                   if (!(req && req.i18n)) {
-                    _context.next = 34;
+                    _context.next = 35;
                     break;
@@ -200,16 +199,26 @@ }
                   // necessary namespaces needed to render this specific tree
+                  fallbackLng = config.fallbackLng;
                   initialI18nStore[initialLanguage] = {};
+
+                  if (fallbackLng) {
+                    initialI18nStore[fallbackLng] = {};
+                  }
+
                   namespacesRequired.forEach(function (ns) {
                     initialI18nStore[initialLanguage][ns] = (req.i18n.services.resourceStore.data[initialLanguage] || {})[ns] || {};
+
+                    if (fallbackLng) {
+                      initialI18nStore[fallbackLng][ns] = (req.i18n.services.resourceStore.data[fallbackLng] || {})[ns] || {};
+                    }
                   });
-                  _context.next = 38;
+                  _context.next = 39;
                   break;
 
-                case 34:
+                case 35:
                   if (!(Array.isArray(i18n.languages) && i18n.languages.length > 0)) {
-                    _context.next = 38;
+                    _context.next = 39;
                     break;
                   }
 
-                  _context.next = 37;
+                  _context.next = 38;
                   return Promise.all(namespacesRequired.filter(function (ns) {
@@ -225,6 +234,6 @@ return !i18n.hasResourceBundle(i18n.languages[0], ns);
 
-                case 37:
+                case 38:
                   initialI18nStore = i18n.store.data;
 
-                case 38:
+                case 39:
                   return _context.abrupt("return", (0, _objectSpread2.default)({
@@ -236,3 +245,3 @@ initialI18nStore: initialI18nStore,
 
-                case 39:
+                case 40:
                 case "end":
@@ -239,0 +248,0 @@ return _context.stop();

dist/utils/index.js

@@ -14,2 +14,8 @@ "use strict";
 });
+Object.defineProperty(exports, "lngFromReq", {
+  enumerable: true,
+  get: function get() {
+    return _lngFromReq.default;
+  }
+});
 Object.defineProperty(exports, "lngPathCorrector", {
@@ -30,4 +36,6 @@ enumerable: true,
 
+var _lngFromReq = _interopRequireDefault(require("./lng-from-req"));
+
 var _lngPathCorrector = _interopRequireDefault(require("./lng-path-corrector"));
 
 var _lngPathDetector = _interopRequireDefault(require("./lng-path-detector"));

dist/utils/lng-path-detector.js

@@ -8,5 +8,7 @@ "use strict";
 
+var _index = require("./index");
+
 var _default = function _default(req, res, next) {
   if (req.i18n) {
-    var language = req.i18n.languages[0];
+    var language = (0, _index.lngFromReq)(req);
     var _req$i18n$options = req.i18n.options,
@@ -13,0 +15,0 @@ allLanguages = _req$i18n$options.allLanguages,

package.json

 {
   "name": "next-i18next",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "main": "dist/index.js",
@@ -62,3 +62,7 @@ "repository": "[e-mail]:isaachinman/next-i18next.git",
     "jest": "^23.6.0",
+    "jest-puppeteer": "^3.7.0",
+    "jsdom": "^13.1.0",
+    "jsdom-global": "^3.0.2",
     "next": "^7.0.2",
+    "puppeteer": "^1.11.0",
     "react-dom": "^16.6.3"
@@ -65,0 +69,0 @@ },

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

402463

increased by4.11%

Number of package files

28

increased by7.69%

Lines of code

894

increased by4.2%

Worsened metrics

Dev dependency count

27

increased by17.39%

No dependency changes