Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resolved SPRNET-1085

Browse Source
This commit is contained in:
eeichinger
2008-11-05 21:47:49 +00:00
parent 739068ba81
commit 954a457448
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/Spring/Spring.Web/Web/UI/MasterPage.cs
View File

@@ -371,15 +371,16 @@ namespace Spring.Web.UI
/// <returns>Local ResourceManager instance.</returns>
private ResourceManager GetLocalResourceManager()
{
object resourceProvider = Page.GetLocalResourceProvider.Invoke(typeof(ResourceExpressionBuilder), new object[] {this});
MethodInfo GetLocalResourceAssembly =
resourceProvider.GetType().GetMethod("GetLocalResourceAssembly", BindingFlags.NonPublic | BindingFlags.Instance);
Assembly localResourceAssembly = (Assembly) GetLocalResourceAssembly.Invoke(resourceProvider, null);
if (localResourceAssembly != null)
{
return new ResourceManager(VirtualPathUtility.GetFileName(this.AppRelativeVirtualPath), localResourceAssembly);
}
return null;
// object resourceProvider = Page.GetLocalResourceProvider.Invoke(typeof(ResourceExpressionBuilder), new object[] {this});
// MethodInfo GetLocalResourceAssembly =
// resourceProvider.GetType().GetMethod("GetLocalResourceAssembly", BindingFlags.NonPublic | BindingFlags.Instance);
// Assembly localResourceAssembly = (Assembly) GetLocalResourceAssembly.Invoke(resourceProvider, null);
// if (localResourceAssembly != null)
// {
// return new ResourceManager(VirtualPathUtility.GetFileName(this.AppRelativeVirtualPath), localResourceAssembly);
// }
// return null;
return new LocalResourceManager( this.AppRelativeVirtualPath );
}
/// <summary>

6
src/Spring/Spring.Web/Web/UI/Page.cs
View File

@@ -90,9 +90,9 @@ namespace Spring.Web.UI
private static readonly object EventPreInit = new object();
private static readonly object EventInitComplete = new object();
#else
internal static readonly MethodInfo GetLocalResourceProvider =
typeof( ResourceExpressionBuilder ).GetMethod( "GetLocalResourceProvider", BindingFlags.NonPublic | BindingFlags.Static, null,
new Type[] { typeof( TemplateControl ) }, null );
// internal static readonly MethodInfo GetLocalResourceProvider =
// typeof( ResourceExpressionBuilder ).GetMethod( "GetLocalResourceProvider", BindingFlags.NonPublic | BindingFlags.Static, null,
// new Type[] { typeof( TemplateControl ) }, null );
#endif
#endregion