Browse Source

Remove LanguageProviderExtensions.

pull/1467/head
Halil İbrahim Kalkan 7 years ago
parent
commit
95e6d07f11
  1. 11
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Toolbars/BasicThemeMainTopToolbarContributor.cs
  2. 2
      framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs
  3. 2
      framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Authentication/IRemoteServiceHttpClientAuthenticator.cs
  4. 13
      framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs

11
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Toolbars/BasicThemeMainTopToolbarContributor.cs

@ -10,22 +10,23 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Toolbars
{ {
public class BasicThemeMainTopToolbarContributor : IToolbarContributor public class BasicThemeMainTopToolbarContributor : IToolbarContributor
{ {
public Task ConfigureToolbarAsync(IToolbarConfigurationContext context) public async Task ConfigureToolbarAsync(IToolbarConfigurationContext context)
{ {
if (context.Toolbar.Name != StandardToolbars.Main) if (context.Toolbar.Name != StandardToolbars.Main)
{ {
return Task.CompletedTask; return;
} }
if (!(context.Theme is BasicTheme)) if (!(context.Theme is BasicTheme))
{ {
return Task.CompletedTask; return;
} }
var languageProvider = context.ServiceProvider.GetService<ILanguageProvider>(); var languageProvider = context.ServiceProvider.GetService<ILanguageProvider>();
//TODO: This duplicates GetLanguages() usage. Can we eleminate this? //TODO: This duplicates GetLanguages() usage. Can we eleminate this?
if (languageProvider.GetLanguages().Count > 1) var languages = await languageProvider.GetLanguagesAsync();
if (languages.Count > 1)
{ {
context.Toolbar.Items.Add(new ToolbarItem(typeof(LanguageSwitchViewComponent))); context.Toolbar.Items.Add(new ToolbarItem(typeof(LanguageSwitchViewComponent)));
} }
@ -34,8 +35,6 @@ namespace Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Toolbars
{ {
context.Toolbar.Items.Add(new ToolbarItem(typeof(UserMenuViewComponent))); context.Toolbar.Items.Add(new ToolbarItem(typeof(UserMenuViewComponent)));
} }
return Task.CompletedTask;
} }
} }
} }

2
framework/src/Volo.Abp.AspNetCore/Microsoft/AspNetCore/Builder/AbpApplicationBuilderExtensions.cs

@ -56,7 +56,7 @@ namespace Microsoft.AspNetCore.Builder
using (var scope = app.ApplicationServices.CreateScope()) using (var scope = app.ApplicationServices.CreateScope())
{ {
var languageProvider = scope.ServiceProvider.GetRequiredService<ILanguageProvider>(); var languageProvider = scope.ServiceProvider.GetRequiredService<ILanguageProvider>();
languages = languageProvider.GetLanguages(); languages = AsyncHelper.RunSync(() => languageProvider.GetLanguagesAsync());
var settingProvider = scope.ServiceProvider.GetRequiredService<ISettingProvider>(); var settingProvider = scope.ServiceProvider.GetRequiredService<ISettingProvider>();
defaultLanguage = settingProvider.GetOrNull(LocalizationSettingNames.DefaultLanguage); defaultLanguage = settingProvider.GetOrNull(LocalizationSettingNames.DefaultLanguage);

2
framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/Authentication/IRemoteServiceHttpClientAuthenticator.cs

@ -4,6 +4,6 @@ namespace Volo.Abp.Http.Client.Authentication
{ {
public interface IRemoteServiceHttpClientAuthenticator public interface IRemoteServiceHttpClientAuthenticator
{ {
Task Authenticate(RemoteServiceHttpClientAuthenticateContext context); Task Authenticate(RemoteServiceHttpClientAuthenticateContext context); //TODO: Rename to AuthenticateAsync
} }
} }

13
framework/src/Volo.Abp.Localization/Volo/Abp/Localization/LanguageProviderExtensions.cs

@ -1,13 +0,0 @@
using System.Collections.Generic;
using Volo.Abp.Threading;
namespace Volo.Abp.Localization
{
public static class LanguageProviderExtensions
{
public static IReadOnlyList<LanguageInfo> GetLanguages(this ILanguageProvider languageProvider)
{
return AsyncHelper.RunSync(languageProvider.GetLanguagesAsync);
}
}
}
Loading…
Cancel
Save