Skip to content

A
angular-translate
Commit a9af1f71 authored by bingchuan's avatar bingchuan
Browse files
Options

[dev]version 2.18.4

parent 9ee5cd2f
Show whitespace changes
Inline Side-by-side
Showing with 3482 additions and 3395 deletions
angular-translate.js
View file @ a9af1f71
/*! /*!
* angular-translate - v2.13.1 - 2016-12-06 * angular-translate - v2.18.4 - 2021-01-14
* *
* Copyright (c) 2016 The angular-translate team, Pascal Precht; Licensed MIT * Copyright (c) 2021 The angular-translate team, Pascal Precht; Licensed MIT
*/ */
(function (root, factory) { (function (root, factory) {
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
define([], function () { define([], function () {
return (factory()); return (factory());
}); });
} else if (typeof exports === 'object') { } else if (typeof module === 'object' && module.exports) {
// Node. Does not work with strict CommonJS, but // Node. Does not work with strict CommonJS, but
// only CommonJS-like environments that support module.exports, // only CommonJS-like environments that support module.exports,
// like Node. // like Node.
...@@ -19,25 +19,25 @@ ...@@ -19,25 +19,25 @@
} }
}(this, function () { }(this, function () {
/** /**
* @ngdoc overview * @ngdoc overview
* @name pascalprecht.translate * @name pascalprecht.translate
* *
* @description * @description
* The main module which holds everything together. * The main module which holds everything together.
*/ */
runTranslate.$inject = ['$translate']; runTranslate.$inject = ['$translate'];
$translate.$inject = ['$STORAGE_KEY', '$windowProvider', '$translateSanitizationProvider', 'pascalprechtTranslateOverrider']; $translate.$inject = ['$STORAGE_KEY', '$windowProvider', '$translateSanitizationProvider', 'pascalprechtTranslateOverrider'];
$translateDefaultInterpolation.$inject = ['$interpolate', '$translateSanitization']; $translateDefaultInterpolation.$inject = ['$interpolate', '$translateSanitization'];
translateDirective.$inject = ['$translate', '$interpolate', '$compile', '$parse', '$rootScope']; translateDirective.$inject = ['$translate', '$interpolate', '$compile', '$parse', '$rootScope'];
translateAttrDirective.$inject = ['$translate', '$rootScope']; translateAttrDirective.$inject = ['$translate', '$rootScope'];
translateCloakDirective.$inject = ['$translate', '$rootScope']; translateCloakDirective.$inject = ['$translate', '$rootScope'];
translateFilterFactory.$inject = ['$parse', '$translate']; translateFilterFactory.$inject = ['$parse', '$translate'];
$translationCache.$inject = ['$cacheFactory']; $translationCache.$inject = ['$cacheFactory'];
angular.module('pascalprecht.translate', ['ng']) angular.module('pascalprecht.translate', ['ng'])
.run(runTranslate); .run(runTranslate);
function runTranslate($translate) { function runTranslate($translate) {
'use strict'; 'use strict';
...@@ -66,11 +66,11 @@ ...@@ -66,11 +66,11 @@
} else if (angular.isString($translate.preferredLanguage())) { } else if (angular.isString($translate.preferredLanguage())) {
$translate.use($translate.preferredLanguage()); $translate.use($translate.preferredLanguage());
} }
} }
runTranslate.displayName = 'runTranslate'; runTranslate.displayName = 'runTranslate';
/** /**
* @ngdoc object * @ngdoc object
* @name pascalprecht.translate.$translateSanitizationProvider * @name pascalprecht.translate.$translateSanitizationProvider
* *
...@@ -78,9 +78,9 @@ ...@@ -78,9 +78,9 @@
* *
* Configurations for $translateSanitization * Configurations for $translateSanitization
*/ */
angular.module('pascalprecht.translate').provider('$translateSanitization', $translateSanitizationProvider); angular.module('pascalprecht.translate').provider('$translateSanitization', $translateSanitizationProvider);
function $translateSanitizationProvider () { function $translateSanitizationProvider () {
'use strict'; 'use strict';
...@@ -373,13 +373,17 @@ ...@@ -373,13 +373,17 @@
return result; return result;
} else if (angular.isNumber(value)) { } else if (angular.isNumber(value)) {
return value; return value;
} else { } else if (value === true || value === false) {
return value;
} else if (!angular.isUndefined(value) && value !== null) {
return iteratee(value); return iteratee(value);
} else {
return value;
} }
}; };
} }
/** /**
* @ngdoc object * @ngdoc object
* @name pascalprecht.translate.$translateProvider * @name pascalprecht.translate.$translateProvider
* @description * @description
...@@ -388,11 +392,11 @@ ...@@ -388,11 +392,11 @@
* and similar to configure translation behavior directly inside of a module. * and similar to configure translation behavior directly inside of a module.
* *
*/ */
angular.module('pascalprecht.translate') angular.module('pascalprecht.translate')
.constant('pascalprechtTranslateOverrider', {}) .constant('pascalprechtTranslateOverrider', {})
.provider('$translate', $translate); .provider('$translate', $translate);
function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvider, pascalprechtTranslateOverrider) { function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvider, pascalprechtTranslateOverrider) {
'use strict'; 'use strict';
...@@ -437,7 +441,29 @@ ...@@ -437,7 +441,29 @@
bcp47 : function (tag) { bcp47 : function (tag) {
var temp = (tag || '').split('_').join('-'); var temp = (tag || '').split('_').join('-');
var parts = temp.split('-'); var parts = temp.split('-');
return parts.length > 1 ? (parts[0].toLowerCase() + '-' + parts[1].toUpperCase()) : temp;
switch (parts.length) {
case 1: // language only
parts[0] = parts[0].toLowerCase();
break;
case 2: // language-script or language-region
parts[0] = parts[0].toLowerCase();
if (parts[1].length === 4) { // parts[1] is script
parts[1] = parts[1].charAt(0).toUpperCase() + parts[1].slice(1).toLowerCase();
} else { // parts[1] is region
parts[1] = parts[1].toUpperCase();
}
break;
case 3: // language-script-region
parts[0] = parts[0].toLowerCase();
parts[1] = parts[1].charAt(0).toUpperCase() + parts[1].slice(1).toLowerCase();
parts[2] = parts[2].toUpperCase();
break;
default:
return temp;
}
return parts.join('-');
}, },
'iso639-1' : function (tag) { 'iso639-1' : function (tag) {
var temp = (tag || '').split('_').join('-'); var temp = (tag || '').split('_').join('-');
...@@ -446,7 +472,7 @@ ...@@ -446,7 +472,7 @@
} }
}; };
var version = '2.13.1'; var version = '2.18.4';
// tries to determine the browsers language // tries to determine the browsers language
var getFirstBrowserLanguage = function () { var getFirstBrowserLanguage = function () {
...@@ -527,23 +553,37 @@ ...@@ -527,23 +553,37 @@
return this.toString().replace(/^\s+|\s+$/g, ''); return this.toString().replace(/^\s+|\s+$/g, '');
}; };
/**
* @name lowercase
* @private
*
* @description
* Return the lowercase string only if the type is string
*
* @returns {string} The string all in lowercase
*/
var lowercase = function (string) {
return angular.isString(string) ? string.toLowerCase() : string;
};
var negotiateLocale = function (preferred) { var negotiateLocale = function (preferred) {
if (!preferred) { if (!preferred) {
return; return;
} }
var avail = [], var avail = [],
locale = angular.lowercase(preferred), locale = lowercase(preferred),
i = 0, i = 0,
n = $availableLanguageKeys.length; n = $availableLanguageKeys.length;
for (; i < n; i++) { for (; i < n; i++) {
avail.push(angular.lowercase($availableLanguageKeys[i])); avail.push(lowercase($availableLanguageKeys[i]));
} }
// Check for an exact match in our list of available keys // Check for an exact match in our list of available keys
if (indexOf(avail, locale) > -1) { i = indexOf(avail, locale);
return preferred; if (i > -1) {
return $availableLanguageKeys[i];
} }
if ($languageKeyAliases) { if ($languageKeyAliases) {
...@@ -552,14 +592,14 @@ ...@@ -552,14 +592,14 @@
if ($languageKeyAliases.hasOwnProperty(langKeyAlias)) { if ($languageKeyAliases.hasOwnProperty(langKeyAlias)) {
var hasWildcardKey = false; var hasWildcardKey = false;
var hasExactKey = Object.prototype.hasOwnProperty.call($languageKeyAliases, langKeyAlias) && var hasExactKey = Object.prototype.hasOwnProperty.call($languageKeyAliases, langKeyAlias) &&
angular.lowercase(langKeyAlias) === angular.lowercase(preferred); lowercase(langKeyAlias) === lowercase(preferred);
if (langKeyAlias.slice(-1) === '*') { if (langKeyAlias.slice(-1) === '*') {
hasWildcardKey = langKeyAlias.slice(0, -1) === preferred.slice(0, langKeyAlias.length - 1); hasWildcardKey = lowercase(langKeyAlias.slice(0, -1)) === lowercase(preferred.slice(0, langKeyAlias.length - 1));
} }
if (hasExactKey || hasWildcardKey) { if (hasExactKey || hasWildcardKey) {
alias = $languageKeyAliases[langKeyAlias]; alias = $languageKeyAliases[langKeyAlias];
if (indexOf(avail, angular.lowercase(alias)) > -1) { if (indexOf(avail, lowercase(alias)) > -1) {
return alias; return alias;
} }
} }
...@@ -570,7 +610,7 @@ ...@@ -570,7 +610,7 @@
// Check for a language code without region // Check for a language code without region
var parts = preferred.split('_'); var parts = preferred.split('_');
if (parts.length > 1 && indexOf(avail, angular.lowercase(parts[0])) > -1) { if (parts.length > 1 && indexOf(avail, lowercase(parts[0])) > -1) {
return parts[0]; return parts[0];
} }
...@@ -783,6 +823,7 @@ ...@@ -783,6 +823,7 @@
* Tells the module which of the registered translation tables to use for translation * Tells the module which of the registered translation tables to use for translation
* at initial startup by passing a language key. Similar to `$translateProvider#use` * at initial startup by passing a language key. Similar to `$translateProvider#use`
* only that it says which language to **prefer**. * only that it says which language to **prefer**.
* It is recommended to call this after {@link pascalprecht.translate.$translate#fallbackLanguage fallbackLanguage()}.
* *
* @param {string} langKey A language key. * @param {string} langKey A language key.
*/ */
...@@ -1191,9 +1232,12 @@ ...@@ -1191,9 +1232,12 @@
* en_US => en_US * en_US => en_US
* en-us => en_US * en-us => en_US
* * BCP 47 (RFC 4646 & 4647) * * BCP 47 (RFC 4646 & 4647)
* EN => en
* en-US => en-US * en-US => en-US
* en_US => en-US * en_US => en-US
* en-us => en-US * en-us => en-US
* sr-latn => sr-Latn
* sr-latn-rs => sr-Latn-RS
* *
* See also: * See also:
* * http://en.wikipedia.org/wiki/IETF_language_tag * * http://en.wikipedia.org/wiki/IETF_language_tag
...@@ -1419,11 +1463,12 @@ ...@@ -1419,11 +1463,12 @@
* This can be optionally an array of translation ids which * This can be optionally an array of translation ids which
* results that the function returns an object where each key * results that the function returns an object where each key
* is the translation id and the value the translation. * is the translation id and the value the translation.
* @param {object=} interpolateParams An object hash for dynamic values * @param {object=} [interpolateParams={}] An object hash for dynamic values
* @param {string} interpolationId The id of the interpolation to use * @param {string=} [interpolationId=undefined] The id of the interpolation to use (use default unless set via useInterpolation())
* @param {string} defaultTranslationText the optional default translation text that is written as * @param {string=} [defaultTranslationText=undefined] the optional default translation text that is written as
* as default text in case it is not found in any configured language * as default text in case it is not found in any configured language
* @param {string} forceLanguage A language to be used instead of the current language * @param {string=} [forceLanguage=false] A language to be used instead of the current language
* @param {string=} [sanitizeStrategy=undefined] force sanitize strategy for this call instead of using the configured one (use default unless set)
* @returns {object} promise * @returns {object} promise
*/ */
this.$get = ['$log', '$injector', '$rootScope', '$q', function ($log, $injector, $rootScope, $q) { this.$get = ['$log', '$injector', '$rootScope', '$q', function ($log, $injector, $rootScope, $q) {
...@@ -1436,7 +1481,7 @@ ...@@ -1436,7 +1481,7 @@
fallbackIndex, fallbackIndex,
startFallbackIteration; startFallbackIteration;
var $translate = function (translationId, interpolateParams, interpolationId, defaultTranslationText, forceLanguage) { var $translate = function (translationId, interpolateParams, interpolationId, defaultTranslationText, forceLanguage, sanitizeStrategy) {
if (!$uses && $preferredLanguage) { if (!$uses && $preferredLanguage) {
$uses = $preferredLanguage; $uses = $preferredLanguage;
} }
...@@ -1465,7 +1510,7 @@ ...@@ -1465,7 +1510,7 @@
deferred.resolve([translationId, value]); deferred.resolve([translationId, value]);
}; };
// we don't care whether the promise was resolved or rejected; just store the values // we don't care whether the promise was resolved or rejected; just store the values
$translate(translationId, interpolateParams, interpolationId, defaultTranslationText, forceLanguage).then(regardless, regardless); $translate(translationId, interpolateParams, interpolationId, defaultTranslationText, forceLanguage, sanitizeStrategy).then(regardless, regardless);
return deferred.promise; return deferred.promise;
}; };
for (var i = 0, c = translationIds.length; i < c; i++) { for (var i = 0, c = translationIds.length; i < c; i++) {
...@@ -1485,12 +1530,12 @@ ...@@ -1485,12 +1530,12 @@
// trim off any whitespace // trim off any whitespace
if (translationId) { if (translationId) {
translationId = trim.apply(translationId); translationId = trim.apply(translationId);
} else {
throw new TypeError('translationId must be a not empty string');
} }
var promiseToWaitFor = (function () { var promiseToWaitFor = (function () {
var promise = $preferredLanguage ? var promise = langPromises[uses] || langPromises[$preferredLanguage];
langPromises[$preferredLanguage] :
langPromises[uses];
fallbackIndex = 0; fallbackIndex = 0;
...@@ -1522,18 +1567,18 @@ ...@@ -1522,18 +1567,18 @@
// no promise to wait for? okay. Then there's no loader registered // no promise to wait for? okay. Then there's no loader registered
// nor is a one pending for language that comes from storage. // nor is a one pending for language that comes from storage.
// We can just translate. // We can just translate.
determineTranslation(translationId, interpolateParams, interpolationId, defaultTranslationText, uses).then(deferred.resolve, deferred.reject); determineTranslation(translationId, interpolateParams, interpolationId, defaultTranslationText, uses, sanitizeStrategy).then(deferred.resolve, deferred.reject);
} else { } else {
var promiseResolved = function () { var promiseResolved = function () {
// $uses may have changed while waiting // $uses may have changed while waiting
if (!forceLanguage) { if (!forceLanguage) {
uses = $uses; uses = $uses;
} }
determineTranslation(translationId, interpolateParams, interpolationId, defaultTranslationText, uses).then(deferred.resolve, deferred.reject); determineTranslation(translationId, interpolateParams, interpolationId, defaultTranslationText, uses, sanitizeStrategy).then(deferred.resolve, deferred.reject);
}; };
promiseResolved.displayName = 'promiseResolved'; promiseResolved.displayName = 'promiseResolved';
promiseToWaitFor['finally'](promiseResolved); promiseToWaitFor['finally'](promiseResolved)['catch'](angular.noop); // we don't care about errors here, already handled
} }
return deferred.promise; return deferred.promise;
}; };
...@@ -1601,7 +1646,7 @@ ...@@ -1601,7 +1646,7 @@
* @private * @private
* *
* @description * @description
* Kicks of registered async loader using `$injector` and applies existing * Kicks off registered async loader using `$injector` and applies existing
* loader options. When resolved, it updates translation tables accordingly * loader options. When resolved, it updates translation tables accordingly
* or rejects with given language key. * or rejects with given language key.
* *
...@@ -1728,20 +1773,21 @@ ...@@ -1728,20 +1773,21 @@
* @param translationId * @param translationId
* @param interpolateParams * @param interpolateParams
* @param Interpolator * @param Interpolator
* @param sanitizeStrategy
* @returns {Q.promise} * @returns {Q.promise}
*/ */
var getFallbackTranslation = function (langKey, translationId, interpolateParams, Interpolator) { var getFallbackTranslation = function (langKey, translationId, interpolateParams, Interpolator, sanitizeStrategy) {
var deferred = $q.defer(); var deferred = $q.defer();
var onResolve = function (translationTable) { var onResolve = function (translationTable) {
if (Object.prototype.hasOwnProperty.call(translationTable, translationId)) { if (Object.prototype.hasOwnProperty.call(translationTable, translationId) && translationTable[translationId] !== null) {
Interpolator.setLocale(langKey); Interpolator.setLocale(langKey);
var translation = translationTable[translationId]; var translation = translationTable[translationId];
if (translation.substr(0, 2) === '@:') { if (translation.substr(0, 2) === '@:') {
getFallbackTranslation(langKey, translation.substr(2), interpolateParams, Interpolator) getFallbackTranslation(langKey, translation.substr(2), interpolateParams, Interpolator, sanitizeStrategy)
.then(deferred.resolve, deferred.reject); .then(deferred.resolve, deferred.reject);
} else { } else {
var interpolatedValue = Interpolator.interpolate(translationTable[translationId], interpolateParams, 'service'); var interpolatedValue = Interpolator.interpolate(translationTable[translationId], interpolateParams, 'service', sanitizeStrategy, translationId);
interpolatedValue = applyPostProcessing(translationId, translationTable[translationId], interpolatedValue, interpolateParams, langKey); interpolatedValue = applyPostProcessing(translationId, translationTable[translationId], interpolatedValue, interpolateParams, langKey);
deferred.resolve(interpolatedValue); deferred.resolve(interpolatedValue);
...@@ -1778,9 +1824,9 @@ ...@@ -1778,9 +1824,9 @@
var getFallbackTranslationInstant = function (langKey, translationId, interpolateParams, Interpolator, sanitizeStrategy) { var getFallbackTranslationInstant = function (langKey, translationId, interpolateParams, Interpolator, sanitizeStrategy) {
var result, translationTable = $translationTable[langKey]; var result, translationTable = $translationTable[langKey];
if (translationTable && Object.prototype.hasOwnProperty.call(translationTable, translationId)) { if (translationTable && Object.prototype.hasOwnProperty.call(translationTable, translationId) && translationTable[translationId] !== null) {
Interpolator.setLocale(langKey); Interpolator.setLocale(langKey);
result = Interpolator.interpolate(translationTable[translationId], interpolateParams, 'filter', sanitizeStrategy); result = Interpolator.interpolate(translationTable[translationId], interpolateParams, 'filter', sanitizeStrategy, translationId);
result = applyPostProcessing(translationId, translationTable[translationId], result, interpolateParams, langKey, sanitizeStrategy); result = applyPostProcessing(translationId, translationTable[translationId], result, interpolateParams, langKey, sanitizeStrategy);
// workaround for TrustedValueHolderType // workaround for TrustedValueHolderType
if (!angular.isString(result) && angular.isFunction(result.$$unwrapTrustedValue)) { if (!angular.isString(result) && angular.isFunction(result.$$unwrapTrustedValue)) {
...@@ -1833,21 +1879,23 @@ ...@@ -1833,21 +1879,23 @@
* @param translationId * @param translationId
* @param interpolateParams * @param interpolateParams
* @param Interpolator * @param Interpolator
* @param defaultTranslationText
* @param sanitizeStrategy
* @returns {Q.promise} Promise that will resolve to the translation. * @returns {Q.promise} Promise that will resolve to the translation.
*/ */
var resolveForFallbackLanguage = function (fallbackLanguageIndex, translationId, interpolateParams, Interpolator, defaultTranslationText) { var resolveForFallbackLanguage = function (fallbackLanguageIndex, translationId, interpolateParams, Interpolator, defaultTranslationText, sanitizeStrategy) {
var deferred = $q.defer(); var deferred = $q.defer();
if (fallbackLanguageIndex < $fallbackLanguage.length) { if (fallbackLanguageIndex < $fallbackLanguage.length) {
var langKey = $fallbackLanguage[fallbackLanguageIndex]; var langKey = $fallbackLanguage[fallbackLanguageIndex];
getFallbackTranslation(langKey, translationId, interpolateParams, Interpolator).then( getFallbackTranslation(langKey, translationId, interpolateParams, Interpolator, sanitizeStrategy).then(
function (data) { function (data) {
deferred.resolve(data); deferred.resolve(data);
}, },
function () { function () {
// Look in the next fallback language for a translation. // Look in the next fallback language for a translation.
// It delays the resolving by passing another promise to resolve. // It delays the resolving by passing another promise to resolve.
return resolveForFallbackLanguage(fallbackLanguageIndex + 1, translationId, interpolateParams, Interpolator, defaultTranslationText).then(deferred.resolve, deferred.reject); return resolveForFallbackLanguage(fallbackLanguageIndex + 1, translationId, interpolateParams, Interpolator, defaultTranslationText, sanitizeStrategy).then(deferred.resolve, deferred.reject);
} }
); );
} else { } else {
...@@ -1903,11 +1951,13 @@ ...@@ -1903,11 +1951,13 @@
* @param translationId * @param translationId
* @param interpolateParams * @param interpolateParams
* @param Interpolator * @param Interpolator
* @param defaultTranslationText
* @param sanitizeStrategy
* @returns {Q.promise} Promise, that resolves to the translation. * @returns {Q.promise} Promise, that resolves to the translation.
*/ */
var fallbackTranslation = function (translationId, interpolateParams, Interpolator, defaultTranslationText) { var fallbackTranslation = function (translationId, interpolateParams, Interpolator, defaultTranslationText, sanitizeStrategy) {
// Start with the fallbackLanguage with index 0 // Start with the fallbackLanguage with index 0
return resolveForFallbackLanguage((startFallbackIteration > 0 ? startFallbackIteration : fallbackIndex), translationId, interpolateParams, Interpolator, defaultTranslationText); return resolveForFallbackLanguage((startFallbackIteration > 0 ? startFallbackIteration : fallbackIndex), translationId, interpolateParams, Interpolator, defaultTranslationText, sanitizeStrategy);
}; };
/** /**
...@@ -1916,6 +1966,7 @@ ...@@ -1916,6 +1966,7 @@
* @param translationId * @param translationId
* @param interpolateParams * @param interpolateParams
* @param Interpolator * @param Interpolator
* @param sanitizeStrategy
* @returns {String} translation * @returns {String} translation
*/ */
var fallbackTranslationInstant = function (translationId, interpolateParams, Interpolator, sanitizeStrategy) { var fallbackTranslationInstant = function (translationId, interpolateParams, Interpolator, sanitizeStrategy) {
...@@ -1923,7 +1974,7 @@ ...@@ -1923,7 +1974,7 @@
return resolveForFallbackLanguageInstant((startFallbackIteration > 0 ? startFallbackIteration : fallbackIndex), translationId, interpolateParams, Interpolator, sanitizeStrategy); return resolveForFallbackLanguageInstant((startFallbackIteration > 0 ? startFallbackIteration : fallbackIndex), translationId, interpolateParams, Interpolator, sanitizeStrategy);
}; };
var determineTranslation = function (translationId, interpolateParams, interpolationId, defaultTranslationText, uses) { var determineTranslation = function (translationId, interpolateParams, interpolationId, defaultTranslationText, uses, sanitizeStrategy) {
var deferred = $q.defer(); var deferred = $q.defer();
...@@ -1931,17 +1982,17 @@ ...@@ -1931,17 +1982,17 @@
Interpolator = (interpolationId) ? interpolatorHashMap[interpolationId] : defaultInterpolator; Interpolator = (interpolationId) ? interpolatorHashMap[interpolationId] : defaultInterpolator;
// if the translation id exists, we can just interpolate it // if the translation id exists, we can just interpolate it
if (table && Object.prototype.hasOwnProperty.call(table, translationId)) { if (table && Object.prototype.hasOwnProperty.call(table, translationId) && table[translationId] !== null) {
var translation = table[translationId]; var translation = table[translationId];
// If using link, rerun $translate with linked translationId and return it // If using link, rerun $translate with linked translationId and return it
if (translation.substr(0, 2) === '@:') { if (translation.substr(0, 2) === '@:') {
$translate(translation.substr(2), interpolateParams, interpolationId, defaultTranslationText, uses) $translate(translation.substr(2), interpolateParams, interpolationId, defaultTranslationText, uses, sanitizeStrategy)
.then(deferred.resolve, deferred.reject); .then(deferred.resolve, deferred.reject);
} else { } else {
// //
var resolvedTranslation = Interpolator.interpolate(translation, interpolateParams, 'service'); var resolvedTranslation = Interpolator.interpolate(translation, interpolateParams, 'service', sanitizeStrategy, translationId);
resolvedTranslation = applyPostProcessing(translationId, translation, resolvedTranslation, interpolateParams, uses); resolvedTranslation = applyPostProcessing(translationId, translation, resolvedTranslation, interpolateParams, uses);
deferred.resolve(resolvedTranslation); deferred.resolve(resolvedTranslation);
} }
...@@ -1956,7 +2007,7 @@ ...@@ -1956,7 +2007,7 @@
// we try it now with one or more fallback languages, if fallback language(s) is // we try it now with one or more fallback languages, if fallback language(s) is
// configured. // configured.
if (uses && $fallbackLanguage && $fallbackLanguage.length) { if (uses && $fallbackLanguage && $fallbackLanguage.length) {
fallbackTranslation(translationId, interpolateParams, Interpolator, defaultTranslationText) fallbackTranslation(translationId, interpolateParams, Interpolator, defaultTranslationText, sanitizeStrategy)
.then(function (translation) { .then(function (translation) {
deferred.resolve(translation); deferred.resolve(translation);
}, function (_translationId) { }, function (_translationId) {
...@@ -1993,16 +2044,15 @@ ...@@ -1993,16 +2044,15 @@
} }
// if the translation id exists, we can just interpolate it // if the translation id exists, we can just interpolate it
if (table && Object.prototype.hasOwnProperty.call(table, translationId)) { if (table && Object.prototype.hasOwnProperty.call(table, translationId) && table[translationId] !== null) {
var translation = table[translationId]; var translation = table[translationId];
// If using link, rerun $translate with linked translationId and return it // If using link, rerun $translate with linked translationId and return it
if (translation.substr(0, 2) === '@:') { if (translation.substr(0, 2) === '@:') {
result = determineTranslationInstant(translation.substr(2), interpolateParams, interpolationId, uses, sanitizeStrategy); result = determineTranslationInstant(translation.substr(2), interpolateParams, interpolationId, uses, sanitizeStrategy);
} else { } else {
//result = Interpolator.interpolate(translation, interpolateParams, 'filter', sanitizeStrategy); result = Interpolator.interpolate(translation, interpolateParams, 'filter', sanitizeStrategy, translationId);
//result = applyPostProcessing(translationId, translation, result, interpolateParams, uses, sanitizeStrategy); result = applyPostProcessing(translationId, translation, result, interpolateParams, uses, sanitizeStrategy);
result=translation;
} }
} else { } else {
var missingTranslationHandlerTranslation; var missingTranslationHandlerTranslation;
...@@ -2117,6 +2167,7 @@ ...@@ -2117,6 +2167,7 @@
* *
* @description * @description
* Returns the language key for the fallback languages or sets a new fallback stack. * Returns the language key for the fallback languages or sets a new fallback stack.
* It is recommended to call this before {@link pascalprecht.translate.$translateProvider#preferredLanguage preferredLanguage()}.
* *
* @param {string=} langKey language String or Array of fallback languages to be used (to change stack at runtime) * @param {string=} langKey language String or Array of fallback languages to be used (to change stack at runtime)
* *
...@@ -2240,7 +2291,7 @@ ...@@ -2240,7 +2291,7 @@
* $scope.text = $translate("HELLO"); * $scope.text = $translate("HELLO");
* }); * });
* *
* @param {string} [key] Language key * @param {string=} key Language key
* @return {object|string} Promise with loaded language data or the language key if a falsy param was given. * @return {object|string} Promise with loaded language data or the language key if a falsy param was given.
*/ */
$translate.use = function (key) { $translate.use = function (key) {
...@@ -2249,6 +2300,7 @@ ...@@ -2249,6 +2300,7 @@
} }
var deferred = $q.defer(); var deferred = $q.defer();
deferred.promise.then(null, angular.noop); // AJS "Possibly unhandled rejection"
$rootScope.$emit('$translateChangeStart', {language : key}); $rootScope.$emit('$translateChangeStart', {language : key});
...@@ -2282,7 +2334,7 @@ ...@@ -2282,7 +2334,7 @@
}); });
langPromises[key]['finally'](function () { langPromises[key]['finally'](function () {
clearNextLangAndPromise(key); clearNextLangAndPromise(key);
}); })['catch'](angular.noop); // we don't care about errors (clearing)
} else if (langPromises[key]) { } else if (langPromises[key]) {
// we are already loading this asynchronously // we are already loading this asynchronously
// resolve our new deferred when the old langPromise is resolved // resolve our new deferred when the old langPromise is resolved
...@@ -2412,68 +2464,68 @@ ...@@ -2412,68 +2464,68 @@
throw new Error('Couldn\'t refresh translation table, no loader registered!'); throw new Error('Couldn\'t refresh translation table, no loader registered!');
} }
var deferred = $q.defer();
function resolve() {
deferred.resolve();
$rootScope.$emit('$translateRefreshEnd', {language : langKey});
}
function reject() {
deferred.reject();
$rootScope.$emit('$translateRefreshEnd', {language : langKey});
}
$rootScope.$emit('$translateRefreshStart', {language : langKey}); $rootScope.$emit('$translateRefreshStart', {language : langKey});
if (!langKey) { var deferred = $q.defer(), updatedLanguages = {};
// if there's no language key specified we refresh ALL THE THINGS!
var tables = [], loadingKeys = {}; //private helper
function loadNewData(languageKey) {
var promise = loadAsync(languageKey);
//update the load promise cache for this language
langPromises[languageKey] = promise;
//register a data handler for the promise
promise.then(function (data) {
//clear the cache for this language
$translationTable[languageKey] = {};
//add the new data for this language
translations(languageKey, data.table);
//track that we updated this language
updatedLanguages[languageKey] = true;
},
//handle rejection to appease the $q validation
angular.noop);
return promise;
}
// reload registered fallback languages //set up post-processing
if ($fallbackLanguage && $fallbackLanguage.length) { deferred.promise.then(
for (var i = 0, len = $fallbackLanguage.length; i < len; i++) { function () {
tables.push(loadAsync($fallbackLanguage[i])); for (var key in $translationTable) {
loadingKeys[$fallbackLanguage[i]] = true; if ($translationTable.hasOwnProperty(key)) {
//delete cache entries that were not updated
if (!(key in updatedLanguages)) {
delete $translationTable[key];
} }
} }
// reload currently used language
if ($uses && !loadingKeys[$uses]) {
tables.push(loadAsync($uses));
} }
var allTranslationsLoaded = function (tableData) {
$translationTable = {};
angular.forEach(tableData, function (data) {
translations(data.key, data.table);
});
if ($uses) { if ($uses) {
useLanguage($uses); useLanguage($uses);
} }
resolve(); },
}; //handle rejection to appease the $q validation
allTranslationsLoaded.displayName = 'refreshPostProcessor'; angular.noop
)['finally'](
$q.all(tables).then(allTranslationsLoaded, reject); function () {
$rootScope.$emit('$translateRefreshEnd', {language : langKey});
} else if ($translationTable[langKey]) { }
);
var oneTranslationsLoaded = function (data) { if (!langKey) {
translations(data.key, data.table); // if there's no language key specified we refresh ALL THE THINGS!
if (langKey === $uses) { var languagesToReload = $fallbackLanguage && $fallbackLanguage.slice() || [];
useLanguage($uses); if ($uses && languagesToReload.indexOf($uses) === -1) {
languagesToReload.push($uses);
} }
resolve(); $q.all(languagesToReload.map(loadNewData)).then(deferred.resolve, deferred.reject);
return data;
};
oneTranslationsLoaded.displayName = 'refreshPostProcessor';
loadAsync(langKey).then(oneTranslationsLoaded, reject); } else if ($translationTable[langKey]) {
//just refresh the specified language cache
loadNewData(langKey).then(deferred.resolve, deferred.reject);
} else { } else {
reject(); deferred.reject();
} }
return deferred.promise; return deferred.promise;
}; };
...@@ -2492,10 +2544,10 @@ ...@@ -2492,10 +2544,10 @@
* This can be optionally an array of translation ids which * This can be optionally an array of translation ids which
* results that the function's promise returns an object where * results that the function's promise returns an object where
* each key is the translation id and the value the translation. * each key is the translation id and the value the translation.
* @param {object} interpolateParams Params * @param {object=} [interpolateParams={}] Params
* @param {string} interpolationId The id of the interpolation to use * @param {string=} [interpolationId=undefined] The id of the interpolation to use (use default unless set via useInterpolation())
* @param {string} forceLanguage A language to be used instead of the current language * @param {string=} [forceLanguage=false] A language to be used instead of the current language
* @param {string} sanitizeStrategy force sanitize strategy for this call instead of using the configured one * @param {string=} [sanitizeStrategy=undefined] force sanitize strategy for this call instead of using the configured one (use default unless set)
* *
* @return {string|object} translation * @return {string|object} translation
*/ */
...@@ -2646,7 +2698,7 @@ ...@@ -2646,7 +2698,7 @@
* @methodOf pascalprecht.translate.$translate * @methodOf pascalprecht.translate.$translate
* *
* @description * @description
* Returns whether the service is "ready" to translate (i.e. loading 1st language). * Calls the function provided or resolved the returned promise after the service is "ready" to translate (i.e. loading 1st language).
* *
* See also {@link pascalprecht.translate.$translate#methods_isReady isReady()}. * See also {@link pascalprecht.translate.$translate#methods_isReady isReady()}.
* *
...@@ -2752,11 +2804,11 @@ ...@@ -2752,11 +2804,11 @@
return $translate; return $translate;
}]; }];
} }
$translate.displayName = 'displayName'; $translate.displayName = 'displayName';
/** /**
* @ngdoc object * @ngdoc object
* @name pascalprecht.translate.$translateDefaultInterpolation * @name pascalprecht.translate.$translateDefaultInterpolation
* @requires $interpolate * @requires $interpolate
...@@ -2771,9 +2823,9 @@ ...@@ -2771,9 +2823,9 @@
* *
* @return {object} $translateDefaultInterpolation Interpolator service * @return {object} $translateDefaultInterpolation Interpolator service
*/ */
angular.module('pascalprecht.translate').factory('$translateDefaultInterpolation', $translateDefaultInterpolation); angular.module('pascalprecht.translate').factory('$translateDefaultInterpolation', $translateDefaultInterpolation);
function $translateDefaultInterpolation ($interpolate, $translateSanitization) { function $translateDefaultInterpolation ($interpolate, $translateSanitization) {
'use strict'; 'use strict';
...@@ -2829,9 +2881,15 @@ ...@@ -2829,9 +2881,15 @@
* *
* Since AngularJS 1.5, `value` must not be a string but can be anything input. * Since AngularJS 1.5, `value` must not be a string but can be anything input.
* *
* @returns {string} interpolated string. * @param {string} value translation
* @param {object} [interpolationParams={}] interpolation params
* @param {string} [context=undefined] current context (filter, directive, service)
* @param {string} [sanitizeStrategy=undefined] sanitize strategy (use default unless set)
* @param {string} translationId current translationId
*
* @returns {string} interpolated string
*/ */
$translateInterpolator.interpolate = function (value, interpolationParams, context, sanitizeStrategy) { $translateInterpolator.interpolate = function (value, interpolationParams, context, sanitizeStrategy, translationId) { // jshint ignore:line
interpolationParams = interpolationParams || {}; interpolationParams = interpolationParams || {};
interpolationParams = $translateSanitization.sanitize(interpolationParams, 'params', sanitizeStrategy, context); interpolationParams = $translateSanitization.sanitize(interpolationParams, 'params', sanitizeStrategy, context);
...@@ -2852,14 +2910,14 @@ ...@@ -2852,14 +2910,14 @@
}; };
return $translateInterpolator; return $translateInterpolator;
} }
$translateDefaultInterpolation.displayName = '$translateDefaultInterpolation'; $translateDefaultInterpolation.displayName = '$translateDefaultInterpolation';
angular.module('pascalprecht.translate').constant('$STORAGE_KEY', 'NG_TRANSLATE_LANG_KEY'); angular.module('pascalprecht.translate').constant('$STORAGE_KEY', 'NG_TRANSLATE_LANG_KEY');
angular.module('pascalprecht.translate') angular.module('pascalprecht.translate')
/** /**
* @ngdoc directive * @ngdoc directive
* @name pascalprecht.translate.directive:translate * @name pascalprecht.translate.directive:translate
* @requires $interpolate, * @requires $interpolate,
...@@ -2877,6 +2935,7 @@ ...@@ -2877,6 +2935,7 @@
* @param {string=} translate-values Values to pass into translation id. Can be passed as object literal string or interpolated object. * @param {string=} translate-values Values to pass into translation id. Can be passed as object literal string or interpolated object.
* @param {string=} translate-attr-ATTR translate Translation id and put it into ATTR attribute. * @param {string=} translate-attr-ATTR translate Translation id and put it into ATTR attribute.
* @param {string=} translate-default will be used unless translation was successful * @param {string=} translate-default will be used unless translation was successful
* @param {string=} translate-sanitize-strategy defines locally sanitize strategy
* @param {boolean=} translate-compile (default true if present) defines locally activation of {@link pascalprecht.translate.$translateProvider#methods_usePostCompiling} * @param {boolean=} translate-compile (default true if present) defines locally activation of {@link pascalprecht.translate.$translateProvider#methods_usePostCompiling}
* @param {boolean=} translate-keep-content (default true if present) defines that in case a KEY could not be translated, that the existing content is left in the innerHTML} * @param {boolean=} translate-keep-content (default true if present) defines that in case a KEY could not be translated, that the existing content is left in the innerHTML}
* *
...@@ -2953,8 +3012,8 @@ ...@@ -2953,8 +3012,8 @@
</file> </file>
</example> </example>
*/ */
.directive('translate', translateDirective); .directive('translate', translateDirective);
function translateDirective($translate, $interpolate, $compile, $parse, $rootScope) { function translateDirective($translate, $interpolate, $compile, $parse, $rootScope) {
'use strict'; 'use strict';
...@@ -2971,6 +3030,19 @@ ...@@ -2971,6 +3030,19 @@
return this.toString().replace(/^\s+|\s+$/g, ''); return this.toString().replace(/^\s+|\s+$/g, '');
}; };
/**
* @name lowercase
* @private
*
* @description
* Return the lowercase string only if the type is string
*
* @returns {string} The string all in lowercase
*/
var lowercase = function (string) {
return angular.isString(string) ? string.toLowerCase() : string;
};
return { return {
restrict: 'AE', restrict: 'AE',
scope: true, scope: true,
...@@ -2983,6 +3055,9 @@ ...@@ -2983,6 +3055,9 @@
var translateInterpolation = (tAttr.translateInterpolation) ? var translateInterpolation = (tAttr.translateInterpolation) ?
tAttr.translateInterpolation : undefined; tAttr.translateInterpolation : undefined;
var translateSanitizeStrategyExist = (tAttr.translateSanitizeStrategy) ?
tAttr.translateSanitizeStrategy : undefined;
var translateValueExist = tElement[0].outerHTML.match(/translate-value-+/i); var translateValueExist = tElement[0].outerHTML.match(/translate-value-+/i);
var interpolateRegExp = '^(.*)(' + $interpolate.startSymbol() + '.*' + $interpolate.endSymbol() + ')(.*)', var interpolateRegExp = '^(.*)(' + $interpolate.startSymbol() + '.*' + $interpolate.endSymbol() + ')(.*)',
...@@ -3005,7 +3080,7 @@ ...@@ -3005,7 +3080,7 @@
if (translateValueExist) { if (translateValueExist) {
for (var attr in tAttr) { for (var attr in tAttr) {
if (Object.prototype.hasOwnProperty.call(iAttr, attr) && attr.substr(0, 14) === 'translateValue' && attr !== 'translateValues') { if (Object.prototype.hasOwnProperty.call(iAttr, attr) && attr.substr(0, 14) === 'translateValue' && attr !== 'translateValues') {
var attributeName = angular.lowercase(attr.substr(14, 1)) + attr.substr(15); var attributeName = lowercase(attr.substr(14, 1)) + attr.substr(15);
interpolateParams[attributeName] = tAttr[attr]; interpolateParams[attributeName] = tAttr[attr];
} }
} }
...@@ -3024,7 +3099,7 @@ ...@@ -3024,7 +3099,7 @@
} }
if (angular.equals(translationId , '') || !angular.isDefined(translationId)) { if (angular.equals(translationId , '') || !angular.isDefined(translationId)) {
var iElementText = trim.apply(iElement.text()); var iElementText = trim.apply(iElement.text()).replace(/\n/g, ' ');
// Resolve translation id by inner html if required // Resolve translation id by inner html if required
var interpolateMatches = iElementText.match(interpolateRegExp); var interpolateMatches = iElementText.match(interpolateRegExp);
...@@ -3086,6 +3161,13 @@ ...@@ -3086,6 +3161,13 @@
updateTranslations(); updateTranslations();
}); });
if (translateSanitizeStrategyExist) {
iAttr.$observe('translateSanitizeStrategy', function (value) {
scope.sanitizeStrategy = $parse(value)(scope.$parent);
updateTranslations();
});
}
if (translateValuesExist) { if (translateValuesExist) {
iAttr.$observe('translateValues', function (interpolateParams) { iAttr.$observe('translateValues', function (interpolateParams) {
if (interpolateParams) { if (interpolateParams) {
...@@ -3099,7 +3181,7 @@ ...@@ -3099,7 +3181,7 @@
if (translateValueExist) { if (translateValueExist) {
var observeValueAttribute = function (attrName) { var observeValueAttribute = function (attrName) {
iAttr.$observe(attrName, function (value) { iAttr.$observe(attrName, function (value) {
var attributeName = angular.lowercase(attrName.substr(14, 1)) + attrName.substr(15); var attributeName = lowercase(attrName.substr(14, 1)) + attrName.substr(15);
scope.interpolateParams[attributeName] = value; scope.interpolateParams[attributeName] = value;
}); });
}; };
...@@ -3127,7 +3209,7 @@ ...@@ -3127,7 +3209,7 @@
translationId = translateNamespace + translationId; translationId = translateNamespace + translationId;
} }
$translate(translationId, interpolateParams, translateInterpolation, defaultTranslationText, scope.translateLanguage) $translate(translationId, interpolateParams, translateInterpolation, defaultTranslationText, scope.translateLanguage, scope.sanitizeStrategy)
.then(function (translation) { .then(function (translation) {
applyTranslation(translation, scope, true, translateAttr); applyTranslation(translation, scope, true, translateAttr);
}, function (translationId) { }, function (translationId) {
...@@ -3195,15 +3277,15 @@ ...@@ -3195,15 +3277,15 @@
}; };
} }
}; };
} }
/** /**
* Returns the scope's namespace. * Returns the scope's namespace.
* @private * @private
* @param scope * @param scope
* @returns {string} * @returns {string}
*/ */
function getTranslateNamespace(scope) { function getTranslateNamespace(scope) {
'use strict'; 'use strict';
if (scope.translateNamespace) { if (scope.translateNamespace) {
return scope.translateNamespace; return scope.translateNamespace;
...@@ -3211,12 +3293,12 @@ ...@@ -3211,12 +3293,12 @@
if (scope.$parent) { if (scope.$parent) {
return getTranslateNamespace(scope.$parent); return getTranslateNamespace(scope.$parent);
} }
} }
translateDirective.displayName = 'translateDirective'; translateDirective.displayName = 'translateDirective';
angular.module('pascalprecht.translate') angular.module('pascalprecht.translate')
/** /**
* @ngdoc directive * @ngdoc directive
* @name pascalprecht.translate.directive:translate-attr * @name pascalprecht.translate.directive:translate-attr
* @restrict A * @restrict A
...@@ -3228,6 +3310,7 @@ ...@@ -3228,6 +3310,7 @@
* *
* @param {string=} translate-attr Object literal mapping attributes to translation ids. * @param {string=} translate-attr Object literal mapping attributes to translation ids.
* @param {string=} translate-values Values to pass into the translation ids. Can be passed as object literal string. * @param {string=} translate-values Values to pass into the translation ids. Can be passed as object literal string.
* @param {string=} translate-sanitize-strategy defines locally sanitize strategy
* *
* @example * @example
<example module="ngView"> <example module="ngView">
...@@ -3272,8 +3355,8 @@ ...@@ -3272,8 +3355,8 @@
</file> </file>
</example> </example>
*/ */
.directive('translateAttr', translateAttrDirective); .directive('translateAttr', translateAttrDirective);
function translateAttrDirective($translate, $rootScope) { function translateAttrDirective($translate, $rootScope) {
'use strict'; 'use strict';
...@@ -3284,6 +3367,7 @@ ...@@ -3284,6 +3367,7 @@
var translateAttr, var translateAttr,
translateValues, translateValues,
translateSanitizeStrategy,
previousAttributes = {}; previousAttributes = {};
// Main update translations function // Main update translations function
...@@ -3298,7 +3382,7 @@ ...@@ -3298,7 +3382,7 @@
if (scope.translateNamespace && translationId.charAt(0) === '.') { if (scope.translateNamespace && translationId.charAt(0) === '.') {
translationId = scope.translateNamespace + translationId; translationId = scope.translateNamespace + translationId;
} }
$translate(translationId, translateValues, attr.translateInterpolation, undefined, scope.translateLanguage) $translate(translationId, translateValues, attr.translateInterpolation, undefined, scope.translateLanguage, translateSanitizeStrategy)
.then(function (translation) { .then(function (translation) {
element.attr(attributeName, translation); element.attr(attributeName, translation);
}, function (translationId) { }, function (translationId) {
...@@ -3329,6 +3413,13 @@ ...@@ -3329,6 +3413,13 @@
function (newValue) { translateValues = newValue; }, function (newValue) { translateValues = newValue; },
updateTranslations updateTranslations
); );
// Watch for sanitize strategy changes
watchAttribute(
scope,
attr.translateSanitizeStrategy,
function (newValue) { translateSanitizeStrategy = newValue; },
updateTranslations
);
if (attr.translateValues) { if (attr.translateValues) {
scope.$watch(attr.translateValues, updateTranslations, true); scope.$watch(attr.translateValues, updateTranslations, true);
...@@ -3345,9 +3436,9 @@ ...@@ -3345,9 +3436,9 @@
scope.$on('$destroy', unbind); scope.$on('$destroy', unbind);
} }
}; };
} }
function watchAttribute(scope, attribute, valueCallback, changeCallback) { function watchAttribute(scope, attribute, valueCallback, changeCallback) {
'use strict'; 'use strict';
if (!attribute) { if (!attribute) {
return; return;
...@@ -3361,15 +3452,14 @@ ...@@ -3361,15 +3452,14 @@
}, true); }, true);
} }
valueCallback(scope.$eval(attribute)); valueCallback(scope.$eval(attribute));
} }
translateAttrDirective.displayName = 'translateAttrDirective'; translateAttrDirective.displayName = 'translateAttrDirective';
angular.module('pascalprecht.translate') angular.module('pascalprecht.translate')
/** /**
* @ngdoc directive * @ngdoc directive
* @name pascalprecht.translate.directive:translateCloak * @name pascalprecht.translate.directive:translateCloak
* @requires $rootScope
* @requires $translate * @requires $translate
* @restrict A * @restrict A
* *
...@@ -3387,52 +3477,52 @@ ...@@ -3387,52 +3477,52 @@
* or hiding the cloak. Basically it relies on the translation * or hiding the cloak. Basically it relies on the translation
* resolve. * resolve.
*/ */
.directive('translateCloak', translateCloakDirective); .directive('translateCloak', translateCloakDirective);
function translateCloakDirective($translate, $rootScope) { function translateCloakDirective($translate, $rootScope) {
'use strict'; 'use strict';
return { return {
compile: function (tElement) { compile : function (tElement) {
var applyCloak = function () { var applyCloak = function (element) {
tElement.addClass($translate.cloakClassName()); element.addClass($translate.cloakClassName());
}, },
removeCloak = function () { removeCloak = function (element) {
tElement.removeClass($translate.cloakClassName()); element.removeClass($translate.cloakClassName());
}; };
$translate.onReady(function () { applyCloak(tElement);
removeCloak();
});
applyCloak();
return function linkFn(scope, iElement, iAttr) { return function linkFn(scope, iElement, iAttr) {
//Create bound functions that incorporate the active DOM element.
var iRemoveCloak = removeCloak.bind(this, iElement), iApplyCloak = applyCloak.bind(this, iElement);
if (iAttr.translateCloak && iAttr.translateCloak.length) { if (iAttr.translateCloak && iAttr.translateCloak.length) {
// Register a watcher for the defined translation allowing a fine tuned cloak // Register a watcher for the defined translation allowing a fine tuned cloak
iAttr.$observe('translateCloak', function (translationId) { iAttr.$observe('translateCloak', function (translationId) {
$translate(translationId).then(removeCloak, applyCloak); $translate(translationId).then(iRemoveCloak, iApplyCloak);
}); });
// Register for change events as this is being another indicicator revalidating the cloak)
$rootScope.$on('$translateChangeSuccess', function () { $rootScope.$on('$translateChangeSuccess', function () {
$translate(iAttr.translateCloak).then(removeCloak, applyCloak); $translate(iAttr.translateCloak).then(iRemoveCloak, iApplyCloak);
}); });
} else {
$translate.onReady(iRemoveCloak);
} }
}; };
} }
}; };
} }
translateCloakDirective.displayName = 'translateCloakDirective'; translateCloakDirective.displayName = 'translateCloakDirective';
angular.module('pascalprecht.translate') angular.module('pascalprecht.translate')
/** /**
* @ngdoc directive * @ngdoc directive
* @name pascalprecht.translate.directive:translateNamespace * @name pascalprecht.translate.directive:translateNamespace
* @restrict A * @restrict A
* *
* @description * @description
* Translates given translation id either through attribute or DOM content. * Translates given translation id either through attribute or DOM content.
* Internally it uses `translate` filter to translate translation id. It possible to * Internally it uses `translate` filter to translate translation id. It is possible to
* pass an optional `translate-values` object literal as string into translation id. * pass an optional `translate-values` object literal as string into translation id.
* *
* @param {string=} translate namespace name which could be either string or interpolated string. * @param {string=} translate namespace name which could be either string or interpolated string.
...@@ -3474,9 +3564,9 @@ ...@@ -3474,9 +3564,9 @@
</file> </file>
</example> </example>
*/ */
.directive('translateNamespace', translateNamespaceDirective); .directive('translateNamespace', translateNamespaceDirective);
function translateNamespaceDirective() { function translateNamespaceDirective() {
'use strict'; 'use strict';
...@@ -3486,7 +3576,7 @@ ...@@ -3486,7 +3576,7 @@
compile: function () { compile: function () {
return { return {
pre: function (scope, iElement, iAttrs) { pre: function (scope, iElement, iAttrs) {
scope.translateNamespace = getTranslateNamespace(scope); scope.translateNamespace = _getTranslateNamespace(scope);
if (scope.translateNamespace && iAttrs.translateNamespace.charAt(0) === '.') { if (scope.translateNamespace && iAttrs.translateNamespace.charAt(0) === '.') {
scope.translateNamespace += iAttrs.translateNamespace; scope.translateNamespace += iAttrs.translateNamespace;
...@@ -3497,28 +3587,28 @@ ...@@ -3497,28 +3587,28 @@
}; };
} }
}; };
} }
/** /**
* Returns the scope's namespace. * Returns the scope's namespace.
* @private * @private
* @param scope * @param scope
* @returns {string} * @returns {string}
*/ */
function getTranslateNamespace(scope) { function _getTranslateNamespace(scope) {
'use strict'; 'use strict';
if (scope.translateNamespace) { if (scope.translateNamespace) {
return scope.translateNamespace; return scope.translateNamespace;
} }
if (scope.$parent) { if (scope.$parent) {
return getTranslateNamespace(scope.$parent); return _getTranslateNamespace(scope.$parent);
}
} }
}
translateNamespaceDirective.displayName = 'translateNamespaceDirective'; translateNamespaceDirective.displayName = 'translateNamespaceDirective';
angular.module('pascalprecht.translate') angular.module('pascalprecht.translate')
/** /**
* @ngdoc directive * @ngdoc directive
* @name pascalprecht.translate.directive:translateLanguage * @name pascalprecht.translate.directive:translateLanguage
* @restrict A * @restrict A
...@@ -3562,9 +3652,9 @@ ...@@ -3562,9 +3652,9 @@
</file> </file>
</example> </example>
*/ */
.directive('translateLanguage', translateLanguageDirective); .directive('translateLanguage', translateLanguageDirective);
function translateLanguageDirective() { function translateLanguageDirective() {
'use strict'; 'use strict';
...@@ -3584,12 +3674,12 @@ ...@@ -3584,12 +3674,12 @@
}; };
} }
}; };
} }
translateLanguageDirective.displayName = 'translateLanguageDirective'; translateLanguageDirective.displayName = 'translateLanguageDirective';
angular.module('pascalprecht.translate') angular.module('pascalprecht.translate')
/** /**
* @ngdoc filter * @ngdoc filter
* @name pascalprecht.translate.filter:translate * @name pascalprecht.translate.filter:translate
* @requires $parse * @requires $parse
...@@ -3640,24 +3730,21 @@ ...@@ -3640,24 +3730,21 @@
</file> </file>
</example> </example>
*/ */
.filter('translate', translateFilterFactory); .filter('translate', translateFilterFactory);
function translateFilterFactory($parse, $translate) { function translateFilterFactory($parse, $translate) {
'use strict'; 'use strict';
var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) { var translateFilter = function (translationId, interpolateParams, interpolation, forceLanguage) {
if (!angular.isObject(interpolateParams)) { if (!angular.isObject(interpolateParams)) {
interpolateParams = $parse(interpolateParams)(this); var ctx = this || {
} '__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f'
if(translationId){ };
if(translationId.indexOf(".")>0){ interpolateParams = $parse(interpolateParams)(ctx);
return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage);
}else{
return translationId;
}
} }
return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage);
}; };
if ($translate.statefulFilter()) { if ($translate.statefulFilter()) {
...@@ -3665,13 +3752,13 @@ ...@@ -3665,13 +3752,13 @@
} }
return translateFilter; return translateFilter;
} }
translateFilterFactory.displayName = 'translateFilterFactory'; translateFilterFactory.displayName = 'translateFilterFactory';
angular.module('pascalprecht.translate') angular.module('pascalprecht.translate')
/** /**
* @ngdoc object * @ngdoc object
* @name pascalprecht.translate.$translationCache * @name pascalprecht.translate.$translationCache
* @requires $cacheFactory * @requires $cacheFactory
...@@ -3685,14 +3772,14 @@ ...@@ -3685,14 +3772,14 @@
*/ */
.factory('$translationCache', $translationCache); .factory('$translationCache', $translationCache);
function $translationCache($cacheFactory) { function $translationCache($cacheFactory) {
'use strict'; 'use strict';
return $cacheFactory('translations'); return $cacheFactory('translations');
} }
$translationCache.displayName = '$translationCache'; $translationCache.displayName = '$translationCache';
return 'pascalprecht.translate'; return 'pascalprecht.translate';
})); }));
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment