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 edge-case with .use() and .preferredLanguage()
Browse files Browse the repository at this point in the history
Fix and cover edge case where fallback language is set and preferred language is determined. but use is not explicitly called before calling the $translate service
  • Loading branch information
tspaeth authored and knalli committed Mar 20, 2016
1 parent cb31608 commit 02688f2
Show file tree
Hide file tree
Showing 2 changed files with 64 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/service/translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,9 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
startFallbackIteration;

var $translate = function (translationId, interpolateParams, interpolationId, defaultTranslationText, forceLanguage) {

if (!$uses && $preferredLanguage) {
$uses = $preferredLanguage;
}
var uses = (forceLanguage && forceLanguage !== $uses) ? // we don't want to re-negotiate $uses
(negotiateLocale(forceLanguage) || forceLanguage) : $uses;

Expand Down
61 changes: 61 additions & 0 deletions test/unit/service/translate.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -2789,4 +2789,65 @@ describe('pascalprecht.translate', function () {
});
});
});

// Spec for edge case: preferred language is not found
// but another fallback language has a translation file available
// or any other async case
describe('$translate with async loading having an invalid preferredLang and one fallbackLang existing', function () {

var theFallbackLangKey = 'en_US',
thePreferredLangKey = 'ab_CD',
expectedTranslation = 'foo bar bork bork bork',
firstLanguageResponded = false,
secondLanguageResponded = false;

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

$translateProvider.useLoader('customLoader');

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

$provide.service('customLoader', function ($q, $timeout) {
return function (options) {
var deferred = $q.defer();
var locale = options.key;

if (locale === theFallbackLangKey) {
secondLanguageResponded = true;
deferred.resolve({
greeting: expectedTranslation
});
}

if (locale === thePreferredLangKey) {
deferred.reject(thePreferredLangKey);
}

return deferred.promise;
};
});
}));

var $translate;

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

}));

it('should set the language to be the most recently requested one, not the most recently responded one', inject(function ($rootScope, $q) {

var value;

$translate('greeting').then(function (translation) {
value = translation;
});

$rootScope.$digest();
expect(value).toEqual(expectedTranslation);
expect(secondLanguageResponded).toEqual(true);
}));
});
});

0 comments on commit 02688f2

Please sign in to comment.