Merge 0af53e7 into 50c994e

mashpie · Jan 24, 2019 · a41f277 · a41f277
2 parents 50c994e + 0af53e7
commit a41f277
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/i18n.js b/i18n.js
@@ -659,14 +659,11 @@ module.exports = (function() {
       // a query parameter overwrites all
       if (queryParameter && request.url) {
         var urlObj = url.parse(request.url, true);
-        if (urlObj.query[queryParameter]) {
-          logDebug('Overriding locale from query: ' + urlObj.query[queryParameter]);
-          request.language = urlObj.query[queryParameter];
-
-          if (preserveLegacyCase) {
-            request.language = request.language.toLowerCase();
-          }
-
+        var queryVal = (Array.isArray(urlObj.query[queryParameter]) && urlObj.query[queryParameter][0])
+          || urlObj.query[queryParameter];
+        if (queryVal) {
+          logDebug('Overriding locale from query: ' + queryVal);
+          request.language = preserveLegacyCase ? queryVal.toLowerCase() : queryVal;
           return i18n.setLocale(request, request.language);
         }
       }