Support single file template

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/DefaultEmailTemplateProvider.cs

@@ -7,10 +7,10 @@ namespace Volo.Abp.Emailing.Templates
         public override void Define(IEmailTemplateDefinitionContext context)
         {
             context.Add(new EmailTemplateDefinition(StandardEmailTemplates.DefaultLayout, isLayout: true, layout: null)
-                .AddTemplateVirtualFile("/Volo/Abp/Emailing/Templates/DefaultEmailTemplates/Layout"));
+                .AddTemplateVirtualFiles("/Volo/Abp/Emailing/Templates/DefaultEmailTemplates/Layout"));
 
             context.Add(new EmailTemplateDefinition(StandardEmailTemplates.SimpleMessage)
-                .AddTemplateVirtualFile("/Volo/Abp/Emailing/Templates/DefaultEmailTemplates/Message"));
+                .AddTemplateVirtualFiles("/Volo/Abp/Emailing/Templates/DefaultEmailTemplates/Message"));
         }
     }
 }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateDefinition.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using JetBrains.Annotations;
 
 namespace Volo.Abp.Emailing.Templates
@@ -18,9 +17,12 @@ namespace Volo.Abp.Emailing.Templates
 
         public EmailTemplateContributorList Contributors { get; }
 
-        public string DefaultCultureName { get; set; }
+        public string DefaultCultureName { get; }
 
-        public EmailTemplateDefinition([NotNull]string name, Type localizationResource = null, bool isLayout = false, string layout = DefaultLayoutPlaceHolder, string defaultCultureName = null)
+        public bool SingleTemplateFile { get; }
+
+        public EmailTemplateDefinition([NotNull] string name, Type localizationResource = null, bool isLayout = false,
+            string layout = DefaultLayoutPlaceHolder, string defaultCultureName = null, bool singleTemplateFile = false)
         {
             Name = Check.NotNullOrWhiteSpace(name, nameof(name));
             LocalizationResource = localizationResource;
@@ -28,6 +30,7 @@ namespace Volo.Abp.Emailing.Templates
             IsLayout = isLayout;
             Layout = layout;
             DefaultCultureName = defaultCultureName;
+            SingleTemplateFile = singleTemplateFile;
         }
     }
 }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/EmailTemplateProvider.cs

@@ -36,7 +36,7 @@ namespace Volo.Abp.Emailing.Templates
             if (emailTemplateDefinition == null)
             {
                 // TODO: Localized message
-                throw new AbpException("email template name not definition");
+                throw new AbpException($"email template {name} not definition");
             }
 
             var emailTemplateString = emailTemplateDefinition.Contributors.GetOrNull(cultureName);
@@ -55,7 +55,11 @@ namespace Volo.Abp.Emailing.Templates
                 var emailTemplate = new EmailTemplate(emailTemplateString, emailTemplateDefinition);
 
                 await SetLayoutAsync(emailTemplateDefinition, emailTemplate, cultureName);
-                await LocalizeAsync(emailTemplateDefinition, emailTemplate, cultureName);
+
+                if (emailTemplateDefinition.SingleTemplateFile)
+                {
+                    await LocalizeAsync(emailTemplateDefinition, emailTemplate, cultureName);
+                }
 
                 return emailTemplate;
             }
@@ -92,10 +96,19 @@ namespace Volo.Abp.Emailing.Templates
             }
 
             var localizer = StringLocalizerFactory.Create(emailTemplateDefinition.LocalizationResource);
-
+            if (cultureName != null)
-            emailTemplate.SetContent(
+            {
-                TemplateLocalizer.Localize(localizer.WithCulture(new CultureInfo(cultureName)), emailTemplate.Content)
+                emailTemplate.SetContent(
-            );
+                    TemplateLocalizer.Localize(localizer.WithCulture(new CultureInfo(cultureName)),
+                        emailTemplate.Content)
+                );
+            }
+            else
+            {
+                emailTemplate.SetContent(
+                    TemplateLocalizer.Localize(localizer, emailTemplate.Content)
+                );
+            }
 
             return Task.CompletedTask;
         }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/VirtualFiles/EmailTemplateDefinitionExtensions.cs

@@ -5,7 +5,14 @@
         public static EmailTemplateDefinition AddTemplateVirtualFile(
             this EmailTemplateDefinition emailTemplateDefinition, string path)
         {
-            emailTemplateDefinition.Contributors.Add(new VirtualFileEmailTemplateContributor(path));
+            emailTemplateDefinition.Contributors.Add(new SingleVirtualFileEmailTemplateContributor(path));
+            return emailTemplateDefinition;
+        }
+
+        public static EmailTemplateDefinition AddTemplateVirtualFiles(
+            this EmailTemplateDefinition emailTemplateDefinition, string path)
+        {
+            emailTemplateDefinition.Contributors.Add(new MultipleVirtualFilesEmailTemplateContributor(path));
             return emailTemplateDefinition;
         }
     }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/VirtualFiles/VirtualFileEmailTemplateContributor.cs → framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/VirtualFiles/MultipleVirtualFilesEmailTemplateContributor.cs

@@ -6,7 +6,7 @@ using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.Emailing.Templates.VirtualFiles
 {
-    public class VirtualFileEmailTemplateContributor : IEmailTemplateContributor
+    public class MultipleVirtualFilesEmailTemplateContributor : IEmailTemplateContributor
     {
         private readonly string _virtualPath;
 
@@ -16,7 +16,7 @@ namespace Volo.Abp.Emailing.Templates.VirtualFiles
 
         private readonly object _syncObj = new object();
 
-        public VirtualFileEmailTemplateContributor(string virtualPath)
+        public MultipleVirtualFilesEmailTemplateContributor(string virtualPath)
         {
             _virtualPath = virtualPath;
         }

framework/src/Volo.Abp.Emailing/Volo/Abp/Emailing/Templates/VirtualFiles/SingleVirtualFileEmailTemplateContributor.cs

@@ -0,0 +1,34 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.FileProviders;
+using Volo.Abp.VirtualFileSystem;
+
+namespace Volo.Abp.Emailing.Templates.VirtualFiles
+{
+    public class SingleVirtualFileEmailTemplateContributor : IEmailTemplateContributor
+    {
+        private readonly string _virtualPath;
+
+        private IVirtualFileProvider _virtualFileProvider;
+
+        public SingleVirtualFileEmailTemplateContributor(string virtualPath)
+        {
+            _virtualPath = virtualPath;
+        }
+
+        public void Initialize(EmailTemplateInitializationContext context)
+        {
+            _virtualFileProvider = context.ServiceProvider.GetRequiredService<IVirtualFileProvider>();
+        }
+
+        public string GetOrNull(string cultureName)
+        {
+            var file = _virtualFileProvider.GetFileInfo(_virtualPath);
+            if (file == null || !file.Exists || file.IsDirectory)
+            {
+                return null;
+            }
+
+            return file.ReadAsString();
+        }
+    }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj

@@ -13,6 +13,8 @@
   <ItemGroup>
     <EmbeddedResource Include="Volo\Abp\Emailing\TestTemplates\*\*.tpl" />
     <None Remove="Volo\Abp\Emailing\TestTemplates\*\*.tpl" />
+    <EmbeddedResource Include="Volo\Abp\Emailing\Localization\*.json" />
+    <None Remove="Volo\Abp\Emailing\Localization\*.json" />
   </ItemGroup>
 
   <ItemGroup>

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/AbpEmailingTestModule.cs

@@ -1,4 +1,6 @@
-using Volo.Abp.Modularity;
+using Volo.Abp.Emailing.Localization;
+using Volo.Abp.Localization;
+using Volo.Abp.Modularity;
 using Volo.Abp.VirtualFileSystem;
 
 namespace Volo.Abp.Emailing
@@ -14,6 +16,14 @@ namespace Volo.Abp.Emailing
             {
                 options.FileSets.AddEmbedded<AbpEmailingTestModule>();
             });
+
+            Configure<AbpLocalizationOptions>(options =>
+            {
+                options.Resources
+                    .Add<AbpEmailingTestResource>()
+                    .AddVirtualJson("/Volo/Abp/Emailing/Localization");
+            });
+
         }
     }
 }

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/EmailTemplateStore_Tests.cs

@@ -40,5 +40,13 @@ namespace Volo.Abp.Emailing
 
             template.Content.ShouldContain("<body>\r\n    " + "Please confirm your email address by clicking the link below.");
         }
+
+
+        [Fact]
+        public async Task Should_Get_Registered_Template_With_Localize()
+        {
+            var template = await _emailTemplateProvider.GetAsync("template3", "tr");
+            template.Content.ShouldContain("Merhaba Abp");
+        }
     }
 }

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/AbpEmailingTestResource.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Volo.Abp.Emailing.Localization
+{
+    public class AbpEmailingTestResource
+    {
+    }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/en.json

@@ -0,0 +1,6 @@
+{
+  "culture": "en",
+  "texts": {
+    "hello": "hello"
+  }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/Localization/tr.json

@@ -0,0 +1,6 @@
+{
+  "culture": "tr",
+  "texts": {
+    "hello": "Merhaba"
+  }
+}

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestEmailTemplateProvider.cs

@@ -1,4 +1,5 @@
-using Volo.Abp.Emailing.Templates;
+using Volo.Abp.Emailing.Localization;
+using Volo.Abp.Emailing.Templates;
 using Volo.Abp.Emailing.Templates.VirtualFiles;
 
 namespace Volo.Abp.Emailing
@@ -8,12 +9,16 @@ namespace Volo.Abp.Emailing
         public override void Define(IEmailTemplateDefinitionContext context)
         {
             var template1 = new EmailTemplateDefinition("template1", defaultCultureName: "en", layout: null)
-                .AddTemplateVirtualFile("/Volo/Abp/Emailing/TestTemplates/Template1");
+                .AddTemplateVirtualFiles("/Volo/Abp/Emailing/TestTemplates/Template1");
             context.Add(template1);
 
             var template2 = new EmailTemplateDefinition("template2", layout: StandardEmailTemplates.DefaultLayout)
-                .AddTemplateVirtualFile("/Volo/Abp/Emailing/TestTemplates/Template2");
+                .AddTemplateVirtualFiles("/Volo/Abp/Emailing/TestTemplates/Template2");
             context.Add(template2);
+
+            var template3 = new EmailTemplateDefinition("template3", layout: null, singleTemplateFile: true, localizationResource: typeof(AbpEmailingTestResource))
+                .AddTemplateVirtualFile("/Volo/Abp/Emailing/TestTemplates/Template3/Template.tpl");
+            context.Add(template3);
         }
     }
 }

framework/test/Volo.Abp.Emailing.Tests/Volo/Abp/Emailing/TestTemplates/Template3/Template.tpl

@@ -0,0 +1 @@
+{{#L:hello}} Abp