mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.309

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

3
mcs/class/referencesource/System.Web.DynamicData/DynamicData/DynamicValidator.cs
View File

@@ -11,6 +11,7 @@
using System.Web.Resources;
using System.Web.UI;
using System.Web.UI.WebControls;
using System.Web.DynamicData.Util;
/// <summary>
/// Validator that enforces model validation. It can be used either at the field level or the entity level
@@ -163,7 +164,7 @@
}
if (!attrib.IsValid(value)) {
ErrorMessage = HttpUtility.HtmlEncode(attrib.FormatErrorMessage(Column.DisplayName));
ErrorMessage = HttpUtility.HtmlEncode(StringLocalizerUtil.GetLocalizedString(attrib, Column.DisplayName));
return false;
}
}

6
mcs/class/referencesource/System.Web.DynamicData/DynamicData/FieldTemplateUserControl.cs
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));
}
}

11
mcs/class/referencesource/System.Web.DynamicData/DynamicData/MetaColumn.cs
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();
}
}