diff --git a/Site/App_GlobalResources/Global.designer.cs b/Site/App_GlobalResources/Global.designer.cs index 4d41e467..8de0715a 100644 --- a/Site/App_GlobalResources/Global.designer.cs +++ b/Site/App_GlobalResources/Global.designer.cs @@ -51,7 +51,7 @@ namespace Resources { /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; } diff --git a/Site/App_GlobalResources/Menu5.designer.cs b/Site/App_GlobalResources/Menu5.designer.cs index 7f19df3b..8f84fd26 100644 --- a/Site/App_GlobalResources/Menu5.designer.cs +++ b/Site/App_GlobalResources/Menu5.designer.cs @@ -8,6 +8,8 @@ // //------------------------------------------------------------------------------ +using System.Globalization; + namespace Resources { using System; @@ -39,19 +41,39 @@ 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("Menu5", global::System.Reflection.Assembly.Load("Menu5")); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Menu5", GetCurrentCultureAssembly("Menu5")); resourceMan = temp; } return resourceMan; } } - + + internal static System.Reflection.Assembly GetCurrentCultureAssembly(string baseAssemblyName) + { + string prefix = string.Empty; + string infix = string.Empty; + string suffix = ".resources"; + + CultureInfo currentCulture = CultureInfo.CurrentUICulture; + if (currentCulture != null /* && currentCulture.Name != "neutral" */) + { + string cultureName = currentCulture.Name; + + infix = "." + cultureName; + prefix = cultureName + "/"; + + return System.Reflection.Assembly.Load(prefix + baseAssemblyName + infix + suffix); + } + + return System.Reflection.Assembly.Load(baseAssemblyName + suffix); + } + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + public static global::System.Globalization.CultureInfo Culture { get { return resourceCulture; }