diff --git a/Logic/Resources/MonoResourceManager.cs b/Logic/Resources/MonoResourceManager.cs index f8cfdda8..130ccea9 100644 --- a/Logic/Resources/MonoResourceManager.cs +++ b/Logic/Resources/MonoResourceManager.cs @@ -1,12 +1,30 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; +using System.Reflection; +using System.Resources; using System.Text; using System.Threading.Tasks; namespace Swarmops.Logic.Resources { - class MonoResourceManager + public class MonoResourceManager: System.Resources.ResourceManager { + public MonoResourceManager(string baseName) + : base (baseName, Assembly.Load("Swarmops.Frontend." + baseName + ".resources.dll")) + { + + } + + protected override string GetResourceFileName(CultureInfo culture) + { + if (culture.IsNeutralCulture || culture.Name == "en-US") + { + return "Swarmops.Frontend." + this.BaseName + ".resources.dll"; + } + + return "Swarmops.Frontend." + this.BaseName + "." + culture.Name + ".resources.dll"; + } } } diff --git a/Site/App_GlobalResources/Global.designer.cs b/Site/App_GlobalResources/Global.designer.cs index 6c7602a9..262787e9 100644 --- a/Site/App_GlobalResources/Global.designer.cs +++ b/Site/App_GlobalResources/Global.designer.cs @@ -10,6 +10,7 @@ using System.Globalization; using System.IO; +using Swarmops.Logic.Resources; namespace Resources { using System; @@ -42,7 +43,7 @@ namespace Resources { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Global", GetCurrentCultureAssembly("Global")); + global::System.Resources.ResourceManager temp = new MonoResourceManager("Global"); resourceMan = temp; } return resourceMan; diff --git a/Site/App_GlobalResources/Menu5.designer.cs b/Site/App_GlobalResources/Menu5.designer.cs index 1fdabdf8..efd64e4d 100644 --- a/Site/App_GlobalResources/Menu5.designer.cs +++ b/Site/App_GlobalResources/Menu5.designer.cs @@ -10,6 +10,7 @@ using System.Globalization; using System.IO; +using Swarmops.Logic.Resources; namespace Resources { using System; @@ -41,8 +42,9 @@ namespace Resources { [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Menu5", GetCurrentCultureAssembly("Menu5")); + if (object.ReferenceEquals(resourceMan, null)) + { + global::System.Resources.ResourceManager temp = new MonoResourceManager("Menu5"); resourceMan = temp; } return resourceMan;