haeaeae/duplicati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a bug with startfolder and exclude.

Browse Source 
git-svn-id: https://duplicati.googlecode.com/svn/trunk@308 59da171f-624f-0410-aa54-27559c288bec
This commit is contained in:
kenneth.skovhede@gmail.com
2009-12-21 20:42:47 +00:00
parent 24f630b7f6
commit e1e89d4d06
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BuildTools/LocalizationTool/LocalizationTool/Program.cs
+5 -2
View File
@@ -398,7 +398,10 @@ namespace LocalizationTool
foreach (XElement n in conf.Elements("assembly"))
{
List<string> excludes = n.Elements("exclude").Select(c => c.Value).ToList();
List<string> excludes = (from x in n.Elements("exclude")
let fullpath = System.IO.Path.Combine(System.IO.Path.Combine(Application.StartupPath, cultureReq), x.Value)
select fullpath).ToList();
string assemblyName = n.Attribute("name").Value;
string folder = n.Attribute("folder").Value;
string @namespace = n.Attribute("namespace") == null ? assemblyName : n.Attribute("namespace").Value;
@@ -409,7 +412,7 @@ namespace LocalizationTool
if (!System.IO.Directory.Exists(outfolder))
System.IO.Directory.CreateDirectory(outfolder);
ResXCompiler.CompileResxFiles(System.IO.Path.Combine(Application.StartupPath, culture), excludes, @namespace, System.IO.Path.Combine(outfolder, assemblyName + ".resources.dll"), System.IO.Path.GetFullPath(versionassembly), keyfile, culture, productname);
ResXCompiler.CompileResxFiles(System.IO.Path.Combine(System.IO.Path.Combine(Application.StartupPath, culture), folder), excludes, @namespace, System.IO.Path.Combine(outfolder, assemblyName + ".resources.dll"), System.IO.Path.GetFullPath(versionassembly), keyfile, culture, productname);
}
}
}
BuildTools/LocalizationTool/LocalizationTool/ResXCompiler.cs
+3 -3
View File
@@ -20,6 +20,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Linq;
namespace LocalizationTool
{
@@ -71,9 +72,8 @@ namespace LocalizationTool
{
if (s.ToLower().EndsWith("." + culture.ToLower() + ".resx"))
{
foreach (string xf in excludeFolders)
if (s.ToLower().StartsWith(Duplicati.Library.Core.Utility.AppendDirSeperator(xf).ToLower()))
continue;
if (excludeFolders.Any(xf => s.ToLower().StartsWith(Duplicati.Library.Core.Utility.AppendDirSeperator(xf).ToLower())))
continue;
string resname = System.IO.Path.ChangeExtension(s, ".resources");