2008-07-28 Marek Habersack <mhabersack@novell.com>

	* XmlSiteMapProvider.cs: set the base ResourceKey to the name of
	our associated site map file, so that localization works
	correctly. Fixes bug #412493

svn path=/trunk/mcs/; revision=108985

diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
index 2931c729db59e241f74d05d4caac87da75655aad..67cbd27d05ad0cb8081cf7d5529b147fe6096841 100644 (file)
--- a/mcs/class/System.Web/System.Web/ChangeLog
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-28  Marek Habersack  <mhabersack@novell.com>
+
+       * XmlSiteMapProvider.cs: set the base ResourceKey to the name of
+       our associated site map file, so that localization works
+       correctly. Fixes bug #412493
+
 2008-07-26  Gert Driesen  <drieseng@users.sourceforge.net>
 
        * HttpCachePolicy.cs: Only add Expires header if expire date is

diff --git a/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs b/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs
index 014f49f19c8f26f602b29dac25a7441840032d6a..d0226919d4d7e0971485fb197dfceec9773ef6cf 100644 (file)
--- a/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs
+++ b/mcs/class/System.Web/System.Web/XmlSiteMapProvider.cs
@@ -385,6 +385,8 @@ namespace System.Web
                                throw new InvalidOperationException ("Request is missing - cannot map paths.");
 
                        if (File.Exists (file)) {
+                               ResourceKey = Path.GetFileName (file);
+                               
                                watcher = new FileSystemWatcher ();
                                watcher.NotifyFilter |= NotifyFilters.Size;
                                watcher.Path = Path.GetFullPath (Path.GetDirectoryName (file));