Account for differences in accept-language header

strongloop · Feb 4, 2020 · 39fa0dd · 39fa0dd
1 parent 63ffd0d
commit 39fa0dd
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 4 deletions.
diff --git a/packages/runtime/src/helper.ts b/packages/runtime/src/helper.ts
@@ -865,13 +865,15 @@ export function getLanguageFromRequest(
   appLanguages: string[],
   defaultLanguage: string
 ): string {
-  if (!req || !req.headers) {
+  if (!req || !req.headers || !req.headers['accept-language']) {
     return defaultLanguage;
   }
 
   let languages = req.headers['accept-language'].split(',');
   for (let i = 0; i < languages.length; i++) {
-    languages[i] = getLangAlias(languages[i]);
+    let languageWeighted = languages[i].split(';');
+    languageWeighted[0] = getLangAlias(languageWeighted[0].trim());
+    languages[i] = languageWeighted.join(';');
   }
   const reqLanguage = languages.join(',');
   if (!reqLanguage) {

diff --git a/packages/runtime/test/test-load-msg.js b/packages/runtime/test/test-load-msg.js
@@ -12,7 +12,7 @@ var test = require('tap').test;
 
 SG.SetRootDir(__dirname);
 SG.SetDefaultLanguage();
-SG.SetAppLanguages(['en', 'zh-Hans']);
+SG.SetAppLanguages(['en', 'zh-Hans', 'zh-Hant']);
 
 var g = new SG();
 
@@ -56,7 +56,36 @@ test('remove double curly braces', function(t) {
   t.equal(source.msgError, targetMsg, 'Remove double curly braces.');
   t.end();
 });
-
+test('no accept-language header', function(t) {
+  var req = {
+    headers: {
+      accept: 'application/json',
+    },
+  };
+  var message = g.http(req).f('Test message');
+  t.equal(message, 'Test message');
+  t.end();
+});
+test('empty accept-language header', function(t) {
+  var req = {
+    headers: {
+      'accept-language': '',
+    },
+  };
+  var message = g.http(req).f('Test message');
+  t.equal(message, 'Test message');
+  t.end();
+});
+test('accept-language header - *', function(t) {
+  var req = {
+    headers: {
+      'accept-language': '*',
+    },
+  };
+  var message = g.http(req).f('Test message');
+  t.equal(message, 'Test message');
+  t.end();
+});
 test('accept-language header - en', function(t) {
   var req = {
     headers: {
@@ -84,3 +113,22 @@ test('accept-language header - alias', function(t) {
   t.equal(cachedSg.getLanguage(), 'zh-Hans');
   t.end();
 });
+
+test('multiple, weighted, accept-language header with alias', function(t) {
+  var req = {
+    headers: {
+      'accept-language':
+        'fr-CH, fr;q=0.9, en;q=0.8, de;q=0.7 zh-cn;q=0.7, zh-tw;q=0.9 *;q=0.5',
+    },
+  };
+  // create a SG instance for language 'zh-Hans' and register it
+  var sg_hant = new SG({language: 'zh-Hant'});
+  SG.sgCache.set('zh-Hant', sg_hant);
+
+  var cachedSg = g.http(req);
+  t.equal(cachedSg.getLanguage(), 'zh-Hant');
+
+  var message = g.http(req).f('log');
+  t.equal(message, '原木');
+  t.end();
+});