Author: gonzalo
Date: 2005-03-22 22:22:49 -0500 (Tue, 22 Mar 2005)
New Revision: 42130
Modified:
trunk/mcs/class/corlib/System.Resources/ChangeLog
trunk/mcs/class/corlib/System.Resources/ResourceManager.cs
Log:
2005-03-22 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
* ResourceManager.cs: use culture.Equals in InternalGetResourceSet().
Modified: trunk/mcs/class/corlib/System.Resources/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Resources/ChangeLog 2005-03-22 22:03:57 UTC
(rev 42129)
+++ trunk/mcs/class/corlib/System.Resources/ChangeLog 2005-03-23 03:22:49 UTC
(rev 42130)
@@ -1,3 +1,7 @@
+2005-03-22 Gonzalo Paniagua Javier <[EMAIL PROTECTED]>
+
+ * ResourceManager.cs: use culture.Equals in InternalGetResourceSet().
+
2005-02-12 Geoff Norton <[EMAIL PROTECTED]>
* ResourceReader.cs: If a resource type index is -1 return null
Modified: trunk/mcs/class/corlib/System.Resources/ResourceManager.cs
===================================================================
--- trunk/mcs/class/corlib/System.Resources/ResourceManager.cs 2005-03-22
22:03:57 UTC (rev 42129)
+++ trunk/mcs/class/corlib/System.Resources/ResourceManager.cs 2005-03-23
03:22:49 UTC (rev 42130)
@@ -327,11 +327,13 @@
* with it?
*/
set=(ResourceSet)Activator.CreateInstance(resourceSetType, args);
- } else if (culture ==
CultureInfo.InvariantCulture) {
+ } else if (culture.Equals
(CultureInfo.InvariantCulture)) {
string msg = "Could not find any
resource appropiate for the " +
- "specified culture or its
parents (assembly:{0})";
+ "specified culture or its
parents. " +
+ "Make sure \"{1}\" was
correctly embedded or " +
+ "linked into assembly
\"{0}\".";
- msg = String.Format (msg, MainAssembly
!= null ? MainAssembly.GetName ().Name : "");
+ msg = String.Format (msg, MainAssembly
!= null ? MainAssembly.GetName ().Name : "", filename);
throw new
MissingManifestResourceException (msg);
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
