diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs index d4047edb9e..ca9bf999b1 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/AbpAspNetCoreMvcUiBootstrapModule.cs @@ -2,8 +2,6 @@ using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.EmbeddedFiles; using Volo.Abp.AspNetCore.Mvc.Bundling; -using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap; -using Volo.Abp.Localization; using Volo.Abp.Modularity; using Volo.Abp.VirtualFileSystem; @@ -22,11 +20,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap options.FileSets.AddEmbedded("Volo.Abp.AspNetCore.Mvc.UI.Bootstrap"); }); - services.Configure(options => - { - options.Resources.AddVirtualJson("en", "/Localization/Resources/AbpBootstrap"); - }); - services.Configure(options => { options.StyleBundles.Add("GlobalStyles", new[] diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/AbpBootstrapResource.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/AbpBootstrapResource.cs deleted file mode 100644 index 0f51787c01..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/AbpBootstrapResource.cs +++ /dev/null @@ -1,9 +0,0 @@ -using Volo.Abp.Localization; - -namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap -{ - [ShortLocalizationResourceName("AbpBootstrap")] - public class AbpBootstrapResource - { - } -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelper.cs b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelper.cs index d7673b7e91..967c5caf74 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelper.cs +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/TagHelpers/Modal/AbpModalFooterTagHelper.cs @@ -1,15 +1,15 @@ using System.Text; +using Localization.Resources.AbpUi; using Microsoft.AspNetCore.Razor.TagHelpers; using Microsoft.Extensions.Localization; -using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Localization.Resources.AbpBootstrap; namespace Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal { public class AbpModalFooterTagHelper : TagHelper { - private readonly IStringLocalizer _localizer; + private readonly IStringLocalizer _localizer; - public AbpModalFooterTagHelper(IStringLocalizer localizer) + public AbpModalFooterTagHelper(IStringLocalizer localizer) { _localizer = localizer; } diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj index d02d88b047..d57679b9e0 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj @@ -12,7 +12,6 @@ - diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj index f4b290c20e..dedf33e8d0 100644 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj +++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj @@ -11,20 +11,8 @@ - - - - - - - - - - - - - - + + diff --git a/src/Volo.Abp.UI/Localization/Resources/AbpUi/AbpUiResource.cs b/src/Volo.Abp.UI/Localization/Resources/AbpUi/AbpUiResource.cs new file mode 100644 index 0000000000..89836b8497 --- /dev/null +++ b/src/Volo.Abp.UI/Localization/Resources/AbpUi/AbpUiResource.cs @@ -0,0 +1,9 @@ +using Volo.Abp.Localization; + +namespace Localization.Resources.AbpUi +{ + [ShortLocalizationResourceName("AbpUi")] + public class AbpUiResource + { + } +} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/en.json b/src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/en.json rename to src/Volo.Abp.UI/Localization/Resources/AbpUi/en.json diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/tr.json b/src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Localization/Resources/AbpBootstrap/tr.json rename to src/Volo.Abp.UI/Localization/Resources/AbpUi/tr.json diff --git a/src/Volo.Abp.UI/Volo.Abp.UI.csproj b/src/Volo.Abp.UI/Volo.Abp.UI.csproj index 77a2f7059e..d93f240045 100644 --- a/src/Volo.Abp.UI/Volo.Abp.UI.csproj +++ b/src/Volo.Abp.UI/Volo.Abp.UI.csproj @@ -14,7 +14,11 @@ - + + + + + \ No newline at end of file diff --git a/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs b/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs index 81d4e7a68a..fd24ed49eb 100644 --- a/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs +++ b/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs @@ -1,4 +1,6 @@ -using Microsoft.Extensions.DependencyInjection; +using Localization.Resources.AbpUi; +using Microsoft.Extensions.DependencyInjection; +using Volo.Abp.Localization; using Volo.Abp.Modularity; namespace Volo.Abp.Ui @@ -7,6 +9,11 @@ namespace Volo.Abp.Ui { public override void ConfigureServices(IServiceCollection services) { + services.Configure(options => + { + options.Resources.AddVirtualJson("en", "/Localization/Resources/AbpUi"); + }); + services.AddAssemblyOf(); } }