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

Commit

Permalink
fix($translateProvider): determinePreferredLanguage was not chainable
Browse files Browse the repository at this point in the history
If registerAvailableLanguageKeys() was called without the aliases
parameter determinePreferredLanguage() was not chainable, because it
did not return this. Fix it and cover it with a test case.

Closes #487
  • Loading branch information
kleinph authored and 0x-r4bbit committed Apr 21, 2014
1 parent 7646925 commit 7c29f2f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/service/translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -623,10 +623,11 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',

if (!$availableLanguageKeys.length) {
$preferredLanguage = locale;
return this;
} else {
$preferredLanguage = negotiateLocale(locale);
}

return this;
};

/**
Expand Down
24 changes: 24 additions & 0 deletions test/unit/service/translate.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1222,6 +1222,8 @@ describe('pascalprecht.translate', function () {

describe('with locale negotiation w/o aliases', function () {

var translateProvider;

beforeEach(module('pascalprecht.translate', function ($translateProvider) {
$translateProvider
.translations('en', { FOO: 'bar' })
Expand All @@ -1240,6 +1242,8 @@ describe('pascalprecht.translate', function () {
nav.userLanguage
) || '').split('-').join('_');
});

translateProvider = $translateProvider;
}));

it('should determine browser language', function () {
Expand All @@ -1258,6 +1262,26 @@ describe('pascalprecht.translate', function () {
expect(value).toEqual('bar');
});
});

it('should be chainable', function () {
inject(function () {
var ret = translateProvider.determinePreferredLanguage(function () {
// mocking
// Work's like `window.navigator.lang = 'en_US'`
var nav = {
language: 'en_US'
};
return ((
nav.language ||
nav.browserLanguage ||
nav.systemLanguage ||
nav.userLanguage
) || '').split('-').join('_');
});

expect(ret).toEqual(translateProvider);
});
});
});
});

Expand Down

0 comments on commit 7c29f2f

Please sign in to comment.