Merge pull request watson-developer-cloud#273 from watson-developer-cloud/lt-rename

Language Translator rename

Author: nfriedly

README.md

@@ -25,7 +25,7 @@ APIs and SDKs that use cognitive computing to solve complex problems.
     * [Concept Insights](#concept-insights)
     * [Dialog](#dialog)
     * [Document Conversion](#document-conversion)
-    * [Language Translation](#language-translation)
+    * [Language Translator](#language-translator)
     * [Natural Language Classifier](#natural-language-classifier)
     * [Personality Insights](#personality-insights)
     * [Relationship Extraction](#relationship-extraction)
@@ -298,20 +298,20 @@ document_conversion.convert({
 See the [Document Conversion integration example][document_conversion_integration_example] about how to integrate the Document Conversion service
 with the Retrieve and Rank service.
 
-### Language Translation
+### Language Translator
 
-Translate text from one language to another or idenfity a language using the [Language Translation][language_translation] service.
+Translate text from one language to another or idenfity a language using the [Language Translator][language_translator] service.
 
 ```javascript
 var watson = require('watson-developer-cloud');
 
-var language_translation = watson.language_translation({
+var language_translator = watson.language_translator({
   username: '<username>',
   password: '<password>',
   version: 'v2'
 });
 
-language_translation.translate({
+language_translator.translate({
   text: 'A sentence must have a verb', source : 'en', target: 'es' },
   function (err, translation) {
     if (err)
@@ -320,8 +320,8 @@ language_translation.translate({
       console.log(JSON.stringify(translation, null, 2));
 });
 
-language_translation.identify({
-  text: 'The language translation service takes text input and identifies the language used.' },
+language_translator.identify({
+  text: 'The language translator service takes text input and identifies the language used.' },
   function (err, language) {
     if (err)
       console.log('error:', err);
@@ -663,7 +663,7 @@ See [CONTRIBUTING](https://github.com/watson-developer-cloud/node-sdk/blob/maste
 [speech_to_text]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/speech-to-text/
 [concept_insights]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/concept-insights/
 [tradeoff_analytics]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/tradeoff-analytics/
-[language_translation]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/language-translation/
+[language_translator]: http://www.ibm.com/smarterplanet/us/en/ibmwatson/developercloud/doc/language-translation/
 
 [alchemy_language]: http://www.alchemyapi.com/products/alchemylanguage
 [sentiment_analysis]: http://www.alchemyapi.com/products/alchemylanguage/sentiment-analysis

examples/language_translation.v2.js renamed to examples/language_translator.v2.js

@@ -3,13 +3,13 @@
 var watson = require('watson-developer-cloud');
 var fs     = require('fs');
 
-var language_translation = watson.language_translation({
+var language_translator = watson.language_translator({
   username: 'INSERT YOUR USERNAME FOR THE SERVICE HERE',
   password: 'INSERT YOUR PASSWORD FOR THE SERVICE HERE',
   version: 'v2'
 });
 
-language_translation.translate({
+language_translator.translate({
   text: 'A sentence must have a verb', source : 'en', target: 'es' },
   function (err, translation) {
     if (err)
@@ -20,7 +20,7 @@ language_translation.translate({
 
 
 // Create a translation model using a tmx file
-language_translation.createModel({
+language_translator.createModel({
     base_model_id: 'en-fr',
     name:'my-model',
     forced_glossary: fs.createReadStream('resources/glossary.tmx')

lib/index.js

@@ -205,7 +205,7 @@ var watson = {
    * @param {{}} options
    * @returns  {LanguageTranslation}
    */
-  language_translation: createServiceAPI('language_translation'),
+  language_translator: createServiceAPI('language_translator'),
 
   /**
    * @function
@@ -288,4 +288,17 @@ var watson = {
   });
 });
 
+Object.defineProperty(watson, 'language_translation', {
+  enumerable: false,
+  configurable: true,
+  writable: true,
+  value: function(options) {
+    if (!options.silent) {
+      //eslint-disable-next-line no-console
+      console.warn(new Error("Watson language_translation is now language_translator. Set {silent: true} to disable this message.").stack)
+    }
+    return watson.language_translator(options);
+  }
+});
+
 module.exports = watson;

services/language_translation/v2.js renamed to services/language_translator/v2.js

@@ -557,12 +557,12 @@ describe('integration-all-services', function() {
     });
   });
 
-  describe('functional_language_translation', function() {
+  describe('functional_language_translator', function() {
     this.timeout(TWENTY_SECONDS * 2);
-    var language_translation = watson.language_translation(auth.language_translation);
+    var language_translator = watson.language_translator(auth.language_translator || auth.language_translation);
 
     it('getModels()', function(done) {
-      language_translation.getModels(null, failIfError.bind(failIfError, done));
+      language_translator.getModels(null, failIfError.bind(failIfError, done));
     });
 
     it('translate()', function(done) {
@@ -571,18 +571,18 @@ describe('integration-all-services', function() {
         source: 'en',
         target: 'es'
       };
-      language_translation.translate(params, failIfError.bind(failIfError, done));
+      language_translator.translate(params, failIfError.bind(failIfError, done));
     });
 
     it('getIdentifiableLanguages()', function(done) {
-      language_translation.getIdentifiableLanguages(null, failIfError.bind(failIfError, done));
+      language_translator.getIdentifiableLanguages(null, failIfError.bind(failIfError, done));
     });
 
     it('identify()', function(done) {
       var params = {
         text: 'this is an important test that needs to work'
       };
-      language_translation.identify(params, failIfError.bind(failIfError, done));
+      language_translator.identify(params, failIfError.bind(failIfError, done));
     });
   });
 
@@ -709,7 +709,7 @@ describe('integration-all-services', function() {
       }, failIfError.bind(failIfError, done));
     });
 
-    describe.only('typedRelations()', function() {
+    describe('typedRelations()', function() {
       it('should process html', function(done) {
         alchemy_language.typedRelations({
           html: text,

test/test.integration-all-services.js

@@ -5,7 +5,7 @@ var watson = require('../lib/index');
 var nock   = require('nock');
 var fs     = require('fs');
 
-describe('language_translation', function() {
+describe('language_translator', function() {
 
   var noop = function() {};
 
@@ -24,7 +24,7 @@ describe('language_translation', function() {
     nock.cleanAll();
   });
 
-  var language_translation = watson.language_translation(service);
+  var language_translator = watson.language_translator(service);
 
   var missingParameter = function(err) {
     assert.ok((err instanceof Error) && /required parameters/.test(err));
@@ -40,7 +40,7 @@ describe('language_translation', function() {
         .get(path)
         .reply(200, corpus);
 
-        var req = language_translation.getModels(null, noop);
+        var req = language_translator.getModels(null, noop);
         assert.equal(req.uri.href, service.url + path);
         assert.equal(req.method, 'GET');
     });
@@ -49,10 +49,10 @@ describe('language_translation', function() {
   describe('translate()', function(){
 
     it('should check no parameters provided', function() {
-      language_translation.translate({source:''}, missingParameter);
-      language_translation.translate({target:''}, missingParameter);
-      language_translation.translate({text:''}, missingParameter);
-      language_translation.translate({model_id:''}, missingParameter);
+      language_translator.translate({source:''}, missingParameter);
+      language_translator.translate({target:''}, missingParameter);
+      language_translator.translate({text:''}, missingParameter);
+      language_translator.translate({model_id:''}, missingParameter);
     });
 
     it('should generate a valid payload', function() {
@@ -65,7 +65,7 @@ describe('language_translation', function() {
         .post(path,service_request)
         .reply(200);
 
-        var req = language_translation.translate(service_request, noop);
+        var req = language_translator.translate(service_request, noop);
         assert.equal(req.uri.href, service.url + path);
         assert.equal(req.method, 'POST');
         var body = new Buffer(req.body).toString('ascii');
@@ -82,7 +82,7 @@ describe('language_translation', function() {
         .get(path)
         .reply(200);
 
-        var req = language_translation.getIdentifiableLanguages(null, noop);
+        var req = language_translator.getIdentifiableLanguages(null, noop);
         assert.equal(req.uri.href, service.url + path);
         assert.equal(req.method, 'GET');
     });
@@ -91,9 +91,9 @@ describe('language_translation', function() {
   describe('identify()', function(){
 
     it('should check no parameters provided', function() {
-      language_translation.identify({}, missingParameter);
-      language_translation.identify(null, missingParameter);
-      language_translation.identify(undefined, missingParameter);
+      language_translator.identify({}, missingParameter);
+      language_translator.identify(null, missingParameter);
+      language_translator.identify(undefined, missingParameter);
     });
 
     it('should generate a valid payload', function() {
@@ -103,7 +103,7 @@ describe('language_translation', function() {
         .post(path,service_request)
         .reply(200);
 
-        var req = language_translation.identify(service_request, noop);
+        var req = language_translator.identify(service_request, noop);
         assert.equal(req.uri.href, service.url + path);
         assert.equal(req.method, 'POST');
         var body = new Buffer(req.body).toString('ascii');
@@ -114,9 +114,9 @@ describe('language_translation', function() {
   describe('createModel()', function(){
 
     it('should check no parameters provided', function() {
-      language_translation.createModel({}, missingParameter);
-      language_translation.createModel(null, missingParameter);
-      language_translation.createModel(undefined, missingParameter);
+      language_translator.createModel({}, missingParameter);
+      language_translator.createModel(null, missingParameter);
+      language_translator.createModel(undefined, missingParameter);
     });
 
     it('should generate a valid payload', function() {
@@ -132,7 +132,7 @@ describe('language_translation', function() {
         .post(path,service_request)
         .reply(200);
 
-        var req = language_translation.createModel(service_request, noop);
+        var req = language_translator.createModel(service_request, noop);
         assert.equal(req.uri.href, service.url + path+ '?base_model_id=foo');
         assert.equal(req.method, 'POST');
     });
@@ -141,9 +141,9 @@ describe('language_translation', function() {
   describe('deleteModel()', function(){
 
     it('should check no parameters provided', function() {
-      language_translation.deleteModel({}, missingParameter);
-      language_translation.deleteModel(null, missingParameter);
-      language_translation.deleteModel(undefined, missingParameter);
+      language_translator.deleteModel({}, missingParameter);
+      language_translator.deleteModel(null, missingParameter);
+      language_translator.deleteModel(undefined, missingParameter);
     });
 
     it('should generate a valid payload', function() {
@@ -156,7 +156,7 @@ describe('language_translation', function() {
         .delete(path,service_request)
         .reply(200);
 
-        var req = language_translation.deleteModel(service_request, noop);
+        var req = language_translator.deleteModel(service_request, noop);
         assert.equal(req.uri.href, service.url + path);
         assert.equal(req.method, 'DELETE');
     });
@@ -165,9 +165,9 @@ describe('language_translation', function() {
   describe('getModel()', function(){
 
     it('should check no parameters provided', function() {
-      language_translation.getModel({}, missingParameter);
-      language_translation.getModel(null, missingParameter);
-      language_translation.getModel(undefined, missingParameter);
+      language_translator.getModel({}, missingParameter);
+      language_translator.getModel(null, missingParameter);
+      language_translator.getModel(undefined, missingParameter);
     });
 
     it('should generate a valid payload', function() {
@@ -180,7 +180,7 @@ describe('language_translation', function() {
         .get(path,service_request)
         .reply(200);
 
-        var req = language_translation.getModel(service_request, noop);
+        var req = language_translator.getModel(service_request, noop);
         assert.equal(req.uri.href, service.url + path);
         assert.equal(req.method, 'GET');
     });