Merge pull request #365 from chughts/vrlang

accept-language fix for visual recognition node

Author: chughts

README.md

@@ -7,6 +7,9 @@ Node-RED Watson Nodes for IBM Cloud
 
 <a href="https://cla-assistant.io/watson-developer-cloud/node-red-node-watson"><img src="https://cla-assistant.io/readme/badge/watson-developer-cloud/node-red-node-watson" alt="CLA assistant" /></a>
 
+### New in version 0.6.2
+- Visual Recognition fix for accept-language 
+
 ### New in version 0.6.1
 - Allow STT Language to be dyamically configurable using msg.srclang
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "node-red-node-watson",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "description": "A collection of Node-RED nodes for IBM Watson services",
   "dependencies": {
     "async": "^1.5.2",

services/visual_recognition/v3.html

@@ -36,16 +36,20 @@
         <input type="text" id="node-input-name" placeholder="Name">
     </div>
     <div class="form-row" id="lang-group">
-        <label for="node-input-lang-label"><i class="fa fa-language"></i> Language</label>
+        <label for="node-input-lang"><i class="fa fa-language"></i> Language</label>
         <select type="text" id="node-input-lang" style="display: inline-block; width: 70%;" >
             <option selected="selected" value="en">English</option>
             <option value="es">Spanish</option>
+            <option value="de">German</option>
+            <option value="it">Italian</option>
             <option value="ar">Arabic</option>
             <option value="ja">Japanese</option>
+            <option value="ko">Korean</option>
         </select>
     </div>
 </script>
 
+
 <script type="text/x-red" data-template-name="visual-recognition-util-v3">
     <div id="credentials-check" class="form-row">
         <div class="form-tips">

services/visual_recognition/v3.js

@@ -142,13 +142,26 @@ module.exports = function(RED) {
       return Promise.reject('Missing Watson Visual Recognition API service credentials');
     }
 
-    node.service = new VisualRecognitionV3({
+    var serviceSettings = {
       api_key: node.apikey,
       version_date: VisualRecognitionV3.VERSION_DATE_2016_05_20,
       headers: {
         'User-Agent': pkg.name + '-' + pkg.version
       }
-    });
+    };
+
+    // The change to watson-developer-cloud 3.0.x has resulted in a
+    // change in how the Accept-Language is specified. It now needs
+    // to go in as a header.
+
+    if (node.config != null && node.config.lang != null) {
+      serviceSettings.headers['Accept-Language'] = node.config.lang;
+    }
+    if (msg.params != null && msg.params.accept_language != null) {
+      serviceSettings.headers['Accept-Language'] = msg.params['accept_language'];
+    }
+
+    node.service = new VisualRecognitionV3(serviceSettings);
 
     return Promise.resolve();
   }