Merge pull request #425 from funktionswerk/master

Added support for WHATWG URL API urls
mashpie · Jan 24, 2020 · 6d99cc3 · 6d99cc3
2 parents 01aa965 + 35de7b1
commit 6d99cc3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/i18n.js b/i18n.js
@@ -661,7 +661,8 @@ module.exports = (function() {
 
       // a query parameter overwrites all
       if (queryParameter && request.url) {
-        var urlObj = url.parse(request.url, true);
+        var urlAsString = typeof request.url === 'string' ? request.url : request.url.toString();
+        var urlObj = url.parse(urlAsString, true);
         if (urlObj.query[queryParameter]) {
           logDebug('Overriding locale from query: ' + urlObj.query[queryParameter]);
           request.language = urlObj.query[queryParameter];

diff --git a/test/i18n.configureQueryParameter.js b/test/i18n.configureQueryParameter.js
@@ -47,4 +47,11 @@ describe('Locale switching should work queryParameter', function() {
     res.__('Hello').should.equal('Bonjour');
     res.locals.__('Hello').should.equal('Bonjour');
   });
+
+  it('should support WHATWG URL API', function() {
+    req.url = new URL('/test?lang=fr', 'http://localhost');
+    i18n.init(req, res);
+    i18n.getLocale(req).should.equal('fr');
+    i18n.getLocale(res).should.equal('fr');
+  });
 });