Browse Source

Remove duplicate definition of AccountResource

pull/1561/head
Halil İbrahim Kalkan 7 years ago
parent
commit
ba2796d69f
  1. 15
      modules/account/src/Volo.Abp.Account.HttpApi/Volo/Abp/Account/AbpAccountHttpApiModule.cs
  2. 13
      modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs

15
modules/account/src/Volo.Abp.Account.HttpApi/Volo/Abp/Account/AbpAccountHttpApiModule.cs

@ -1,4 +1,7 @@
using Volo.Abp.AspNetCore.Mvc;
using Localization.Resources.AbpUi;
using Volo.Abp.Account.Localization;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.Localization;
using Volo.Abp.Modularity;
namespace Volo.Abp.Account
@ -8,6 +11,14 @@ namespace Volo.Abp.Account
typeof(AbpAspNetCoreMvcModule))]
public class AbpAccountHttpApiModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
Configure<AbpLocalizationOptions>(options =>
{
options.Resources
.Get<AccountResource>()
.AddBaseTypes(typeof(AbpUiResource));
});
}
}
}

13
modules/account/src/Volo.Abp.Account.Web/AbpAccountWebModule.cs

@ -1,12 +1,9 @@
using Localization.Resources.AbpUi;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.Account.Localization;
using Volo.Abp.AspNetCore.Mvc.Localization;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
using Volo.Abp.Identity.AspNetCore;
using Volo.Abp.Localization;
using Volo.Abp.Localization.Resources.AbpValidation;
using Volo.Abp.Modularity;
using Volo.Abp.UI.Navigation;
using Volo.Abp.VirtualFileSystem;
@ -40,14 +37,6 @@ namespace Volo.Abp.Account.Web
options.MenuContributors.Add(new AbpAccountUserMenuContributor());
});
Configure<AbpLocalizationOptions>(options =>
{
options.Resources
.Add<AccountResource>("en")
.AddVirtualJson("/Localization/Resources/AbpAccount/Web")
.AddBaseTypes(typeof(AbpUiResource), typeof(AbpValidationResource));
});
Configure<ToolbarOptions>(options =>
{
options.Contributors.Add(new AccountModuleToolbarContributor());

Loading…
Cancel
Save