From a8130614e5ed8ce3b9b581794236dcb109c8a9cf Mon Sep 17 00:00:00 2001
From: maliming <malimings@gmail.com>
Date: Wed, 7 Jun 2023 20:51:55 +0800
Subject: [PATCH] Add another constructor to `TemplateDefinition`.

---
 .../Volo/Abp/TextTemplating/TemplateDefinition.cs    | 12 ++++++++++++
 .../TextTemplating/TestTemplateDefinitionProvider.cs | 12 +++++-------
 .../AccountEmailTemplateDefinitionProvider.cs        |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.TextTemplating.Core/Volo/Abp/TextTemplating/TemplateDefinition.cs b/framework/src/Volo.Abp.TextTemplating.Core/Volo/Abp/TextTemplating/TemplateDefinition.cs
index c6370eec1d..fbe8afdfd7 100644
--- a/framework/src/Volo.Abp.TextTemplating.Core/Volo/Abp/TextTemplating/TemplateDefinition.cs
+++ b/framework/src/Volo.Abp.TextTemplating.Core/Volo/Abp/TextTemplating/TemplateDefinition.cs
@@ -58,6 +58,18 @@ public class TemplateDefinition : IHasNameWithLocalizableDisplayName
     [NotNull]
     public Dictionary<string, object> Properties { get; }
 
+    public TemplateDefinition(
+        [NotNull] string name,
+        [CanBeNull] Type localizationResource,
+        [CanBeNull] ILocalizableString displayName = null,
+        bool isLayout = false,
+        string layout = null,
+        string defaultCultureName = null)
+    : this(name, LocalizationResourceNameAttribute.GetName(localizationResource), displayName, isLayout, layout, defaultCultureName)
+    {
+
+    }
+
     public TemplateDefinition(
         [NotNull] string name,
         [CanBeNull] string localizationResourceName = null,
diff --git a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs
index d0f0e8e0e5..30712c11e0 100644
--- a/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs
+++ b/framework/test/Volo.Abp.TextTemplating.Tests/Volo/Abp/TextTemplating/TestTemplateDefinitionProvider.cs
@@ -1,6 +1,4 @@
-using JetBrains.Annotations;
-using Volo.Abp.Localization;
-using Volo.Abp.TextTemplating.Localization;
+using Volo.Abp.TextTemplating.Localization;
 using Volo.Abp.TextTemplating.Razor;
 using Volo.Abp.TextTemplating.Scriban;
 
@@ -20,7 +18,7 @@ public class TestTemplateDefinitionProvider : TemplateDefinitionProvider
         context.Add(
             new TemplateDefinition(
                 TestTemplates.ForgotPasswordEmail,
-                localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(TestLocalizationSource)),
+                localizationResource: typeof(TestLocalizationSource),
                 layout: TestTemplates.TestTemplateLayout1
             )
         );
@@ -35,7 +33,7 @@ public class TestTemplateDefinitionProvider : TemplateDefinitionProvider
         context.Add(
             new TemplateDefinition(
                 TestTemplates.ShowDecimalNumber,
-                localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(TestLocalizationSource)),
+                localizationResource: typeof(TestLocalizationSource),
                 layout: TestTemplates.TestTemplateLayout1
             )
         );
@@ -43,7 +41,7 @@ public class TestTemplateDefinitionProvider : TemplateDefinitionProvider
         context.Add(
             new TemplateDefinition(
                 TestTemplates.HybridTemplateScriban,
-                localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(TestLocalizationSource)),
+                localizationResource: typeof(TestLocalizationSource),
                 layout: null
             )
             .WithVirtualFilePath("/SampleTemplates/TestScribanTemplate.tpl", true)
@@ -53,7 +51,7 @@ public class TestTemplateDefinitionProvider : TemplateDefinitionProvider
         context.Add(
             new TemplateDefinition(
                 TestTemplates.HybridTemplateRazor,
-                localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(TestLocalizationSource)),
+                localizationResource: typeof(TestLocalizationSource),
                 layout: null
             )
             .WithVirtualFilePath("/SampleTemplates/TestRazorTemplate.cshtml", true)
diff --git a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/Emailing/Templates/AccountEmailTemplateDefinitionProvider.cs b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/Emailing/Templates/AccountEmailTemplateDefinitionProvider.cs
index ef917fcb29..d1e0cb20e6 100644
--- a/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/Emailing/Templates/AccountEmailTemplateDefinitionProvider.cs
+++ b/modules/account/src/Volo.Abp.Account.Application/Volo/Abp/Account/Emailing/Templates/AccountEmailTemplateDefinitionProvider.cs
@@ -14,7 +14,7 @@ public class AccountEmailTemplateDefinitionProvider : TemplateDefinitionProvider
                 AccountEmailTemplates.PasswordResetLink,
                 displayName: LocalizableString.Create<AccountResource>($"TextTemplate:{AccountEmailTemplates.PasswordResetLink}"),
                 layout: StandardEmailTemplates.Layout,
-                localizationResourceName: LocalizationResourceNameAttribute.GetName(typeof(AccountResource))
+                localizationResource: typeof(AccountResource)
             ).WithVirtualFilePath("/Volo/Abp/Account/Emailing/Templates/PasswordResetLink.tpl", true)
         );
     }