[Dotgnu-pnet-commits] pnetlib/runtime/System/Resources ResourceManager.cs, 1.15, 1.16

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources
In directory subversions:/tmp/cvs-serv20891/runtime/System/Resources

Modified Files:
        ResourceManager.cs 
Log Message:


Fix the assembly name that is used when looking for satellite resource
assemblies.


Index: ResourceManager.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Resources/ResourceManager.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ResourceManager.cs  4 Aug 2003 06:17:01 -0000       1.15
--- ResourceManager.cs  17 Oct 2003 00:14:29 -0000      1.16
***************
*** 565,571 ****
  
                                        // Try loading the resources from a 
satellite assembly.
                                        String path = 
MainAssembly.GetSatellitePath
                                                (culture.Name + 
Path.DirectorySeparatorChar +
!                                                MainAssembly.FullName + 
".resources.dll");
                                        if(path != null)
                                        {
--- 565,580 ----
  
                                        // Try loading the resources from a 
satellite assembly.
+                                       String assemblyName = 
MainAssembly.FullName;
+                                       if(assemblyName != null)
+                                       {
+                                               int index = 
assemblyName.IndexOf(',');
+                                               if(index != -1)
+                                               {
+                                                       assemblyName = 
assemblyName.Substring(0, index);
+                                               }
+                                       }
                                        String path = 
MainAssembly.GetSatellitePath
                                                (culture.Name + 
Path.DirectorySeparatorChar +
!                                                assemblyName + 
".resources.dll");
                                        if(path != null)
                                        {