From 1e2aa8d39c82f8d1d08284388c07f0cb8e82d154 Mon Sep 17 00:00:00 2001 From: "ismail.yilmaz" Date: Mon, 13 Dec 2021 11:32:33 +0300 Subject: [PATCH 1/3] Fixes #10920 --- .../Volo/Abp/Cli/AbpCliCoreModule.cs | 41 +++++++++---------- .../Volo/Abp/Cli/Commands/AddModuleCommand.cs | 2 + .../Abp/Cli/Commands/AddPackageCommand.cs | 2 + .../Volo/Abp/Cli/Commands/BuildCommand.cs | 2 + .../Volo/Abp/Cli/Commands/BundleCommand.cs | 2 + .../CreateMigrationAndRunMigratorCommand.cs | 2 + .../Volo/Abp/Cli/Commands/GetSourceCommand.cs | 2 + .../Volo/Abp/Cli/Commands/HelpCommand.cs | 2 + .../Abp/Cli/Commands/InstallLibsCommand.cs | 2 + .../Abp/Cli/Commands/ListModulesCommand.cs | 2 + .../Volo/Abp/Cli/Commands/LoginCommand.cs | 2 + .../Volo/Abp/Cli/Commands/LoginInfoCommand.cs | 2 + .../Volo/Abp/Cli/Commands/LogoutCommand.cs | 2 + .../Volo/Abp/Cli/Commands/NewCommand.cs | 2 + .../Volo/Abp/Cli/Commands/PromptCommand.cs | 2 + .../Volo/Abp/Cli/Commands/SuiteCommand.cs | 2 + .../Cli/Commands/SwitchToNightlyCommand.cs | 2 + .../Cli/Commands/SwitchToPreviewCommand.cs | 2 + .../Abp/Cli/Commands/SwitchToStableCommand.cs | 2 + .../Volo/Abp/Cli/Commands/TranslateCommand.cs | 2 + .../Volo/Abp/Cli/Commands/UpdateCommand.cs | 2 + 21 files changed, 60 insertions(+), 21 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs index 303acd7e00..83a9352faf 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs @@ -41,29 +41,28 @@ public class AbpCliCoreModule : AbpModule Configure(options => { - //TODO: Define constants like done for GenerateProxyCommand.Name. - options.Commands["help"] = typeof(HelpCommand); - options.Commands["prompt"] = typeof(PromptCommand); - options.Commands["new"] = typeof(NewCommand); - options.Commands["get-source"] = typeof(GetSourceCommand); - options.Commands["update"] = typeof(UpdateCommand); - options.Commands["add-package"] = typeof(AddPackageCommand); - options.Commands["add-module"] = typeof(AddModuleCommand); - options.Commands["list-modules"] = typeof(ListModulesCommand); - options.Commands["login"] = typeof(LoginCommand); - options.Commands["login-info"] = typeof(LoginInfoCommand); - options.Commands["logout"] = typeof(LogoutCommand); + options.Commands[HelpCommand.Name] = typeof(HelpCommand); + options.Commands[PromptCommand.Name] = typeof(PromptCommand); + options.Commands[NewCommand.Name] = typeof(NewCommand); + options.Commands[GetSourceCommand.Name] = typeof(GetSourceCommand); + options.Commands[UpdateCommand.Name] = typeof(UpdateCommand); + options.Commands[AddPackageCommand.Name] = typeof(AddPackageCommand); + options.Commands[AddModuleCommand.Name] = typeof(AddModuleCommand); + options.Commands[ListModulesCommand.Name] = typeof(ListModulesCommand); + options.Commands[LoginCommand.Name] = typeof(LoginCommand); + options.Commands[LoginInfoCommand.Name] = typeof(LoginInfoCommand); + options.Commands[LogoutCommand.Name] = typeof(LogoutCommand); options.Commands[GenerateProxyCommand.Name] = typeof(GenerateProxyCommand); options.Commands[RemoveProxyCommand.Name] = typeof(RemoveProxyCommand); - options.Commands["suite"] = typeof(SuiteCommand); - options.Commands["switch-to-preview"] = typeof(SwitchToPreviewCommand); - options.Commands["switch-to-stable"] = typeof(SwitchToStableCommand); - options.Commands["switch-to-nightly"] = typeof(SwitchToNightlyCommand); - options.Commands["translate"] = typeof(TranslateCommand); - options.Commands["build"] = typeof(BuildCommand); - options.Commands["bundle"] = typeof(BundleCommand); - options.Commands["create-migration-and-run-migrator"] = typeof(CreateMigrationAndRunMigratorCommand); - options.Commands["install-libs"] = typeof(InstallLibsCommand); + options.Commands[SuiteCommand.Name] = typeof(SuiteCommand); + options.Commands[SwitchToPreviewCommand.Name] = typeof(SwitchToPreviewCommand); + options.Commands[SwitchToStableCommand.Name] = typeof(SwitchToStableCommand); + options.Commands[SwitchToNightlyCommand.Name] = typeof(SwitchToNightlyCommand); + options.Commands[TranslateCommand.Name] = typeof(TranslateCommand); + options.Commands[BuildCommand.Name] = typeof(BuildCommand); + options.Commands[BundleCommand.Name] = typeof(BundleCommand); + options.Commands[CreateMigrationAndRunMigratorCommand.Name] = typeof(CreateMigrationAndRunMigratorCommand); + options.Commands[InstallLibsCommand.Name] = typeof(InstallLibsCommand); }); Configure(options => diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs index df38d7c57b..df81fe4cb7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddModuleCommand.cs @@ -14,6 +14,8 @@ namespace Volo.Abp.Cli.Commands; public class AddModuleCommand : IConsoleCommand, ITransientDependency { + public const string Name = "add-module"; + private AddModuleInfoOutput _lastAddedModuleInfo; public ILogger Logger { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs index 41d9824c6b..d21730dbb8 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/AddPackageCommand.cs @@ -14,6 +14,8 @@ namespace Volo.Abp.Cli.Commands; public class AddPackageCommand : IConsoleCommand, ITransientDependency { + public const string Name = "add-package"; + public ILogger Logger { get; set; } protected ProjectNugetPackageAdder ProjectNugetPackageAdder { get; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs index 52c7fdd56c..327b737e89 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BuildCommand.cs @@ -12,6 +12,8 @@ namespace Volo.Abp.Cli.Commands; public class BuildCommand : IConsoleCommand, ITransientDependency { + public const string Name = "build"; + public IDotNetProjectDependencyFiller DotNetProjectDependencyFiller { get; set; } public IChangedProjectFinder ChangedProjectFinder { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs index 5367e7461a..e758d22dd3 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/BundleCommand.cs @@ -11,6 +11,8 @@ namespace Volo.Abp.Cli.Commands; public class BundleCommand : IConsoleCommand, ITransientDependency { + public const string Name = "bundle"; + public ILogger Logger { get; set; } public IBundlingService BundlingService { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs index a0ffbeacea..3b6fbefe98 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs @@ -12,6 +12,8 @@ namespace Volo.Abp.Cli.Commands; public class CreateMigrationAndRunMigratorCommand : IConsoleCommand, ITransientDependency { + public const string Name = "create-migration-and-run-migrator"; + public ICmdHelper CmdHelper { get; } public ILogger Logger { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GetSourceCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GetSourceCommand.cs index 164fc52193..1cccf87f7b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GetSourceCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/GetSourceCommand.cs @@ -13,6 +13,8 @@ namespace Volo.Abp.Cli.Commands; public class GetSourceCommand : IConsoleCommand, ITransientDependency { + public const string Name = "get-source"; + private readonly SourceCodeDownloadService _sourceCodeDownloadService; public ModuleProjectBuilder ModuleProjectBuilder { get; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs index 317b1f34ea..918136c8d1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/HelpCommand.cs @@ -12,6 +12,8 @@ namespace Volo.Abp.Cli.Commands; public class HelpCommand : IConsoleCommand, ITransientDependency { + public const string Name = "help"; + public ILogger Logger { get; set; } protected AbpCliOptions AbpCliOptions { get; } protected IServiceScopeFactory ServiceScopeFactory { get; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs index df95204f51..0cf2fd525b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/InstallLibsCommand.cs @@ -12,6 +12,8 @@ namespace Volo.Abp.Cli.Commands; public class InstallLibsCommand : IConsoleCommand, ITransientDependency { + public const string Name = "install-libs"; + public ILogger Logger { get; set; } protected IInstallLibsService InstallLibsService { get; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListModulesCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListModulesCommand.cs index 1c59a37c46..a916598aac 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListModulesCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ListModulesCommand.cs @@ -12,6 +12,8 @@ namespace Volo.Abp.Cli.Commands; public class ListModulesCommand : IConsoleCommand, ITransientDependency { + public const string Name = "list-modules"; + public ModuleInfoProvider ModuleInfoProvider { get; } public ILogger Logger { get; set; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs index 9cd84a4d41..d98beb268d 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginCommand.cs @@ -18,6 +18,8 @@ namespace Volo.Abp.Cli.Commands; public class LoginCommand : IConsoleCommand, ITransientDependency { + public const string Name = "login"; + public ILogger Logger { get; set; } protected AuthService AuthService { get; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginInfoCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginInfoCommand.cs index 19ce3853cd..0c456f0bca 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginInfoCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LoginInfoCommand.cs @@ -11,6 +11,8 @@ namespace Volo.Abp.Cli.Commands; public class LoginInfoCommand : IConsoleCommand, ITransientDependency { + public const string Name = "login-info"; + public ILogger Logger { get; set; } protected AuthService AuthService { get; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LogoutCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LogoutCommand.cs index 6cefaad8e4..ed571dd7b4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LogoutCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/LogoutCommand.cs @@ -9,6 +9,8 @@ namespace Volo.Abp.Cli.Commands; public class LogoutCommand : IConsoleCommand, ITransientDependency { + public const string Name = "logout"; + public ILogger Logger { get; set; } protected AuthService AuthService { get; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs index 6b01d93de9..2a8542d640 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs @@ -19,6 +19,8 @@ namespace Volo.Abp.Cli.Commands; public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransientDependency { + public const string Name = "new"; + public ILogger Logger { get; set; } protected TemplateProjectBuilder TemplateProjectBuilder { get; } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/PromptCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/PromptCommand.cs index f1ff0f6025..cbd9267989 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/PromptCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/PromptCommand.cs @@ -7,6 +7,8 @@ namespace Volo.Abp.Cli.Commands; public class PromptCommand : IConsoleCommand, ITransientDependency { + public const string Name = "prompt"; + public Task ExecuteAsync(CommandLineArgs commandLineArgs) { return Task.CompletedTask; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs index 760cbb0e45..0e797e682f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SuiteCommand.cs @@ -15,6 +15,8 @@ namespace Volo.Abp.Cli.Commands; public class SuiteCommand : IConsoleCommand, ITransientDependency { + public const string Name = "suite"; + public ICmdHelper CmdHelper { get; } private readonly AbpNuGetIndexUrlService _nuGetIndexUrlService; private readonly NuGetService _nuGetService; diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToNightlyCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToNightlyCommand.cs index 0bfb3ea24b..4893680004 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToNightlyCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToNightlyCommand.cs @@ -8,6 +8,8 @@ namespace Volo.Abp.Cli.Commands; public class SwitchToNightlyCommand : IConsoleCommand, ITransientDependency { + public const string Name = "switch-to-nightly"; + private readonly PackagePreviewSwitcher _packagePreviewSwitcher; public SwitchToNightlyCommand(PackagePreviewSwitcher packagePreviewSwitcher) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToPreviewCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToPreviewCommand.cs index 2917a58449..84b58d6b8b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToPreviewCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToPreviewCommand.cs @@ -8,6 +8,8 @@ namespace Volo.Abp.Cli.Commands; public class SwitchToPreviewCommand : IConsoleCommand, ITransientDependency { + public const string Name = "switch-to-preview"; + private readonly PackagePreviewSwitcher _packagePreviewSwitcher; public SwitchToPreviewCommand(PackagePreviewSwitcher packagePreviewSwitcher) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToStableCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToStableCommand.cs index 84400f85ef..cc0fa9ff75 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToStableCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/SwitchToStableCommand.cs @@ -8,6 +8,8 @@ namespace Volo.Abp.Cli.Commands; public class SwitchToStableCommand : IConsoleCommand, ITransientDependency { + public const string Name = "switch-to-stable"; + private readonly PackagePreviewSwitcher _packagePreviewSwitcher; public SwitchToStableCommand(PackagePreviewSwitcher packagePreviewSwitcher) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/TranslateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/TranslateCommand.cs index f4895538da..ea6b1d45f6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/TranslateCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/TranslateCommand.cs @@ -15,6 +15,8 @@ namespace Volo.Abp.Cli.Commands; public class TranslateCommand : IConsoleCommand, ITransientDependency { + public const string Name = "translate"; + public ILogger Logger { get; set; } public Task ExecuteAsync(CommandLineArgs commandLineArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs index 7057df1dd0..fdc9b83fcf 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/UpdateCommand.cs @@ -13,6 +13,8 @@ namespace Volo.Abp.Cli.Commands; public class UpdateCommand : IConsoleCommand, ITransientDependency { + public const string Name = "update"; + public ILogger Logger { get; set; } private readonly VoloNugetPackagesVersionUpdater _nugetPackagesVersionUpdater; From a3a674399b699df4f00d0a1ef5eae93547f47a32 Mon Sep 17 00:00:00 2001 From: "ismail.yilmaz" Date: Mon, 20 Dec 2021 01:36:19 +0300 Subject: [PATCH 2/3] Fixed a l10n issue on confirm dialog --- .../sweetalert2/abp-sweetalert2.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js index f89f6ffed7..4fc9bdba34 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js @@ -4,6 +4,10 @@ var abp = abp || {}; return; } + var localize = function (key) { + return abp.localization.getResource('AbpUi')(key); + }; + /* DEFAULTS *************************************************/ abp.libs = abp.libs || {}; @@ -98,9 +102,10 @@ var abp = abp || {}; }; abp.event.on('abp.configurationInitialized', function () { - var l = abp.localization.getResource('AbpUi'); - - abp.libs.sweetAlert.config.confirm.title = l('AreYouSure'); + abp.libs.sweetAlert.config.confirm.title = localize('AreYouSure'); + abp.libs.sweetAlert.config.confirm.confirmButtonText = localize('Yes'); + abp.libs.sweetAlert.config.confirm.denyButtonText = localize('No'); + abp.libs.sweetAlert.config.confirm.cancelButtonText = localize('Cancel'); abp.libs.sweetAlert.config.confirm.showCancelButton = true; abp.libs.sweetAlert.config.confirm.reverseButtons = true; }); From 199e40d31f6a5f1dbc12fe5392d2ecf203741e5c Mon Sep 17 00:00:00 2001 From: "ismail.yilmaz" Date: Mon, 20 Dec 2021 01:38:27 +0300 Subject: [PATCH 3/3] Revert "Fixed a l10n issue on confirm dialog" This reverts commit a3a674399b699df4f00d0a1ef5eae93547f47a32. --- .../sweetalert2/abp-sweetalert2.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js index 4fc9bdba34..f89f6ffed7 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/sweetalert2/abp-sweetalert2.js @@ -4,10 +4,6 @@ var abp = abp || {}; return; } - var localize = function (key) { - return abp.localization.getResource('AbpUi')(key); - }; - /* DEFAULTS *************************************************/ abp.libs = abp.libs || {}; @@ -102,10 +98,9 @@ var abp = abp || {}; }; abp.event.on('abp.configurationInitialized', function () { - abp.libs.sweetAlert.config.confirm.title = localize('AreYouSure'); - abp.libs.sweetAlert.config.confirm.confirmButtonText = localize('Yes'); - abp.libs.sweetAlert.config.confirm.denyButtonText = localize('No'); - abp.libs.sweetAlert.config.confirm.cancelButtonText = localize('Cancel'); + var l = abp.localization.getResource('AbpUi'); + + abp.libs.sweetAlert.config.confirm.title = l('AreYouSure'); abp.libs.sweetAlert.config.confirm.showCancelButton = true; abp.libs.sweetAlert.config.confirm.reverseButtons = true; });