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

Commit

Permalink
fix($translate): use case-insensitive check for language key aliases
Browse files Browse the repository at this point in the history
When language key aliases are available they are now compared to the browsers locale in a case-insensitive manner.

Closes Issue #431
  • Loading branch information
Manuel Ohlendorf authored and 0x-r4bbit committed Apr 2, 2014
1 parent b345041 commit 26ec308
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 6 deletions.
14 changes: 8 additions & 6 deletions src/service/translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,14 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
}

if ($languageKeyAliases) {

if ($languageKeyAliases[preferred]) {
var alias = $languageKeyAliases[preferred];

if (avail.indexOf(angular.lowercase(alias)) > -1) {
return alias;
var alias;
for (var langKeyAlias in $languageKeyAliases) {
if ($languageKeyAliases.hasOwnProperty(langKeyAlias) &&
angular.lowercase(langKeyAlias) === angular.lowercase(preferred)) {
alias = $languageKeyAliases[langKeyAlias];
if (avail.indexOf(angular.lowercase(alias)) > -1) {
return alias;
}
}
}
}
Expand Down
43 changes: 43 additions & 0 deletions test/unit/service/translate.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1158,6 +1158,49 @@ describe('pascalprecht.translate', function () {
});
});
});

describe('with locale negotiation and lower-case navigation language', function () {

beforeEach(module('pascalprecht.translate', function ($translateProvider) {
$translateProvider
.translations('en', { FOO: 'bar' })
.translations('de', { FOO: 'foo' })
.registerAvailableLanguageKeys(['en', 'de'], {
'en_US': 'en',
'de_DE': 'de'
})
.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('_');
});
}));

it('should determine browser language', function () {
inject(function ($translate, $q, $rootScope) {
var deferred = $q.defer(),
promise = deferred.promise,
value;

promise.then(function (foo) {
value = foo;
});
$translate('FOO').then(function (translation) {
deferred.resolve(translation);
});
$rootScope.$digest();
expect(value).toEqual('bar');
});
});
});
});

describe('$translate.instant', function () {
Expand Down

0 comments on commit 26ec308

Please sign in to comment.