Commit c9ee10f9 authored by bingchuan's avatar bingchuan

[dev]version 2.18.4

parent b1ecca63
...@@ -2051,8 +2051,9 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide ...@@ -2051,8 +2051,9 @@ function $translate($STORAGE_KEY, $windowProvider, $translateSanitizationProvide
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, translationId); // 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;
...@@ -3741,10 +3742,17 @@ function translateFilterFactory($parse, $translate) { ...@@ -3741,10 +3742,17 @@ function translateFilterFactory($parse, $translate) {
var ctx = this || { var ctx = this || {
'__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f' '__SCOPE_IS_NOT_AVAILABLE': 'More info at https://github.com/angular/angular.js/commit/8863b9d04c722b278fa93c5d66ad1e578ad6eb1f'
}; };
interpolateParams = $parse(interpolateParams)(ctx); interpolateParams = $parse(interpolateParams)(ctx)
} }
if(translationId){
if(translationId.indexOf(".")>0){
return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage); return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage);
}else{
return translationId;
}
}
// return $translate.instant(translationId, interpolateParams, interpolation, forceLanguage);
}; };
if ($translate.statefulFilter()) { if ($translate.statefulFilter()) {
......
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