fix($translate): checks modification

angular-translate · May 31, 2014 · b91e4de · b91e4de
1 parent 1c265c7
commit b91e4de
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/service/translate.js b/src/service/translate.js
@@ -1526,6 +1526,11 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
        */
       $translate.instant = function (translationId, interpolateParams, interpolationId) {
 
+        // Detect undefined and null values to shorten the execution and prevent exceptions
+        if (translationId === null || angular.isUndefined(translationId)) {
+          return translationId;
+        }
+
         // Duck detection: If the first argument is an array, a bunch of translations was requested.
         // The result is an object.
         if (angular.isArray(translationId)) {
@@ -1536,7 +1541,8 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
           return results;
         }
 
-        if (typeof translationId === 'undefined' || translationId === '') {
+        // We discarded unacceptable values. So we just need to verify if translationId is empty String
+        if (angular.isString(translationId) && translationId.length < 1) {
           return translationId;
         }