fix(): fix npe on empty strings (trim())

solves #435 solves again #281, #281, #298
angular-translate · Apr 22, 2014 · c69de7b · c69de7b
1 parent 3c54a77
commit c69de7b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/service/translate.js b/src/service/translate.js
@@ -734,7 +734,9 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
         var deferred = $q.defer();
 
         // trim off any whitespace
-        translationId = translationId.trim();
+        if (translationId) {
+          translationId = translationId.trim();
+        }
 
         var promiseToWaitFor = (function () {
           var promise = $preferredLanguage ?
@@ -1523,7 +1525,10 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
           return translationId;
         }
 
-        translationId = translationId.trim();
+        // trim off any whitespace
+        if (translationId) {
+          translationId = translationId.trim();
+        }
 
         var result, possibleLangKeys = [];
         if ($preferredLanguage) {