Merge pull request #10990 from abpframework/liangshiwei/patch-1

Fixed l10n issue and margin among lines

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Form/AbpInputTagHelperService.cs

@@ -54,7 +54,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
                 output.TagMode = TagMode.StartTagAndEndTag;
                 output.TagName = "div";
                 LeaveOnlyGroupAttributes(context, output);
-                output.Attributes.AddClass("mb-3");
+                output.Attributes.AddClass(isCheckBox ? "mb-2" : "mb-3");
                 if (isCheckBox)
                 {
                     output.Attributes.AddClass("form-check");
@@ -104,7 +104,7 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form
 
         protected virtual string SurroundInnerHtmlAndGet(TagHelperContext context, TagHelperOutput output, string innerHtml, bool isCheckbox)
         {
-            return "<div class=\"" + (isCheckbox ? "mb-3 form-check" : "mb-3") + "\">" +
+            return "<div class=\"" + (isCheckbox ? "mb-2 form-check" : "mb-3") + "\">" +
                    Environment.NewLine + innerHtml + Environment.NewLine +
                    "</div>";
         }

framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js

@@ -101,6 +101,9 @@ var abp = abp || {};
         var l = abp.localization.getResource('AbpUi');
 
         abp.libs.sweetAlert.config.confirm.title = l('AreYouSure');
+        abp.libs.sweetAlert.config.confirm.confirmButtonText = l('Yes');
+        abp.libs.sweetAlert.config.confirm.denyButtonText = l('No');
+        abp.libs.sweetAlert.config.confirm.cancelButtonText = l('Cancel');
         abp.libs.sweetAlert.config.confirm.showCancelButton = true;
         abp.libs.sweetAlert.config.confirm.reverseButtons = true;
     });