diff --git a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs
index 9219e5169a..6b55815732 100644
--- a/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs
+++ b/modules/identity/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/IdentityUserAppService.cs
@@ -172,21 +172,21 @@ public class IdentityUserAppService : IdentityAppServiceBase, IIdentityUserAppSe
(await UserManager.SetEmailAsync(user, input.Email)).CheckErrors();
}
-
if (!string.Equals(user.PhoneNumber, input.PhoneNumber, StringComparison.InvariantCultureIgnoreCase))
{
(await UserManager.SetPhoneNumberAsync(user, input.PhoneNumber)).CheckErrors();
}
+ (await UserManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
+
if (user.Id != CurrentUser.Id)
{
- (await UserManager.SetLockoutEnabledAsync(user, input.LockoutEnabled)).CheckErrors();
+ user.SetIsActive(input.IsActive);
}
user.Name = input.Name;
user.Surname = input.Surname;
(await UserManager.UpdateAsync(user)).CheckErrors();
- user.SetIsActive(input.IsActive);
if (input.RoleNames != null && await PermissionChecker.IsGrantedAsync(IdentityPermissions.Users.ManageRoles))
{
(await UserManager.SetRolesAsync(user, input.RoleNames)).CheckErrors();
diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
index 761f95c531..9ecb31e9e7 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/UserManagement.razor
@@ -129,12 +129,11 @@
@L["DisplayName:IsActive"]
- @if (!IsEditCurrentUser)
- {
-
- @L["DisplayName:LockoutEnabled"]
-
- }
+
+
+ @L["DisplayName:LockoutEnabled"]
+
+
@@ -253,12 +252,17 @@
+ @if (!IsEditCurrentUser)
+ {
+
+ @L["DisplayName:IsActive"]
+
+ }
- @L["DisplayName:IsActive"]
-
-
- @L["DisplayName:LockoutEnabled"]
-
+
+ @L["DisplayName:LockoutEnabled"]
+
+
@if (EditUserRoles != null && EditUserRoles.Any())
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json
index 7b3edfb3d9..21dd7ac142 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ar.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "التحقق من عاملين",
"DisplayName:IsActive": "نشيط",
"DisplayName:LockoutEnabled": "تأمين الحساب",
+ "Description:LockoutEnabled": "قفل الحساب بعد محاولات تسجيل الدخول الفاشلة",
"NewRole": "دور جديد",
"RoleName": "اسم الدور",
"CreationTime": "وقت الإنشاء",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json
index a3079f81af..ca65951c3e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/cs.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Dvoufázové ověřování",
"DisplayName:IsActive": "Aktivní",
"DisplayName:LockoutEnabled": "Zamčení účtu",
+ "Description:LockoutEnabled": "Zamknout účet po neúspěšných pokusech o přihlášení",
"NewRole": "Nová role",
"RoleName": "Název role",
"CreationTime": "Vytvořeno",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json
index 1db549aee7..009d41fd0b 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/de.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Zwei-Faktor-Überprüfung",
"DisplayName:IsActive": "Aktiv",
"DisplayName:LockoutEnabled": "Konto-Sperrung",
+ "Description:LockoutEnabled": "Konto nach fehlgeschlagenen Anmeldeversuchen sperren",
"NewRole": "Neue Rolle",
"RoleName": "Rollenname",
"CreationTime": "Erstellungszeitpunkt",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/el.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/el.json
index fa761f73f3..97dfcb9a50 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/el.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/el.json
@@ -27,6 +27,7 @@
"DisplayName:TwoFactorEnabled": "Επαλήθευση δύο παραγόντων",
"DisplayName:IsActive": "Ενεργός",
"DisplayName:LockoutEnabled": "Κλείδωμα λογαριασμού",
+ "Description:LockoutEnabled": "Κλείδωμα λογαριασμού μετά από αποτυχημένες προσπάθειες σύνδεσης",
"NewRole": "Νέος ρόλος",
"RoleName": "Όνομα ρόλου",
"CreationTime": "Χρόνος δημιουργίας",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json
index a6c719d29e..999b387032 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en-GB.json
@@ -27,6 +27,7 @@
"DisplayName:PhoneNumber": "Phone Number",
"DisplayName:TwoFactorEnabled": "Two factor verification",
"DisplayName:LockoutEnabled": "Account lockout",
+ "Description:LockoutEnabled": "Lock account after failed login attempts",
"NewRole": "New role",
"RoleName": "Role name",
"CreationTime": "Creation time",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
index 024c4c8b79..e8f2abba48 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/en.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Two factor verification",
"DisplayName:IsActive": "Active",
"DisplayName:LockoutEnabled": "Account lockout",
+ "Description:LockoutEnabled": "Lock account after failed login attempts",
"NewRole": "New role",
"RoleName": "Role name",
"CreationTime": "Creation time",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json
index 118a53d47a..7cf85929a6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/es.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Autenticación en dos pasos",
"DisplayName:IsActive": "Activo",
"DisplayName:LockoutEnabled": "Bloqueo de cuenta",
+ "Description:LockoutEnabled": "Bloquear cuenta después de intentos de inicio de sesión fallidos",
"NewRole": "Nuevo rol",
"RoleName": "Nombre de rol",
"CreationTime": "Fecha de creación",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fa.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fa.json
index 99ebaaba1e..f21b2204db 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fa.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fa.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "احراز هویت دو مرحله ای",
"DisplayName:IsActive": "فعال",
"DisplayName:LockoutEnabled": "قفل کردن حساب",
+ "Description:LockoutEnabled": "قفل کردن حساب پس از تلاش های ناموفق برای ورود",
"NewRole": "نقش/وظیفه جدید",
"RoleName": "نام نقش/وظیفه",
"CreationTime": "زمان ایجاد",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json
index a433aa3d88..5aab8fb4d2 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fi.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Kahden tekijän todentaminen",
"DisplayName:IsActive": "Aktiivinen",
"DisplayName:LockoutEnabled": "Tilin lukitus",
+ "Description:LockoutEnabled": "Tilin lukitus epäonnistuneiden kirjautumisyritysten jälkeen",
"NewRole": "Uusi rooli",
"RoleName": "Roolinimi",
"CreationTime": "Luomisaika",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json
index 4e4d878da8..776233b642 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/fr.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Vérification de deux facteurs",
"DisplayName:IsActive": "actif",
"DisplayName:LockoutEnabled": "Verrouillage du compte",
+ "Description:LockoutEnabled": "Verrouiller le compte après des tentatives de connexion échouées",
"NewRole": "Nouveau rôle",
"RoleName": "Nom du rôle",
"CreationTime": "Temps de création",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json
index 5b13ce5d3d..630e1c3103 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hi.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "दो कारक सत्यापन",
"DisplayName:IsActive": "सक्रिय",
"DisplayName:LockoutEnabled": "खाता लॉकआउट",
+ "Description:LockoutEnabled": "विफल लॉगिन प्रयासों के बाद खाता लॉक करें",
"NewRole": "नयी भूमिका",
"RoleName": "भूमिका का नाम",
"CreationTime": "रचना समय",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hr.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hr.json
index 95c14b6f2f..a5203a7067 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hr.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hr.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Two factor verifikacija",
"DisplayName:IsActive": "Aktivan",
"DisplayName:LockoutEnabled": "Zaključavanje računa",
+ "Description:LockoutEnabled": "Zaključaj račun nakon neuspješnih pokušaja prijave",
"NewRole": "Nova uloga",
"RoleName": "Naziv uloge",
"CreationTime": "Vrijeme stvaranja",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json
index c9e5181bcb..79e58d5b6a 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/hu.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Kétlépcsős azonosítás",
"DisplayName:IsActive": "Aktív",
"DisplayName:LockoutEnabled": "Fiók zárolása",
+ "Description:LockoutEnabled": "Fiók zárolása sikertelen bejelentkezési kísérletek után",
"NewRole": "Új szerepkör",
"RoleName": "Szerepkör neve",
"CreationTime": "Létrehozás időpontja",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json
index b038b06c07..6a9406c832 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/is.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Tvíþætt sannprófun",
"DisplayName:IsActive": "Virkur",
"DisplayName:LockoutEnabled": "Loka reikningi",
+ "Description:LockoutEnabled": "Loka reikningi eftir misheppnaðar innskráningar tilraunir",
"NewRole": "Nýtt hlutverk",
"RoleName": "Nafn hlutverks",
"CreationTime": "Búið til",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json
index c57e5af8ab..9ad338ef73 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/it.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Verifica a due fattori",
"DisplayName:IsActive": "Attivo",
"DisplayName:LockoutEnabled": "Blocco account",
+ "Description:LockoutEnabled": "Blocca l'account dopo tentativi di accesso non riusciti",
"NewRole": "Nuovo ruolo",
"RoleName": "Nome del ruolo",
"CreationTime": "Orario di creazione",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json
index 586523f3f0..c5f10d7dfb 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/nl.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Tweefactor authenticatie",
"DisplayName:IsActive": "Actief",
"DisplayName:LockoutEnabled": "Account vergrendelen",
+ "Description:LockoutEnabled": "Account vergrendelen na mislukte inlogpogingen",
"NewRole": "Nieuwe rol",
"RoleName": "Rol naam",
"CreationTime": "Creatie tijd",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json
index 825338bf07..5eb3c85b6d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pl-PL.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Dwustopniowa weryfikacja",
"DisplayName:IsActive": "Aktywny",
"DisplayName:LockoutEnabled": "Blokada konta",
+ "Description:LockoutEnabled": "Zablokuj konto po nieudanych próbach logowania",
"NewRole": "Nowa rola",
"RoleName": "Nazwa roli",
"CreationTime": "Data utworzenia",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json
index ff89754e8c..d9bff0967e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/pt-BR.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Verificação em dois fatores",
"DisplayName:IsActive": "Ativo",
"DisplayName:LockoutEnabled": "Bloqueio de Conta",
+ "Description:LockoutEnabled": "Bloquear conta após tentativas de login falhas",
"NewRole": "Novo Perfil",
"RoleName": "Perfil",
"CreationTime": "Data de Criação",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json
index 1723206fc2..b03357bd6d 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ro-RO.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Autentificare în doi paşi",
"DisplayName:IsActive": "Activ",
"DisplayName:LockoutEnabled": "Blocare cont",
+ "Description:LockoutEnabled": "Blochează contul după încercări eşuate de autentificare",
"NewRole": "Rol nou",
"RoleName": "Nume rol",
"CreationTime": "Data creării",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json
index 871324d8e5..c7a4869ec0 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/ru.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Двухфакторная проверка подлинности",
"DisplayName:IsActive": "Активный",
"DisplayName:LockoutEnabled": "Блокировка учетной записи",
+ "Description:LockoutEnabled": "Блокировать учетную запись после неудачных попыток входа",
"NewRole": "Новая роль",
"RoleName": "Имя роли",
"CreationTime": "Время создания",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json
index 3233f064a4..d8f7fa8d46 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sk.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Dvojfaktorové overenie",
"DisplayName:IsActive": "Aktívne",
"DisplayName:LockoutEnabled": "Uzamknúť účet",
+ "Description:LockoutEnabled": "Uzamknúť účet po neúspešných pokusoch o prihlásenie",
"NewRole": "Nová rola",
"RoleName": "Názov roly",
"CreationTime": "Čas vytvorenia",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json
index bf25f83bff..9273c257a6 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/sl.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Dvostopenjsko preverjanje",
"DisplayName:IsActive": "Aktiven",
"DisplayName:LockoutEnabled": "Zaklepanje računa",
+ "Description:LockoutEnabled": "Zakleni račun po neuspelih poskusih prijave",
"NewRole": "Nova vloga",
"RoleName": "Naziv vloge",
"CreationTime": "Čas nastanka",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
index 9910fa338c..69667e5ad7 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/tr.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "İki aşamalı doğrulama",
"DisplayName:IsActive": "Aktif",
"DisplayName:LockoutEnabled": "Hesap kilitlenmesi",
+ "Description:LockoutEnabled": "Başarısız giriş denemelerinden sonra hesabı kitle",
"NewRole": "Yeni rol",
"RoleName": "Rol adı",
"CreationTime": "Oluşturma zamanı",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json
index 70cf3635a6..de42bfc2d8 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/vi.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "Xác thực hai yếu tố",
"DisplayName:IsActive": "Tích cực",
"DisplayName:LockoutEnabled": "Khóa tài khoản",
+ "Description:LockoutEnabled": "Khóa tài khoản sau các lần đăng nhập thất bại",
"NewRole": "Vai trò mới",
"RoleName": "Tên vai trò",
"CreationTime": "Thời gian tạo",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
index b690b3a437..9a55ce9ad2 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hans.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "二次认证",
"DisplayName:IsActive": "启用",
"DisplayName:LockoutEnabled": "账户锁定",
+ "Description:LockoutEnabled": "登录尝试失败后锁定帐户",
"NewRole": "新角色",
"RoleName": "角色名称",
"CreationTime": "创建时间",
diff --git a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
index fad617e511..055482121f 100644
--- a/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
+++ b/modules/identity/src/Volo.Abp.Identity.Domain.Shared/Volo/Abp/Identity/Localization/zh-Hant.json
@@ -28,6 +28,7 @@
"DisplayName:TwoFactorEnabled": "二次認證",
"DisplayName:IsActive": "啟用",
"DisplayName:LockoutEnabled": "帳號鎖定",
+ "Description:LockoutEnabled": "登錄嘗試失敗后鎖定帳戶",
"NewRole": "新角色",
"RoleName": "角色名稱",
"CreationTime": "建立時間",
diff --git a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
index fdf33444de..5aed66201e 100644
--- a/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
+++ b/modules/identity/src/Volo.Abp.Identity.Web/Pages/Identity/Users/CreateModal.cshtml
@@ -37,7 +37,7 @@
-
+
@foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties())
{
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 9dc1958d63..f5226a6c3c 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
@@ -38,11 +38,11 @@
-
@if (!Model.IsEditCurrentUser)
{
-
+
}
+
@foreach (var propertyInfo in ObjectExtensionManager.Instance.GetProperties())
{
if (!propertyInfo.Name.EndsWith("_Text"))