Merge pull request #42 from arlemi/master

Fixed issue with Language translation

Author: arlemi

package.json

@@ -31,7 +31,7 @@
       "watson-dialog-v1": "services/dialog/v1.js",
       "watson-document-conversion-v1": "services/document_conversion/v1.js",
       "watson-language-identification-v1": "/services/language_identification/v1.js",
-      "watson-language-translate-v1": "services/language_translation/v1.js",
+      "watson-language-translate-v1": "services/language_translation/v2.js",
       "watson-personality-insights-v1": "services/personality_insights/v1.js",
       "watson-relationship-extraction-v1": "services/relationship_extraction/v1.js",
       "watson-speech-to-text-v1": "services/speech_to_text/v1.js",
@@ -42,4 +42,4 @@
       "watson-retrieve-and-rank-v1": "services/retrieve_and_rank/v1.js"
     }
   }
-}
+}

services/language_translation/v1.html services/language_translation/v2.htmlservices/language_translation/v1.html renamed to services/language_translation/v2.html

@@ -55,7 +55,7 @@
         </select>
     </div>
     <div class="form-row">
-        <label for="node-input-filetype"><i class="fa fa-comments-o"></i> File type</label>
+        <label for="node-input-filetype"><i class="fa fa-book"></i> File type</label>
         <select type="text" id="node-input-filetype" style="display: inline-block; vertical-align:middle; width: 70%;">
             <option value="forcedglossary" selected="selected">Forced glossary</option>
             <option value="parallelcorpus">Parallel corpus</option>
@@ -76,13 +76,15 @@
 
 <script type="text/javascript">
 var first_launch = true;
+var models;
+var domain_type;
+var languages;
+var domain_selected = $('#node-input-domain').val();
+var srclang_selected = $('#node-input-srclang').val();
+var destlang_selected = $('#node-input-destlang').val();
+var action = $('#node-input-action').val();
 
 (function () {
-  var models, domain_type, languages;
-  var domain_selected = $('#node-input-domain').val();
-  var srclang_selected = $('#node-input-srclang').val();
-  var action = $('#node-input-action').val();
-
   // sorting functions
   function onlyUnique(value, index, self) {
     return self.indexOf(value) === index;
@@ -104,6 +106,11 @@
       srclang_selected = $('#node-input-srclang').val();
       destlangAvailable();
     });
+
+    $('#node-input-destlang').change(function () {
+      destlang_selected = $('#node-input-destlang').val();
+      destlangAvailable();
+    });
   }
 
   function selectAction() {
@@ -132,18 +139,28 @@
       return a.domain;
     });
 
-
     var unique_domains = domains.filter(onlyUnique);
-    var domain_first_iteration = true;
 
-    unique_domains.forEach(function (domain) {
-      if (domain_first_iteration) {
-        $('select#node-input-domain').append('<option value="' + domain + '" selected>' + domain.charAt(0).toUpperCase() + domain.slice(1) + '</option>');
-      } else {
-        $('select#node-input-domain').append('<option value="' + domain + '">' + domain.charAt(0).toUpperCase() + domain.slice(1) + '</option>');
-      }
-      domain_first_iteration = false;
-    });
+    if(!domain_selected) {
+      var domain_first_iteration = true;
+
+      unique_domains.forEach(function (domain) {
+        if (domain_first_iteration) {
+          $('select#node-input-domain').append('<option value="' + domain + '" selected="selected">' + domain.charAt(0).toUpperCase() + domain.slice(1) + '</option>');
+        } else {
+          $('select#node-input-domain').append('<option value="' + domain + '">' + domain.charAt(0).toUpperCase() + domain.slice(1) + '</option>');
+        }
+        domain_first_iteration = false;
+      });
+    } else {
+      unique_domains.forEach(function (domain) {
+        if (domain_selected === domain) {
+          $('select#node-input-domain').append('<option value="' + domain + '" selected="selected">' + domain.charAt(0).toUpperCase() + domain.slice(1) + '</option>');
+        } else {
+          $('select#node-input-domain').append('<option value="' + domain + '">' + domain.charAt(0).toUpperCase() + domain.slice(1) + '</option>');
+        }
+      });      
+    }
     selectDomain();
   }
 
@@ -162,27 +179,46 @@
     });
     input_lang_unique = input_lang.filter(onlyUnique);
     output_lang_unique = output_lang.filter(onlyUnique);
-    var langsrc_first_iteration = true;
-
-    input_lang_unique.forEach(function (lang) {
-      if (langsrc_first_iteration) {
-        $('select#node-input-srclang').append('<option value="' + lang + '" selected>' + lang + '</option>');
-      } else {
-        $('select#node-input-srclang').append('<option value="' + lang + '">' + lang + '</option>');
-      }
-      langsrc_first_iteration = false;
-    });
-    var langdest_first_iteration = true;
 
-    output_lang_unique.forEach(function (lang) {
-      if (langdest_first_iteration) {
-        $('select#node-input-destlang').append('<option value="' + lang + '" selected>' + lang + '</option>');
-      } else {
-        $('select#node-input-destlang').append('<option value="' + lang + '">' + lang + '</option>');
-      }
+    if(!srclang_selected)
+    {
+      var langsrc_first_iteration = true;
+      var langdest_first_iteration = true;
 
-      langdest_first_iteration = false;
-    });
+      input_lang_unique.forEach(function (lang) {
+        if (langsrc_first_iteration) {
+          $('select#node-input-srclang').append('<option value="' + lang + '" selected="selected">' + lang + '</option>');
+        } else {
+          $('select#node-input-srclang').append('<option value="' + lang + '">' + lang + '</option>');
+        }
+        langsrc_first_iteration = false;
+      });
+      output_lang_unique.forEach(function (lang) {
+        if (langdest_first_iteration) {
+          $('select#node-input-destlang').append('<option value="' + lang + '" selected="selected">' + lang + '</option>');
+        } else {
+          $('select#node-input-destlang').append('<option value="' + lang + '">' + lang + '</option>');
+        }
+        langdest_first_iteration = false;
+      });
+      
+      
+    } else {
+      input_lang_unique.forEach(function (lang) {
+        if (srclang_selected === lang) {
+          $('select#node-input-srclang').append('<option value="' + lang + '" selected="selected">' + lang + '</option>');
+        } else {
+          $('select#node-input-srclang').append('<option value="' + lang + '">' + lang + '</option>');
+        }
+      });
+      output_lang_unique.forEach(function (lang) {
+        if (destlang_selected === lang) {
+          $('select#node-input-destlang').append('<option value="' + lang + '" selected="selected">' + lang + '</option>');
+        } else {
+          $('select#node-input-destlang').append('<option value="' + lang + '">' + lang + '</option>');
+        }
+      });
+    }
     destlangAvailable();
   }
 
@@ -199,6 +235,14 @@
     available_destlang.forEach(function (val) {
       $('#node-input-destlang option[value=' + val.split('-')[1] + ']').removeAttr('disabled')
     });
+
+    checkPairLang();
+  }
+
+  function checkPairLang() {
+    if($('select#node-input-destlang option:selected').is(':disabled')) {
+      $('select#node-input-destlang').val('en');
+    }
   }
 
   function getModels() {