From 039324a88f8c6d77b96aa2ea627b2f50c21e04c1 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic <mladen.macanovic@gmail.com>
Date: Thu, 10 Dec 2020 10:08:03 +0100
Subject: [PATCH 1/2] Default button Save text from resource

---
 .../Components/SubmitButton.razor                     |  9 ++++++++-
 .../Components/SubmitButton.razor.cs                  | 11 +++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor b/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor
index 97194720fe..140aa6502e 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor
@@ -1,3 +1,10 @@
 <Button form="@Form" Type="@Type" Color="@Color" Block="@Block" PreventDefaultOnSubmit="@PreventDefaultOnSubmit" Disabled="@IsDisabled" Loading="@IsLoading" Clicked="@OnClickedHandler">
-    @ChildContent
+    @if ( ChildContent != null )
+    {
+        @ChildContent
+    }
+    else
+    {
+        @SaveString
+    }
 </Button>
diff --git a/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor.cs b/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor.cs
index b4a7e13afd..95cbdedd20 100644
--- a/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor.cs
+++ b/framework/src/Volo.Abp.BlazoriseUI/Components/SubmitButton.razor.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Threading.Tasks;
 using Blazorise;
+using Localization.Resources.AbpUi;
 using Microsoft.AspNetCore.Components;
+using Microsoft.Extensions.Localization;
 
 namespace Volo.Abp.BlazoriseUI.Components
 {
@@ -27,18 +29,27 @@ namespace Volo.Abp.BlazoriseUI.Components
         [Parameter]
         public bool? Disabled { get; set; }
 
+        [Parameter]
+        public string SaveResourceKey { get; set; } = "Save";
+
         [Parameter]
         public EventCallback Clicked { get; set; }
 
         [Parameter]
         public RenderFragment ChildContent { get; set; }
 
+        [Inject]
+        protected IStringLocalizer<AbpUiResource> StringLocalizer { get; set; }
+
         protected bool IsDisabled
             => Disabled == true || Submiting;
 
         protected bool IsLoading
             => Submiting;
 
+        protected string SaveString
+            => StringLocalizer[SaveResourceKey];
+
         protected virtual async Task OnClickedHandler()
         {
             try

From c89c2db3028bbe56790a224215e8ba56fa801ea8 Mon Sep 17 00:00:00 2001
From: Mladen Macanovic <mladen.macanovic@gmail.com>
Date: Thu, 10 Dec 2020 10:26:33 +0100
Subject: [PATCH 2/2] Removed Save text from SubmitButton content

---
 .../Pages/Identity/RoleManagement.razor                     | 4 ++--
 .../Pages/Identity/UserManagement.razor                     | 4 ++--
 .../Pages/TenantManagement/TenantManagement.razor           | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
index 8444519e17..f20f4165e8 100644
--- a/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
+++ b/modules/identity/src/Volo.Abp.Identity.Blazor/Pages/Identity/RoleManagement.razor
@@ -104,7 +104,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="RoleCreateForm" Clicked="@CreateEntityAsync">@L["Save"]</SubmitButton>
+                    <SubmitButton Form="RoleCreateForm" Clicked="@CreateEntityAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -142,7 +142,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="RoleEditForm" Clicked="@UpdateEntityAsync">@L["Save"]</SubmitButton>
+                    <SubmitButton Form="RoleEditForm" Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>
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 3cad11d634..a371d4a646 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
@@ -176,7 +176,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="UserCreateForm" Clicked="@CreateEntityAsync">@L["Save"]</SubmitButton>
+                    <SubmitButton Form="UserCreateForm" Clicked="@CreateEntityAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -287,7 +287,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="UserEditForm" Clicked="@UpdateEntityAsync">@L["Save"]</SubmitButton>
+                    <SubmitButton Form="UserEditForm" Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>
diff --git a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
index 2918d16b44..f1ced268ca 100644
--- a/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
+++ b/modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor
@@ -114,7 +114,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseCreateModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="TenantCreateForm" Clicked="@CreateEntityAsync">@L["Save"]</SubmitButton>
+                    <SubmitButton Form="TenantCreateForm" Clicked="@CreateEntityAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -148,7 +148,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditModalAsync">@L["Cancel"]</Button>
-                    <SubmitButton Form="TenantEditForm" Clicked="@UpdateEntityAsync">@L["Save"]</SubmitButton>
+                    <SubmitButton Form="TenantEditForm" Clicked="@UpdateEntityAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>
@@ -187,7 +187,7 @@
                 </ModalBody>
                 <ModalFooter>
                     <Button Color="Color.Secondary" Clicked="CloseEditConnectionStringModal">@L["Cancel"]</Button>
-                    <SubmitButton Form="ConnectionStringEditForm" Clicked="@UpdateConnectionStringAsync">@L["Save"]</SubmitButton>
+                    <SubmitButton Form="ConnectionStringEditForm" Clicked="@UpdateConnectionStringAsync" />
                 </ModalFooter>
             </Form>
         </ModalContent>