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

Commit

Permalink
fix(service provider): change/fix return of preferredLanguage()
Browse files Browse the repository at this point in the history
`$translateProvider.preferredLanguage()` was not returning the preferredLanguage
when used as an getter just like other methods. This is a fix.

As a result, this allows getting the preferred language during configuration phase.

Relates #1165
  • Loading branch information
michaellieberherr authored and knalli committed Aug 30, 2015
1 parent 78161f8 commit 6014a81
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/service/translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,13 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
* only that it says which language to **prefer**.
*
* @param {string} langKey A language key.
*
*/
this.preferredLanguage = function(langKey) {
setupPreferredLanguage(langKey);
return this;

if (langKey) {
setupPreferredLanguage(langKey);
return this;
}
return $preferredLanguage;
};
var setupPreferredLanguage = function (langKey) {
if (langKey) {
Expand Down
17 changes: 17 additions & 0 deletions test/unit/service/translate.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,23 @@ describe('pascalprecht.translate', function () {
});
});

describe('$translateProvider#preferredLanguage()', function () {
var translateProvider;

beforeEach(module('pascalprecht.translate', function($translateProvider) {
translateProvider = $translateProvider;
translateProvider.preferredLanguage('de_DE');
}));

it('should return a string if language is specified', inject(function () {
expect(typeof translateProvider.preferredLanguage()).toBe('string');
}));

it('should return a correct language code', inject(function () {
expect(translateProvider.preferredLanguage()).toEqual('de_DE');
}));
});

describe('$translate#fallbackLanguage()', function () {

describe('single fallback language', function () {
Expand Down

0 comments on commit 6014a81

Please sign in to comment.