diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs index fae03d74b8..2274f0a9b6 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs +++ b/framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpDataAnnotationAutoLocalizationMetadataDetailsProvider.cs @@ -12,7 +12,7 @@ namespace Volo.Abp.AspNetCore.Mvc { public class AbpDataAnnotationAutoLocalizationMetadataDetailsProvider : IDisplayMetadataProvider { - private const string PropertyLocalizationKeyPrefix = "Property:"; + private const string PropertyLocalizationKeyPrefix = "DisplayName:"; private readonly Lazy _stringLocalizerFactory; private readonly Lazy> _localizationOptions; diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json b/modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json index 03090d76bc..d0757f5a54 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json +++ b/modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/en.json @@ -12,8 +12,13 @@ "Password": "Password", "UserDeletionConfirmationMessage": "User '{0}' will be deleted. Do you confirm that?", "RoleDeletionConfirmationMessage": "Role '{0}' will be deleted. Do you confirm that?", - "TwoFactorVerification": "Two factor verification", - "AccountLockoutOnFailedLoginAttempts": "Locking account after failed login attempts", + "DisplayName:RoleName": "Role name", + "DisplayName:UserName": "User name", + "DisplayName:Password": "Password", + "DisplayName:EmailAddress": "Email address", + "DisplayName:PhoneNumber": "Phone number", + "DisplayName:TwoFactorEnabled": "Two factor verification", + "DisplayName:LockoutEnabled": "Locking account after failed login attempts", "NewRole": "New role", "RoleName": "Role name", "CreationTime": "Creation time", diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/tr.json b/modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/tr.json index 1e78519459..f330cf5b70 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/tr.json +++ b/modules/identity/src/Volo.Abp.Identity.Web/Localization/Resources/AbpIdentity/tr.json @@ -12,8 +12,13 @@ "Password": "Şifre", "UserDeletionConfirmationMessage": "{0} kullanıcısı silinecektir. Onaylıyor musunuz?", "RoleDeletionConfirmationMessage": "'{0}' rolü silinecektir. Onaylıyor musunuz?", - "TwoFactorVerification": "İki aşamalı doğrumala", - "AccountLockoutOnFailedLoginAttempts": "Başarısız giriş denemeleri sonrası hesabı kilitleme", + "DisplayName:RoleName": "Rol adı", + "DisplayName:UserName": "Kullanıcı adı", + "DisplayName:Password": "Şifre", + "DisplayName:EmailAddress": "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", "NewRole": "Yeni rol", "RoleName": "Rol adı", "CreationTime": "Oluşturma zamanı", diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml index 281532a3eb..de892bcb54 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml @@ -11,7 +11,7 @@ - + diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs index 4523719784..bf91f4c5c6 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/CreateModal.cshtml.cs @@ -31,7 +31,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles { [Required] [StringLength(IdentityRoleConsts.MaxNameLength)] - [Display(Name = "RoleName")] + [Display(Name = "DisplayName:RoleName")] public string Name { get; set; } } } diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml index 7e309aefd6..f26a6ae34e 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml @@ -12,7 +12,7 @@ - + diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs index 2977e12445..22a13c6795 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Roles/EditModal.cshtml.cs @@ -42,7 +42,7 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Roles [Required] [StringLength(IdentityRoleConsts.MaxNameLength)] - [Display(Name = "RoleName")] + [Display(Name = "DisplayName:RoleName")] public string Name { get; set; } } } diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs index 5a15bb40be..5de2b3d1e3 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml.cs @@ -49,29 +49,23 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users { [Required] [StringLength(IdentityUserConsts.MaxUserNameLength)] - [Display(Name = "UserName")] public string UserName { get; set; } [Required] [StringLength(IdentityUserConsts.MaxPasswordLength)] [DataType(DataType.Password)] - [Display(Name = "Password")] public string Password { get; set; } [Required] [EmailAddress] [StringLength(IdentityUserConsts.MaxEmailLength)] - [Display(Name = "EmailAddress")] public string Email { get; set; } [StringLength(IdentityUserConsts.MaxPhoneNumberLength)] - [Display(Name = "PhoneNumber")] public string PhoneNumber { get; set; } - [Display(Name = "TwoFactorVerification")] public bool TwoFactorEnabled { get; set; } = true; - [Display(Name = "AccountLockoutOnFailedLoginAttempts")] public bool LockoutEnabled { get; set; } = true; } diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml index ffc6eb3e7e..0f19618b18 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml @@ -13,12 +13,12 @@ - - - - - - + + + + + + @for (var i = 0; i < Model.Roles.Length; i++) diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs index 73a0779691..c9bac5c792 100644 --- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs +++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/EditModal.cshtml.cs @@ -61,23 +61,18 @@ namespace Volo.Abp.Identity.Web.Pages.Identity.Users [Required] [StringLength(IdentityUserConsts.MaxUserNameLength)] - [Display(Name = "UserName")] public string UserName { get; set; } [Required] [EmailAddress] [StringLength(IdentityUserConsts.MaxEmailLength)] - [Display(Name = "EmailAddress")] public string Email { get; set; } [StringLength(IdentityUserConsts.MaxPhoneNumberLength)] - [Display(Name = "PhoneNumber")] public string PhoneNumber { get; set; } - [Display(Name = "TwoFactorVerification")] public bool TwoFactorEnabled { get; set; } - [Display(Name = "AccountLockoutOnFailedLoginAttempts")] public bool LockoutEnabled { get; set; } }