From c589bb336303fa97bc414c25d1fad1c2d81b9a45 Mon Sep 17 00:00:00 2001
From: Michael Petrinolis <mpetrinolis@lighthouse.gr>
Date: Mon, 18 May 2026 18:32:14 +0300
Subject: [PATCH 1/3] Enhance template option and simplify path logic

The `-t|--template` option now supports a new value, `TemplateEngine.Both`, and sets it as the default value. This improves flexibility by allowing an additional template engine.

(cherry picked from commit 9be6b0f1c61c2ff8acb2efc5220487916befe6bd)
---
 src/OrchardCoreContrib.PoExtractor/Program.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/OrchardCoreContrib.PoExtractor/Program.cs b/src/OrchardCoreContrib.PoExtractor/Program.cs
index a20204b..12a74de 100644
--- a/src/OrchardCoreContrib.PoExtractor/Program.cs
+++ b/src/OrchardCoreContrib.PoExtractor/Program.cs
@@ -30,8 +30,10 @@ public static void Main(string[] args)
             option.DefaultValue = "C#";
         });
         var template = app.Option("-t|--template <TEMPLATE>", "Specifies the template engine to extract the translatable strings from.", CommandOptionType.SingleValue, option =>
-            option.Accepts(cfg => cfg.Values("Razor", "Liquid"))
-        );
+        {
+            option.Accepts(cfg => cfg.Values(TemplateEngine.Both, "Razor", "Liquid"));
+            option.DefaultValue = TemplateEngine.Both;
+        });
         var ignoredProjects = app.Option("-i|--ignore <IGNORED_PROJECTS>", "Ignores extracting PO files from a given project(s).", CommandOptionType.MultipleValue);
         var localizers = app.Option("--localizer <LOCALIZERS>", "Specifies the name of the localizer(s) that will be used during the extraction process.", CommandOptionType.MultipleValue);
         var single = app.Option("-s|--single <FILE_NAME>", "Specifies the single output file.", CommandOptionType.SingleValue);
@@ -112,7 +114,7 @@ public static void Main(string[] args)
                 var projectBasePath = Path.GetDirectoryName(projectPath) + Path.DirectorySeparatorChar;
                 var projectRelativePath = projectPath[projectBasePath.Length..];
                 var rootedProject = projectPath == inputPath.Value
-                    ? projectPath 
+                    ? projectPath
                     : projectPath[(projectPath.IndexOf(inputPath.Value, StringComparison.Ordinal) + inputPath.Value.Length + 1)..];
                 if (IgnoredProject.ToList().Any(p => rootedProject.StartsWith(p)))
                 {

From 0a0f8ed29c33266fd66edcae060786ed386552f1 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Mon, 18 May 2026 23:20:52 +0300
Subject: [PATCH 2/3] Add unit tests for template options

(cherry picked from commit 4b91d8adde0bc16a7c91d89d818674823e0f79f3)
---
 src/OrchardCoreContrib.PoExtractor/Program.cs |  2 +-
 .../ProgramTests.cs                           | 63 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/OrchardCoreContrib.PoExtractor.Tests/ProgramTests.cs

diff --git a/src/OrchardCoreContrib.PoExtractor/Program.cs b/src/OrchardCoreContrib.PoExtractor/Program.cs
index 12a74de..b5d98d6 100644
--- a/src/OrchardCoreContrib.PoExtractor/Program.cs
+++ b/src/OrchardCoreContrib.PoExtractor/Program.cs
@@ -31,7 +31,7 @@ public static void Main(string[] args)
         });
         var template = app.Option("-t|--template <TEMPLATE>", "Specifies the template engine to extract the translatable strings from.", CommandOptionType.SingleValue, option =>
         {
-            option.Accepts(cfg => cfg.Values(TemplateEngine.Both, "Razor", "Liquid"));
+            option.Accepts(cfg => cfg.Values(TemplateEngine.Both, TemplateEngine.Razor, TemplateEngine.Liquid));
             option.DefaultValue = TemplateEngine.Both;
         });
         var ignoredProjects = app.Option("-i|--ignore <IGNORED_PROJECTS>", "Ignores extracting PO files from a given project(s).", CommandOptionType.MultipleValue);
diff --git a/test/OrchardCoreContrib.PoExtractor.Tests/ProgramTests.cs b/test/OrchardCoreContrib.PoExtractor.Tests/ProgramTests.cs
new file mode 100644
index 0000000..83b7d05
--- /dev/null
+++ b/test/OrchardCoreContrib.PoExtractor.Tests/ProgramTests.cs
@@ -0,0 +1,63 @@
+using Xunit;
+
+namespace OrchardCoreContrib.PoExtractor.Tests;
+
+public class ProgramTests
+{
+    [Fact]
+    public void Main_NoTemplateOption_UsesBothRazorAndLiquid()
+    {
+        // Arrange
+        var root = Path.Combine(Path.GetTempPath(), "PoExtractorTests", Guid.NewGuid().ToString("N"));
+        var input = Path.Combine(root, "input");
+        var output = Path.Combine(root, "output");
+        var project = Path.Combine(input, "TestModule");
+
+        Directory.CreateDirectory(project);
+        Directory.CreateDirectory(output);
+
+        File.WriteAllText(Path.Combine(project, "TestModule.csproj"), """
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+  </PropertyGroup>
+</Project>
+""");
+
+        File.WriteAllText(Path.Combine(project, "Index.cshtml"), """
+@T["Hello from Razor"]
+""");
+
+        File.WriteAllText(Path.Combine(project, "index.liquid"), """
+{{ "Hello from Liquid" | t }}
+""");
+
+        var potFileName = "all.pot";
+
+        try
+        {
+            // Act
+            Program.Main(
+            [
+                input,
+                output,
+                "--single", potFileName
+            ]);
+
+            // Assert
+            var potPath = Path.Combine(output, potFileName);
+            Assert.True(File.Exists(potPath));
+
+            var pot = File.ReadAllText(potPath);
+            Assert.Contains("Hello from Razor", pot);
+            Assert.Contains("Hello from Liquid", pot);
+        }
+        finally
+        {
+            if (Directory.Exists(root))
+            {
+                Directory.Delete(root, recursive: true);
+            }
+        }
+    }
+}

From 7d898e0ea7105cca74031dc9bb8be5e5fa01a143 Mon Sep 17 00:00:00 2001
From: Hisham Bin Ateya <hishamco_2007@yahoo.com>
Date: Wed, 20 May 2026 18:01:28 +0300
Subject: [PATCH 3/3] Bump OCC.PoExtractor to 1.3.1

---
 .../OrchardCoreContrib.PoExtractor.csproj                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OrchardCoreContrib.PoExtractor/OrchardCoreContrib.PoExtractor.csproj b/src/OrchardCoreContrib.PoExtractor/OrchardCoreContrib.PoExtractor.csproj
index 60e7fb2..41f9dbe 100644
--- a/src/OrchardCoreContrib.PoExtractor/OrchardCoreContrib.PoExtractor.csproj
+++ b/src/OrchardCoreContrib.PoExtractor/OrchardCoreContrib.PoExtractor.csproj
@@ -5,7 +5,7 @@
 		<AssemblyName>OrchardCoreContrib.PoExtractor</AssemblyName>
 		<ToolCommandName>extractpo</ToolCommandName>
 		<PackAsTool>true</PackAsTool>
-		<Version>1.3.0</Version>
+		<Version>1.3.1</Version>
 		<Authors>The Orchard Core Contrib Team</Authors>
 		<Company />
 		<Description>.NET Core global tool for extracting translatable strings from the OrchardCore source files.</Description>