i18next-http-middleware 3.2.2 → 3.3.0

package/README.md

@@ -208,6 +208,7 @@ await app.listen({ port })
 ```js
 // missing keys make sure the body is parsed (i.e. with [body-parser](https://github.com/expressjs/body-parser#bodyparserjsonoptions))
 app.post('/locales/add/:lng/:ns', middleware.missingKeyHandler(i18next))
+// addPath for client: http://localhost:8080/locales/add/{{lng}}/{{ns}}
 
 // multiload backend route
 app.get('/locales/resources.json', middleware.getResourcesHandler(i18next))
@@ -215,6 +216,16 @@ app.get('/locales/resources.json', middleware.getResourcesHandler(i18next))
 // GET /locales/resources.json
 // GET /locales/resources.json?lng=en
 // GET /locales/resources.json?lng=en&ns=translation
+
+// serve translations:
+app.use('/locales', express.static('locales'))
+// GET /locales/en/translation.json
+// loadPath for client: http://localhost:8080/locales/{{lng}}/{{ns}}.json
+
+// or instead of static
+app.get('/locales/:lng/:ns', middleware.getResourcesHandler(i18next))
+// GET /locales/en/translation
+// loadPath for client: http://localhost:8080/locales/{{lng}}/{{ns}}
 ```
 
 ## add localized routes
@@ -419,6 +430,8 @@ i18next.use(lngDetector).init({
 })
 ```
 
+Don't forget: You have to add the name of your detector (`myDetectorsName` in this case) to the `order` array in your `options` object. Without that, your detector won't be used. See the [Detector Options section for more](#detector-options).
+
 ---
 
 <h3 align='center'>Gold Sponsors</h3>

package/cjs/index.js

@@ -160,9 +160,15 @@ function getResourcesHandler(i18next) {
       options.setHeader(res, 'Pragma', 'no-cache');
       options.setHeader(res, 'Cache-Control', 'no-cache');
     }
+
     var languages = options.getQuery(req)[options.lngParam || 'lng'] ? options.getQuery(req)[options.lngParam || 'lng'].split(' ') : [];
     var namespaces = options.getQuery(req)[options.nsParam || 'ns'] ? options.getQuery(req)[options.nsParam || 'ns'].split(' ') : [];
 
+    if (languages.length === 0 && namespaces.length === 0) {
+      languages = options.getParams(req)[options.lngParam || 'lng'] ? options.getParams(req)[options.lngParam || 'lng'].split(' ') : [];
+      namespaces = options.getParams(req)[options.nsParam || 'ns'] ? options.getParams(req)[options.nsParam || 'ns'].split(' ') : [];
+    }
+
     namespaces.forEach(function (ns) {
       if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
         i18next.options.ns.push(ns);

package/esm/index.js

@@ -141,9 +141,15 @@ export function getResourcesHandler(i18next) {
       options.setHeader(res, 'Pragma', 'no-cache');
       options.setHeader(res, 'Cache-Control', 'no-cache');
     }
+
     var languages = options.getQuery(req)[options.lngParam || 'lng'] ? options.getQuery(req)[options.lngParam || 'lng'].split(' ') : [];
     var namespaces = options.getQuery(req)[options.nsParam || 'ns'] ? options.getQuery(req)[options.nsParam || 'ns'].split(' ') : [];
 
+    if (languages.length === 0 && namespaces.length === 0) {
+      languages = options.getParams(req)[options.lngParam || 'lng'] ? options.getParams(req)[options.lngParam || 'lng'].split(' ') : [];
+      namespaces = options.getParams(req)[options.nsParam || 'ns'] ? options.getParams(req)[options.nsParam || 'ns'].split(' ') : [];
+    }
+
     namespaces.forEach(function (ns) {
       if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {
         i18next.options.ns.push(ns);

package/lib/index.js

@@ -176,13 +176,24 @@ export function getResourcesHandler (i18next, options = {}) {
       options.setHeader(res, 'Cache-Control', 'no-cache')
     }
 
-    const languages = options.getQuery(req)[options.lngParam || 'lng']
+    // first check query
+    let languages = options.getQuery(req)[options.lngParam || 'lng']
       ? options.getQuery(req)[options.lngParam || 'lng'].split(' ')
       : []
-    const namespaces = options.getQuery(req)[options.nsParam || 'ns']
+    let namespaces = options.getQuery(req)[options.nsParam || 'ns']
       ? options.getQuery(req)[options.nsParam || 'ns'].split(' ')
       : []
 
+    // then check route params
+    if (languages.length === 0 && namespaces.length === 0) {
+      languages = options.getParams(req)[options.lngParam || 'lng']
+        ? options.getParams(req)[options.lngParam || 'lng'].split(' ')
+        : []
+      namespaces = options.getParams(req)[options.nsParam || 'ns']
+        ? options.getParams(req)[options.nsParam || 'ns'].split(' ')
+        : []
+    }
+
     // extend ns
     namespaces.forEach(ns => {
       if (i18next.options.ns && i18next.options.ns.indexOf(ns) < 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "i18next-http-middleware",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "private": false,
   "type": "module",
   "main": "./cjs/index.js",