Skip to content

Commit 534b46e

Browse files
committed
Remove SourceFolderEn.
1 parent 5ec6659 commit 534b46e

3 files changed

Lines changed: 2 additions & 7 deletions

File tree

converter/generator/DocBookTransformer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ protected override async Task TransformAsync(string language)
7171
await base.TransformAsync(language);
7272

7373
var srcDir = Path.Combine(SourceFolder, language, BookDirName);
74-
var srcEnDir = Path.Combine(SourceFolderEn, BookDirName);
74+
var srcEnDir = Path.Combine(SourceFolder, "en", BookDirName);
7575
string? fallbackBanner = null;
7676

7777
var titles = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);

converter/generator/DocToStaticPagesResourceResolver.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ internal class DocToStaticPagesResourceResolver : DocResourceResolver, IDocResou
1111
private string BookUrlName => Args.BookUrlName;
1212
private bool UseWebp => Args.UseWebp;
1313

14-
private readonly string SourceFolderEn;
15-
1614
public string Language
1715
{
1816
get;
@@ -33,7 +31,6 @@ public string Language
3331

3432
public DocToStaticPagesResourceResolver(DocToStaticPagesTransformerArgs args) : base(args)
3533
{
36-
SourceFolderEn = Path.Combine(args.SourceFolder, "en");
3734
Args = args;
3835

3936
var pages = new List<(string file, string book, string url, string title)>();
@@ -171,7 +168,7 @@ public bool TryResolveSrc(string src, string sourceDir, out string result, out (
171168
}
172169
else
173170
{
174-
var srcImgEn = $"{SourceFolderEn}{srcImg.FullName.AsSpan(SourceFolderEn.Length)}";
171+
var srcImgEn = $"{SourceFolder}/en/{srcImg.FullName.AsSpan(SourceFolder.Length + 4)}";
175172

176173
if (!File.Exists(srcImgEn))
177174
{

converter/generator/DocTransformer.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ namespace OriginLab.DocumentGeneration;
1212
internal abstract partial class DocTransformer : IDocTransformer
1313
{
1414
protected string SourceFolder { get; }
15-
protected string SourceFolderEn { get; }
1615
protected string OutputFolder { get; }
1716
protected string BooksXmlFolder { get; }
1817

@@ -32,7 +31,6 @@ protected DocTransformer(DocTransformerArgs args, IDocResourceResolver resourceR
3231
{
3332
var sourceFolder = args.SourceFolder;
3433
SourceFolder = sourceFolder;
35-
SourceFolderEn = Path.Combine(sourceFolder, "en");
3634

3735
var booksXmlFolder = args.BooksXmlFolder;
3836
BooksXmlFolder = booksXmlFolder;

0 commit comments

Comments
 (0)