fix(service): $nextLang should be not unset parallel loadings

resolves #647
angular-translate · Sep 18, 2014 · d1745e4 · d1745e4
1 parent b685601
commit d1745e4
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/service/translate.js b/src/service/translate.js
@@ -1455,12 +1455,14 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
             translations(translation.key, translation.table);
             deferred.resolve(translation.key);
 
+            useLanguage(translation.key);
             if ($nextLang === key) {
-              useLanguage(translation.key);
               $nextLang = undefined;
             }
           }, function (key) {
-            $nextLang = undefined;
+            if ($nextLang === key) {
+              $nextLang = undefined;
+            }
             $rootScope.$emit('$translateChangeError', {language: key});
             deferred.reject(key);
             $rootScope.$emit('$translateChangeEnd', {language: key});