Merge pull request #691 from wakuflair/master

Fixing `Email` localization issue

modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json

@@ -22,7 +22,7 @@
     "DisplayName:Name": "Name",
     "DisplayName:Surname": "Surname",
     "DisplayName:Password": "Password",
-    "DisplayName:EmailAddress": "Email address",
+    "DisplayName:Email": "Email address",
     "DisplayName:PhoneNumber": "Phone number",
     "DisplayName:TwoFactorEnabled": "Two factor verification",
     "DisplayName:LockoutEnabled": "Locking account after failed login attempts",

modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/pt-BR.json

@@ -22,7 +22,7 @@
     "DisplayName:Name": "Nome",
     "DisplayName:Surname": "Sobrenome",
     "DisplayName:Password": "Senha",
-    "DisplayName:EmailAddress": "E-mail",
+    "DisplayName:Email": "E-mail",
     "DisplayName:PhoneNumber": "Telefone",
     "DisplayName:TwoFactorEnabled": "Verificação em dois fatores",
     "DisplayName:LockoutEnabled": "Bloquear conta após falhas ao entrar",

modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/tr.json

@@ -22,7 +22,7 @@
     "DisplayName:Name": "Adı",
     "DisplayName:Surname": "Soyadı",
     "DisplayName:Password": "Şifre",
-    "DisplayName:EmailAddress": "E-posta adresi",
+    "DisplayName:Email": "E-posta adresi",
     "DisplayName:PhoneNumber": "Telefon numarası",
     "DisplayName:TwoFactorEnabled": "İki aşamalı doğrumala",
     "DisplayName:LockoutEnabled": "Başarısız giriş denemeleri sonrası hesabı kilitleme",

modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/zh-Hans.json

@@ -22,7 +22,7 @@
       "DisplayName:Name": "名",
       "DisplayName:Surname": "姓",
       "DisplayName:Password": "密码",
-      "DisplayName:EmailAddress": "邮箱地址",
+      "DisplayName:Email": "邮箱地址",
       "DisplayName:PhoneNumber": "手机号码",
       "DisplayName:TwoFactorEnabled": "二次认证",
       "DisplayName:LockoutEnabled": "登录失败,账户被锁定",

modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Shared/PersonalSettingsModal.cshtml.cs

@@ -45,7 +45,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Shared
 
         [Required]
         [StringLength(IdentityUserConsts.MaxEmailLength)]
-        [Display(Name = "DisplayName:EmailAddress")]
+        [Display(Name = "DisplayName:Email")]
         public string Email { get; set; }
 
         [StringLength(IdentityUserConsts.MaxNameLength)]