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

@ -250,7 +250,8 @@ namespace System.Web.DynamicData {
public string RequiredErrorMessage {
get {
var requiredAttribute = Metadata.RequiredAttribute;
return requiredAttribute != null ? requiredAttribute.FormatErrorMessage(DisplayName) : String.Empty;
return requiredAttribute != null ?
StringLocalizerUtil.GetLocalizedString(requiredAttribute, DisplayName) : String.Empty;
}
}
@ -590,7 +591,7 @@ namespace System.Web.DynamicData {
public string Description {
get {
return DisplayAttribute.GetPropertyValue(a => a.GetDescription(), null) ??
return DisplayAttribute.GetLocalizedDescription() ??
DescriptionAttribute.GetPropertyValue(a => a.Description, null);
}
}
@ -599,14 +600,14 @@ namespace System.Web.DynamicData {
public string DisplayName {
get {
return DisplayAttribute.GetPropertyValue(a => a.GetName(), null) ??
return DisplayAttribute.GetLocalizedName() ??
DisplayNameAttribute.GetPropertyValue(a => a.DisplayName, null);
}
}
public string ShortDisplayName {
get {
return DisplayAttribute.GetPropertyValue(a => a.GetShortName(), null);
return DisplayAttribute.GetLocalizedShortName();
}
}
@ -622,7 +623,7 @@ namespace System.Web.DynamicData {
public string Prompt {
get {
return DisplayAttribute.GetPropertyValue(a => a.GetPrompt(), null);
return DisplayAttribute.GetLocalizedPrompt();
}
}