fix(tjo): require language param and fix mocked data

KhaledMohamedP · Jul 1, 2017 · 72be8d2 · 72be8d2
1 parent 7e0ea9d
commit 72be8d2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 16 deletions.
diff --git a/__mocks__/mock-data.js b/__mocks__/mock-data.js
@@ -1,6 +1,6 @@
 
-const mockDataObject = {name: 'name', some: [{name: 'j'}], addressField: ['city', 'state', 'zipdecode'], bool: true, num: 33, badBool: false, nully: null, undefined: undefined};
-const transaltedES = {name: 'name-es', some: [{name: 'j-es'}], addressField: ['city-es', 'state-es', 'zipdecode-es'], bool: true, num: 33, badBool: false, nully: null, undfined: undefined};
+const mockDataObject = {name: 'name', some: [{name: 'j'}], addressField: ['city', 'state', 'zipdecode'], bool: true, num: 33, badBool: false, nully: null, undefin: undefined};
+const transaltedES = {name: 'name-es', some: [{name: 'j-es'}], addressField: ['city-es', 'state-es', 'zipdecode-es'], bool: true, num: 33, badBool: false, nully: null, undefin: undefined};
 
 module.exports = {
 	mockDataObject,

diff --git a/lib/service/google.js b/lib/service/google.js
@@ -38,12 +38,6 @@ function translateObject(language, key, destObj) {
 
 function translateString(language, key, destObj, valueStr) {
 	return new Promise(function (resolve, reject) {
-		// If empty string don't call google
-		if (valueStr === '') {
-			resolve(destObj);
-			return;
-		}
-
 		translateService.translate(valueStr, language, function (err, res) {
 			if (err || !res) {
 				reject(err);

diff --git a/lib/service/yandex.js b/lib/service/yandex.js
@@ -39,12 +39,6 @@ function translateObject(language, key, destObj) {
 
 function translateString(language, key, destObj, valueStr) {
 	return new Promise(function (resolve, reject) {
-		if (valueStr === '') {
-			// there is nothing to translate, so don't ask Yandex (Yandex will respond with an error)
-			resolve(destObj);
-			return;
-		}
-
 		translateService.translate(valueStr, {to: language}, function (err, res) {
 			if (err || res.code !== 200) {
 				reject(err || res);

diff --git a/lib/translate-json-object.js b/lib/translate-json-object.js
@@ -50,7 +50,7 @@ function TranslateJSONObject() {
 			);
 		}
 
-		if (_.isString(language)) {
+		if (!_.isString(language)) {
 			return Promise.reject('Please provide a language param [type String] e.g. translate(obj, es)');
 		}
 
@@ -78,7 +78,7 @@ function TranslateJSONObject() {
 		function handleArrayType(value, key, destObj) {
 			if (_.isPlainObject(value)) {
 				translateObjectProps(value, key, destObj);
-			} else if (_.isString(value)) {
+			} else if (_.isString(value) && value !== '') {
 				promises.push(translateSrv.string(language, key, destObj, value));
 			}
 		}