Merge pull request #15181 from abpframework/auto-merge/rel-7-0/1602

Merge branch dev with rel-7.0

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/en.json

@@ -6,7 +6,7 @@
     "Tenants": "Tenants",
     "NewTenant": "New tenant",
     "TenantName": "Tenant name",
-    "DisplayName:TenantName": "Tenant name",
+    "DisplayName:TenantName": "Tenant Name",
     "TenantDeletionConfirmationMessage": "Tenant '{0}' will be deleted. Do you confirm that?",
     "ConnectionStrings": "Connection Strings",
     "DisplayName:DefaultConnectionString": "Default Connection String",

modules/tenant-management/src/Volo.Abp.TenantManagement.Domain.Shared/Volo/Abp/TenantManagement/Localization/Resources/tr.json

@@ -6,7 +6,7 @@
     "Tenants": "Müşteriler",
     "NewTenant": "Yeni müşteri",
     "TenantName": "Müşteri adı",
-    "DisplayName:TenantName": "Müşteri adı",
+    "DisplayName:TenantName": "Müşteri Adı",
     "TenantDeletionConfirmationMessage": "'{0}' isimli müşteri silinecektir. Onaylıyor musunuz?",
     "ConnectionStrings": "Bağlantı cümlesi",
     "DisplayName:DefaultConnectionString": "Varsayılan bağlantı cümlesi",

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml

@@ -23,6 +23,8 @@
             <abp-input asp-for="Tenant.AdminEmailAddress" />
 
             <div class="mb-3">
+                <label class="form-label">@L["DisplayName:AdminPassword"].Value</label>
+                <span> * </span>
                 <div class="input-group">
                     <input type="password" class="form-control" maxlength="@TenantConsts.MaxPasswordLength" asp-for="Tenant.AdminPassword" />
                     <button class="btn btn-secondary" type="button" id="PasswordVisibilityButton">

modules/tenant-management/src/Volo.Abp.TenantManagement.Web/Pages/TenantManagement/Tenants/CreateModal.cshtml.cs

@@ -44,7 +44,6 @@ public class CreateModalModel : TenantManagementPageModel
         [Required]
         [EmailAddress]
         [DynamicStringLength(typeof(TenantConsts), nameof(TenantConsts.MaxAdminEmailAddressLength))]
-
         public string AdminEmailAddress { get; set; }
 
         [Required]