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

Commit

Permalink
fix(service): addition of preferred language to fallback language sta…
Browse files Browse the repository at this point in the history
…ck is now preventing duplication if already contained in the fallback stack

feat(service): preferredLanguage can now be set during runtime
  • Loading branch information
tspaeth authored and 0x-r4bbit committed Jul 7, 2014
1 parent 47fc943 commit b2bb166
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions src/service/translate.js
Original file line number Diff line number Diff line change
Expand Up @@ -277,13 +277,16 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
*
*/
this.preferredLanguage = function(langKey) {
setupPreferredLanguage(langKey);
return this;

};
var setupPreferredLanguage = function (langKey) {
if (langKey) {
$preferredLanguage = langKey;
return this;
}
return $preferredLanguage;
};

}
/**
* @ngdoc function
* @name pascalprecht.translate.$translateProvider#translationNotFoundIndicator
Expand Down Expand Up @@ -374,7 +377,7 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
$fallbackWasString = false;
$fallbackLanguage = langKey;
}
if (angular.isString($preferredLanguage)) {
if (angular.isString($preferredLanguage) && $fallbackLanguage.indexOf($preferredLanguage) < 0) {
$fallbackLanguage.push($preferredLanguage);
}

Expand Down Expand Up @@ -1230,9 +1233,14 @@ angular.module('pascalprecht.translate').provider('$translate', ['$STORAGE_KEY',
* @description
* Returns the language key for the preferred language.
*
* @param {string} langKey language String or Array to be used as preferredLanguage (changing at runtime)
*
* @return {string} preferred language key
*/
$translate.preferredLanguage = function () {
$translate.preferredLanguage = function (langKey) {
if(langKey) {
setupPreferredLanguage(langKey);
}
return $preferredLanguage;
};

Expand Down

0 comments on commit b2bb166

Please sign in to comment.