i18next-http-middleware 3.5.0 → 3.6.0

package/README.md

@@ -398,7 +398,11 @@ As with all modules you can either pass the constructor function (class) to the
   cookieDomain: 'myDomain',
   cookiePath: '/my/path',
   cookieSecure: true, // if need secure cookie
-  cookieSameSite: 'strict' // 'strict', 'lax' or 'none'
+  cookieSameSite: 'strict', // 'strict', 'lax' or 'none'
+
+  // optional conversion function used to modify the detected language code
+  convertDetectedLanguage: 'Iso15897',
+  convertDetectedLanguage: (lng) => lng.replace('-', '_')
 }
 ```
 

package/cjs/LanguageDetector.js

@@ -29,7 +29,10 @@ function getDefaults() {
     lookupFromPathIndex: 0,
     caches: false,
     cookieSameSite: 'strict',
-    ignoreCase: true
+    ignoreCase: true,
+    convertDetectedLanguage: function convertDetectedLanguage(l) {
+      return l;
+    }
   });
 }
 var LanguageDetector = function () {
@@ -49,6 +52,11 @@ var LanguageDetector = function () {
       this.services = services;
       this.options = utils.defaults(options, this.options || {}, getDefaults());
       this.allOptions = allOptions;
+      if (typeof this.options.convertDetectedLanguage === 'string' && this.options.convertDetectedLanguage.indexOf('15897') > -1) {
+        this.options.convertDetectedLanguage = function (l) {
+          return l.replace('-', '_');
+        };
+      }
       this.addDetector(_cookie.default);
       this.addDetector(_querystring.default);
       this.addDetector(_path.default);
@@ -75,6 +83,9 @@ var LanguageDetector = function () {
         detections = detections.filter(function (d) {
           return d !== undefined && d !== null;
         });
+        detections = detections.map(function (d) {
+          return _this.options.convertDetectedLanguage(d);
+        });
         if (_this.services.languageUtils.getBestMatchFromCodes) {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
           if (found) {

package/cjs/index.d.ts

@@ -115,6 +115,11 @@ interface LanguageDetectorOptions {
   caches?: LanguageDetectorCaches;
   cookieExpirationDate?: Date;
   cookieDomain?: string;
+
+  /**
+   * optional conversion function to use to modify the detected language code
+   */
+  convertDetectedLanguage?: 'Iso15897' | ((lng: string) => string);
 }
 interface LanguageDetectorAllOptions {
   fallbackLng: boolean | string | string[];

package/esm/LanguageDetector.js

@@ -20,7 +20,10 @@ function getDefaults() {
     lookupFromPathIndex: 0,
     caches: false,
     cookieSameSite: 'strict',
-    ignoreCase: true
+    ignoreCase: true,
+    convertDetectedLanguage: function convertDetectedLanguage(l) {
+      return l;
+    }
   });
 }
 var LanguageDetector = function () {
@@ -40,6 +43,11 @@ var LanguageDetector = function () {
       this.services = services;
       this.options = utils.defaults(options, this.options || {}, getDefaults());
       this.allOptions = allOptions;
+      if (typeof this.options.convertDetectedLanguage === 'string' && this.options.convertDetectedLanguage.indexOf('15897') > -1) {
+        this.options.convertDetectedLanguage = function (l) {
+          return l.replace('-', '_');
+        };
+      }
       this.addDetector(cookieLookup);
       this.addDetector(querystringLookup);
       this.addDetector(pathLookup);
@@ -66,6 +74,9 @@ var LanguageDetector = function () {
         detections = detections.filter(function (d) {
           return d !== undefined && d !== null;
         });
+        detections = detections.map(function (d) {
+          return _this.options.convertDetectedLanguage(d);
+        });
         if (_this.services.languageUtils.getBestMatchFromCodes) {
           found = _this.services.languageUtils.getBestMatchFromCodes(detections);
           if (found) {

package/esm/index.d.ts

@@ -115,6 +115,11 @@ interface LanguageDetectorOptions {
   caches?: LanguageDetectorCaches;
   cookieExpirationDate?: Date;
   cookieDomain?: string;
+
+  /**
+   * optional conversion function to use to modify the detected language code
+   */
+  convertDetectedLanguage?: 'Iso15897' | ((lng: string) => string);
 }
 interface LanguageDetectorAllOptions {
   fallbackLng: boolean | string | string[];

package/index.d.ts

@@ -115,6 +115,11 @@ interface LanguageDetectorOptions {
   caches?: LanguageDetectorCaches;
   cookieExpirationDate?: Date;
   cookieDomain?: string;
+
+  /**
+   * optional conversion function to use to modify the detected language code
+   */
+  convertDetectedLanguage?: 'Iso15897' | ((lng: string) => string);
 }
 interface LanguageDetectorAllOptions {
   fallbackLng: boolean | string | string[];

package/lib/LanguageDetector.js

@@ -20,7 +20,9 @@ function getDefaults () {
     // cookieDomain: 'myDomain'
     // cookiePath: '/my/path'
     cookieSameSite: 'strict',
-    ignoreCase: true
+    ignoreCase: true,
+
+    convertDetectedLanguage: (l) => l
   })
 }
 
@@ -37,6 +39,10 @@ class LanguageDetector {
     this.options = utils.defaults(options, this.options || {}, getDefaults())
     this.allOptions = allOptions
 
+    if (typeof this.options.convertDetectedLanguage === 'string' && this.options.convertDetectedLanguage.indexOf('15897') > -1) {
+      this.options.convertDetectedLanguage = (l) => l.replace('-', '_')
+    }
+
     this.addDetector(cookieLookup)
     this.addDetector(querystringLookup)
     this.addDetector(pathLookup)
@@ -61,6 +67,7 @@ class LanguageDetector {
       if (!Array.isArray(detections)) detections = [detections]
 
       detections = detections.filter((d) => d !== undefined && d !== null)
+      detections = detections.map((d) => this.options.convertDetectedLanguage(d))
 
       if (this.services.languageUtils.getBestMatchFromCodes) { // new i18next v19.5.0
         found = this.services.languageUtils.getBestMatchFromCodes(detections)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.5.0",
+  "version": "3.6.0",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",
@@ -44,7 +44,7 @@
     "eslint-plugin-require-path-exists": "1.1.9",
     "eslint-plugin-standard": "5.0.0",
     "expect.js": "0.3.1",
-    "express": "4.18.2",
+    "express": "4.19.2",
     "fastify": "4.24.3",
     "i18next": "23.7.1",
     "mocha": "10.2.0",