Fixed localization problem for AbpUiModule

8 years ago · 82545081e2
29 changed files with 43 additions and 29 deletions
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/AbpMenu/Default.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/Components/AbpMenu/Default.cshtml
@ -1,5 +1,5 @@
@using Volo.Abp.MultiTenancy
-@using Volo.Abp.Ui.Navigation
+@using Volo.Abp.UI.Navigation
@using Volo.Abp.Users
@model ApplicationMenu
@inject ICurrentUser CurrentUser
--- a/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/_AppLayout.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Views/Shared/_AppLayout.cshtml
@ -1,4 +1,4 @@
-@using Volo.Abp.Ui.Navigation
+@using Volo.Abp.UI.Navigation
@{
    Layout = null;
 }
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/AbpAspNetCoreMvcUiModule.cs
@ -2,7 +2,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.AspNetCore.Mvc.Bundling;
 using Volo.Abp.Modularity;
-using Volo.Abp.Ui.Navigation;
+using Volo.Abp.UI.Navigation;
 using Volo.Abp.VirtualFileSystem;

 namespace Volo.Abp.AspNetCore.Mvc
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Ui.Navigation;
+using Volo.Abp.UI.Navigation;

 namespace Volo.Abp.AspNetCore.Mvc.Views.Shared.Components.AbpMenu
 {
--- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs
@ -24,7 +24,7 @@ using Volo.Abp.AspNetCore.VirtualFileSystem;
 using Volo.Abp.Http;
 using Volo.Abp.Http.Modeling;
 using Volo.Abp.Localization;
-using Volo.Abp.Ui;
+using Volo.Abp.UI;

 namespace Volo.Abp.AspNetCore.Mvc
 {
--- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/DefaultExceptionToErrorInfoConverter.cs
@ -6,7 +6,7 @@ using Volo.Abp.Authorization;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities;
 using Volo.Abp.Http;
-using Volo.Abp.Ui;
+using Volo.Abp.UI;
 using Volo.Abp.Validation;

 namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
--- a/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs
+++ b/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs
@ -131,7 +131,12 @@ namespace Volo.Abp.Localization
            if (includeParentCultures)
            {
                //Fill all strings from default dictionary
-                var defaultDictionary = Resource.DictionaryProvider.Dictionaries[Resource.DefaultCultureName]; //TODO: What if not contains a default dictionary?
+                var defaultDictionary = Resource.DictionaryProvider.Dictionaries.GetOrDefault(Resource.DefaultCultureName); //TODO: What if not contains a default dictionary?
+                if (defaultDictionary == null)
+                {
+                    throw new Exception($"{Resource.DefaultCultureName} not found for {Resource.ResourceType.FullName}");
+                }
+
                if (defaultDictionary != null)
                {
                    foreach (var defaultDictString in defaultDictionary.GetAllStrings())
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/AbpUiNavigationModule.cs
@ -1,7 +1,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Modularity;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    [DependsOn(typeof(AbpUiModule))]
    public class AbpUiNavigationModule : AbpModule
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenu.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public class ApplicationMenu : IHasMenuItems
    {
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/ApplicationMenuItem.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public class ApplicationMenuItem : IHasMenuItems
    {
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IHasMenuItems.cs
@ -1,6 +1,6 @@
 using System.Collections.Generic;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public interface IHasMenuItems
    {
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuConfigurationContext.cs
@ -1,6 +1,6 @@
 using Volo.Abp.DependencyInjection;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public interface IMenuConfigurationContext : IServiceProviderAccessor
    {
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuContributor.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuContributor.cs
@ -1,6 +1,6 @@
 using System.Threading.Tasks;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public interface IMenuContributor
    {
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuManager.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/IMenuManager.cs
@ -1,6 +1,6 @@
 using System.Threading.Tasks;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public interface IMenuManager
    {
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuConfigurationContext.cs
@ -1,6 +1,6 @@
 using System;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public class MenuConfigurationContext : IMenuConfigurationContext
    {
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/MenuManager.cs
@ -4,7 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    //TODO: We can move Navigation to a dedicated dll, or to a Volo.Abp.Ui dll.
    public class MenuManager : IMenuManager, ITransientDependency
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/NavigationOptions.cs
@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using JetBrains.Annotations;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public class NavigationOptions
    {
--- a/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/StandardMenus.cs
+++ b/src/Volo.Abp.UI.Navigation/Volo/Abp/Ui/Navigation/StandardMenus.cs
@ -1,4 +1,4 @@
-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public static class StandardMenus
    {
--- a/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs
+++ b/src/Volo.Abp.UI/Volo/Abp/Ui/AbpUiModule.cs
@ -2,9 +2,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using Volo.Abp.Localization;
 using Volo.Abp.Modularity;
+using Volo.Abp.VirtualFileSystem;

-namespace Volo.Abp.Ui
+namespace Volo.Abp.UI
 {
+    [DependsOn(
+        typeof(AbpLocalizationModule)
+    )]
    public class AbpUiModule : AbpModule
    {
        public override void ConfigureServices(IServiceCollection services)
@ -14,6 +18,11 @@ namespace Volo.Abp.Ui
                options.Resources.AddVirtualJson<AbpUiResource>("en", "/Localization/Resources/AbpUi");
            });

+            services.Configure<VirtualFileSystemOptions>(options =>
+            {
+                options.FileSets.AddEmbedded<AbpUiModule>("");
+            });
+
            services.AddAssemblyOf<AbpUiModule>();
        }
    }
--- a/src/Volo.Abp.UI/Volo/Abp/Ui/IUserFriendlyException.cs
+++ b/src/Volo.Abp.UI/Volo/Abp/Ui/IUserFriendlyException.cs
@ -1,4 +1,4 @@
-namespace Volo.Abp.Ui
+namespace Volo.Abp.UI
 {
    /* TODO:
     * - define an interface to split Details, like IHasExceptionDetails
--- a/src/Volo.Abp.UI/Volo/Abp/Ui/UserFriendlyException.cs
+++ b/src/Volo.Abp.UI/Volo/Abp/Ui/UserFriendlyException.cs
@ -3,7 +3,7 @@ using System.Runtime.Serialization;
 using Microsoft.Extensions.Logging;
 using Volo.Abp.Logging;

-namespace Volo.Abp.Ui
+namespace Volo.Abp.UI
 {
    /// <summary>
    /// This exception type is directly shown to the user.
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/Views/Simple/ExceptionOnRazor.cshtml
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/App/Views/Simple/ExceptionOnRazor.cshtml
@ -1,4 +1,4 @@
-@using Volo.Abp.Ui
+@using Volo.Abp.UI
 <h2>Exception test</h2>
@{
    throw new UserFriendlyException("test exception!");
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController.cs
@ -1,5 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Ui;
+using Volo.Abp.UI;

 namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
 {
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ExceptionHandling/ExceptionTestController_Tests.cs
@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Shouldly;
 using Volo.Abp.Http;
-using Volo.Abp.Ui;
+using Volo.Abp.UI;
 using Xunit;

 namespace Volo.Abp.AspNetCore.Mvc.ExceptionHandling
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/SimpleController_Tests.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/SimpleController_Tests.cs
@ -1,7 +1,7 @@
 using System.Threading.Tasks;
 using Shouldly;
 using Volo.Abp.AspNetCore.App;
-using Volo.Abp.Ui;
+using Volo.Abp.UI;
 using Xunit;

 namespace Volo.Abp.AspNetCore.Mvc
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/TestUnitOfWork.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/TestUnitOfWork.cs
@ -3,7 +3,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Options;
 using Volo.Abp.DependencyInjection;
-using Volo.Abp.Ui;
+using Volo.Abp.UI;
 using Volo.Abp.Uow;

 namespace Volo.Abp.AspNetCore.Mvc.Uow
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/UnitOfWorkTestController.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Uow/UnitOfWorkTestController.cs
@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc;
 using Shouldly;
-using Volo.Abp.Ui;
+using Volo.Abp.UI;
 using Volo.Abp.Uow;

 namespace Volo.Abp.AspNetCore.Mvc.Uow
--- a/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestController.cs
+++ b/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/RegularTestController.cs
@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.Application.Services;
 using Volo.Abp.AspNetCore.Mvc;
-using Volo.Abp.Ui;
+using Volo.Abp.UI;

 namespace Volo.Abp.Http.DynamicProxying
 {
--- a/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
+++ b/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
@ -5,7 +5,7 @@ using Volo.Abp.Modularity;
 using System.Collections.Generic;
 using Xunit;

-namespace Volo.Abp.Ui.Navigation
+namespace Volo.Abp.UI.Navigation
 {
    public class MenuManager_Tests : AbpIntegratedTest<MenuManager_Tests.TestModule>
    {