Skip to content
This repository has been archived by the owner on Jan 29, 2024. It is now read-only.

Commit

Permalink
fix(service): fix infinite loop when fallback language async loading …
Browse files Browse the repository at this point in the history
…fails
  • Loading branch information
Nathaniel Henel authored and knalli committed Sep 5, 2016
1 parent f6bd4c0 commit 233f30c
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/service/translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -1910,7 +1910,7 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
return translation;
}, function (key) {
// find first available fallback language if that request has failed
if (!$uses && $fallbackLanguage && $fallbackLanguage.length > 0) {
if (!$uses && $fallbackLanguage && $fallbackLanguage.length > 0 && $fallbackLanguage[0] !== key) {
return $translate.use($fallbackLanguage[0]).then(deferred.resolve, deferred.reject);
} else {
return deferred.reject(key);
Expand Down
41 changes: 41 additions & 0 deletions test/unit/service/translate.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2877,4 +2877,45 @@ describe('pascalprecht.translate', function () {
expect(secondLanguageResponded).toEqual(true);
}));
});

// Spec for edge case: preferred and fallback language are not found
describe('$translate with async loading having an invalid preferredLang and one fallbackLang existing', function () {

var theFallbackLangKey = 'ef_GH',
thePreferredLangKey = 'ab_CD';

beforeEach(module('pascalprecht.translate', function ($translateProvider, $provide) {

$translateProvider.useLoader('customLoader');

$translateProvider.preferredLanguage(thePreferredLangKey);
$translateProvider.fallbackLanguage(theFallbackLangKey);

$provide.service('customLoader', function ($q) {
return function (options) {
var locale = options.key;
return $q.reject(locale);
};
});
}));

var $translate;

beforeEach(inject(function ($timeout, _$translate_, $rootScope) {
$translate = _$translate_;
$rootScope.$digest();
}));

it('should fail without going into infinite loop', inject(function ($rootScope) {

var failed = false;

$translate('greeting').catch(function () {
failed = true;
});

$rootScope.$digest();
expect(failed).toEqual(true);
}));
});
});

0 comments on commit 233f30c

Please sign in to comment.