From 46729cc7496d97025935a31458f9ffb95b69508f Mon Sep 17 00:00:00 2001
From: Christian Hornung <chhornung@googlemail.com>
Date: Mon, 9 Oct 2006 14:05:52 +0000
Subject: [PATCH] ResourceToolkit: Prefer using culture-invariant resource
 files over localized resource files. Fixed incorrect embedding of
 EditStringResourceDialog.xfrm.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1897 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
---
 .../ResourceToolkit/Project/ResourceToolkit.csproj |  2 +-
 .../Src/Resolver/NRefactoryResourceResolver.cs     | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/AddIns/Misc/ResourceToolkit/Project/ResourceToolkit.csproj b/src/AddIns/Misc/ResourceToolkit/Project/ResourceToolkit.csproj
index fa2c5dad9e..74b475ef81 100644
--- a/src/AddIns/Misc/ResourceToolkit/Project/ResourceToolkit.csproj
+++ b/src/AddIns/Misc/ResourceToolkit/Project/ResourceToolkit.csproj
@@ -90,6 +90,7 @@
     <Compile Include="Src\Gui\IFilter.cs" />
     <Compile Include="Src\Gui\IFilterHost.cs" />
     <Compile Include="Src\ResourceItem.cs" />
+    <EmbeddedResource Include="Resources\EditStringResourceDialog.xfrm" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj">
@@ -119,7 +120,6 @@
     <Folder Include="Src\ResourceFileContent" />
     <Folder Include="Src\ToolTips" />
     <Folder Include="Resources" />
-    <Content Include="Resources\EditStringResourceDialog.xfrm" />
     <Folder Include="Configuration" />
     <ProjectReference Include="..\..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj">
       <Project>{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}</Project>
diff --git a/src/AddIns/Misc/ResourceToolkit/Project/Src/Resolver/NRefactoryResourceResolver.cs b/src/AddIns/Misc/ResourceToolkit/Project/Src/Resolver/NRefactoryResourceResolver.cs
index c9fd58343c..51a77c8478 100644
--- a/src/AddIns/Misc/ResourceToolkit/Project/Src/Resolver/NRefactoryResourceResolver.cs
+++ b/src/AddIns/Misc/ResourceToolkit/Project/Src/Resolver/NRefactoryResourceResolver.cs
@@ -7,6 +7,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 
 using ICSharpCode.Core;
@@ -262,13 +263,24 @@ namespace Hornung.ResourceToolkit.Resolver
 								#endif
 								
 								if ((fileName = FindResourceFileName(fpi.FileName)) != null) {
-									return fileName;
+									// Prefer culture-invariant resource file
+									// over localized resource file
+									IResourceFileContent rfc = ResourceFileContentRegistry.GetResourceFileContent(fileName);
+									if (rfc.Culture.Equals(CultureInfo.InvariantCulture)) {
+										return fileName;
+									}
 								}
 								
 							}
 						}
 					}
 					
+					// Fall back to any found resource file
+					// if no culture-invariant resource file was found
+					if (fileName != null) {
+						return fileName;
+					}
+					
 					// Find resource files with the same name as the source file
 					// and in the same directory.
 					if ((fileName = FindResourceFileName(possibleSourceFile)) != null) {