Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@ -516,7 +516,8 @@ namespace System.Web.DynamicData {
validator.MaximumValue = converter(rangeAttribute.Maximum);
if (String.IsNullOrEmpty(validator.ErrorMessage)) {
validator.ErrorMessage = HttpUtility.HtmlEncode(rangeAttribute.FormatErrorMessage(column.DisplayName));
validator.ErrorMessage = HttpUtility.HtmlEncode(
StringLocalizerUtil.GetLocalizedString(rangeAttribute, column.DisplayName));
}
}
@ -533,7 +534,8 @@ namespace System.Web.DynamicData {
validator.ValidationExpression = regexAttribute.Pattern;
if (String.IsNullOrEmpty(validator.ErrorMessage)) {
validator.ErrorMessage = HttpUtility.HtmlEncode(regexAttribute.FormatErrorMessage(column.DisplayName));
validator.ErrorMessage = HttpUtility.HtmlEncode(
StringLocalizerUtil.GetLocalizedString(regexAttribute, column.DisplayName));
}
}