From 6adc5aca1d9da954bc55e4b1ca90d910e511dae2 Mon Sep 17 00:00:00 2001
From: Alfonso Mateo Riego <fonriego@gmail.com>
Date: Wed, 31 Oct 2018 12:23:39 +0100
Subject: [PATCH] Refactor Done

---
 src/server.js     |  8 ++++----
 src/translator.js | 37 ++++++++++++++-----------------------
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/server.js b/src/server.js
index f674093..abd72a5 100644
--- a/src/server.js
+++ b/src/server.js
@@ -1,11 +1,11 @@
-var translate = require('./translator')
+const translate = require('./translator')
 
-var text = "quiero trabajar con los mejores"
-var targetLang = 'en'
+const text = "quiero trabajar con los mejores"
+const targetLang = 'en'
 
 console.log(translate);
 
-translate.translateText(text, targetLang, function (err, result) {
+translate.translateText(text, targetLang, (err, result) => {
 
   if (err) {
     next(err);
diff --git a/src/translator.js b/src/translator.js
index d4dd359..7523e4c 100644
--- a/src/translator.js
+++ b/src/translator.js
@@ -1,33 +1,24 @@
 "use strict";
 
-var Translate = require('@google-cloud/translate');
-var async = require('async');
+const Translate = require('@google-cloud/translate');
+const async = require('async');
 
-var TranslateService = {};
-var translate = new Translate({
+const TranslateService = {};
+const translate = new Translate({
   keyFilename: './src/translator.conf.json',
 });
 
-TranslateService.translateText = function (content, targetLang, next) {
+TranslateService.translateText = (async (content, targetLang, next) => {
 
-  var calls = [];
-
-  calls.push(function (callback) {
-
-    translate
-      .translate( content, targetLang )
-      .then(results => {
-        return callback(null, results[0]);
-      })
-      .catch(err => {
-        console.error('ERROR:', err);
-      });
-  });
-
-  async.waterfall(calls, function (err, response) {
-    if (next) next(err, response);
-  });
-};
+  try {
+    const calls = [];
+    calls.push(await translate.translate(content, targetLang)[0])
 
+  } catch {
+    (err, response) => {
+      if (next) next(err, response);
+    };
+  }
+});
 
 module.exports = TranslateService;