yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'mikecp-temp-U4-8782' into merge-U4-8782

Browse Source
This commit is contained in:
Claus
2016-11-01 13:34:19 +01:00
parent 82a2f50d03 4c408eb1b7
commit 7ce2bbe9b1
3 changed files with 747 additions and 352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1073
src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
View File

File diff suppressed because it is too large Load Diff

2
src/Umbraco.Web.UI/umbraco/create/User.ascx
View File

@@ -22,7 +22,7 @@
ControlToValidate="Email" ValidateEmptyText="false" OnServerValidate="EmailExistsCheck"></asp:CustomValidator>
<asp:CustomValidator runat="server" ID="EmailValidator" OnServerValidate="EmailValidator_OnServerValidate"
ControlToValidate="Email"
ErrorMessage="Invalid email address"
ErrorMessage='<%#ui.Text("errorHandling", "errorRegExpWithoutTab", "E-mail", CurrentUser) %>'
Display="None" />
<br />
<asp:TextBox ID="Email" runat="server" Width="350px" CssClass="bigInput"></asp:TextBox>

24
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
View File

@@ -173,9 +173,29 @@ namespace umbraco.cms.presentation.user
passw.Controls.Add(passwordChanger);
passw.Controls.Add(validatorContainer);
// Add email validator
var emailValidation = new CustomValidator
{
ID = "EmailValidator",
ErrorMessage = ui.Text("errorHandling", "errorRegExpWithoutTab", "E-mail", CurrentUser),
Display = ValidatorDisplay.None
};
emailValidation.ServerValidate += EmailValidator_OnServerValidate;
var validationSummary = new ValidationSummary
{
ID = "validationSummary",
DisplayMode = ValidationSummaryDisplayMode.BulletList,
CssClass = "error"
};
pp.addProperty(validationSummary);
pp.addProperty(ui.Text("user", "username", UmbracoUser), uname);
pp.addProperty(ui.Text("user", "loginname", UmbracoUser), lname);
pp.addProperty(ui.Text("user", "password", UmbracoUser), passw);
pp.addProperty(emailValidation);
pp.addProperty(ui.Text("email", UmbracoUser), email);
pp.addProperty(ui.Text("user", "usertype", UmbracoUser), userType);
pp.addProperty(ui.Text("user", "language", UmbracoUser), userLanguage);
@@ -227,6 +247,10 @@ namespace umbraco.cms.presentation.user
.SyncTree(UID.ToString(), IsPostBack);
}
private void EmailValidator_OnServerValidate(object source, ServerValidateEventArgs args)
{
args.IsValid = MembershipProviderBase.IsEmailValid(email.Text);
}
void sectionValidator_ServerValidate(object source, ServerValidateEventArgs args)
{