From fdcfb502ed05fcb88936eb9daffe6059c6292486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 3 May 2021 16:20:11 +0300 Subject: [PATCH] Renaming for #8673 WithScribanTemplate to WithScribanEngine WithRazorTemplate to WithRazorEngine --- docs/en/Text-Templating-Razor.md | 10 +++++----- docs/en/Text-Templating-Scriban.md | 10 +++++----- docs/en/Text-Templating.md | 4 ++-- .../Razor/RazorTemplateDefinitionExtensions.cs | 2 +- .../Scriban/ScribanTemplateDefinitionExtensions.cs | 2 +- .../Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs | 2 +- .../Razor/RazorTestTemplateDefinitionProvider.cs | 8 ++++---- .../Scriban/ScribanTestTemplateDefinitionProvider.cs | 8 ++++---- .../TextTemplating/TestTemplateDefinitionProvider.cs | 4 ++-- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/docs/en/Text-Templating-Razor.md b/docs/en/Text-Templating-Razor.md index 770de46ca6..44a207a991 100644 --- a/docs/en/Text-Templating-Razor.md +++ b/docs/en/Text-Templating-Razor.md @@ -84,7 +84,7 @@ public class DemoTemplateDefinitionProvider : TemplateDefinitionProvider { context.Add( new TemplateDefinition("Hello") //template name: "Hello" - .WithRazorTemplate() + .WithRazorEngine() .WithVirtualFilePath( "/Demos/Hello/Hello.cshtml", //template content path isInlineLocalized: true @@ -226,7 +226,7 @@ context.Add( "PasswordReset", //Template name typeof(DemoResource) //LOCALIZATION RESOURCE ) - .WithRazorTemplate() + .WithRazorEngine() .WithVirtualFilePath( "/Demos/PasswordReset/PasswordReset.cshtml", //template content path isInlineLocalized: true @@ -275,7 +275,7 @@ context.Add( name: "WelcomeEmail", defaultCultureName: "en" ) - .WithRazorTemplate() + .WithRazorEngine() .WithVirtualFilePath( "/Demos/WelcomeEmail/Templates", //template content folder isInlineLocalized: false @@ -339,7 +339,7 @@ context.Add( "EmailLayout", isLayout: true //SET isLayout! ) - .WithRazorTemplate() + .WithRazorEngine() .WithVirtualFilePath( "/Demos/EmailLayout/EmailLayout.cshtml", isInlineLocalized: true @@ -356,7 +356,7 @@ context.Add( defaultCultureName: "en", layout: "EmailLayout" //Set the LAYOUT ) - .WithRazorTemplate() + .WithRazorEngine() .WithVirtualFilePath( "/Demos/WelcomeEmail/Templates", isInlineLocalized: false diff --git a/docs/en/Text-Templating-Scriban.md b/docs/en/Text-Templating-Scriban.md index 4263be011e..51b6c50f88 100644 --- a/docs/en/Text-Templating-Scriban.md +++ b/docs/en/Text-Templating-Scriban.md @@ -49,7 +49,7 @@ public class DemoTemplateDefinitionProvider : TemplateDefinitionProvider "/Demos/Hello/Hello.tpl", //template content path isInlineLocalized: true ) - .WithScribanTemplate() + .WithScribanEngine() ); } } @@ -178,7 +178,7 @@ context.Add( "PasswordReset", //Template name typeof(DemoResource) //LOCALIZATION RESOURCE ) - .WithScribanTemplate() + .WithScribanEngine() .WithVirtualFilePath( "/Demos/PasswordReset/PasswordReset.tpl", //template content path isInlineLocalized: true @@ -227,7 +227,7 @@ context.Add( name: "WelcomeEmail", defaultCultureName: "en" ) - .WithScribanTemplate() + .WithScribanEngine() .WithVirtualFilePath( "/Demos/WelcomeEmail/Templates", //template content folder isInlineLocalized: false @@ -290,7 +290,7 @@ context.Add( "EmailLayout", isLayout: true //SET isLayout! ) - .WithScribanTemplate() + .WithScribanEngine() .WithVirtualFilePath( "/Demos/EmailLayout/EmailLayout.tpl", isInlineLocalized: true @@ -307,7 +307,7 @@ context.Add( defaultCultureName: "en", layout: "EmailLayout" //Set the LAYOUT ) - .WithScribanTemplate() + .WithScribanEngine() .WithVirtualFilePath( "/Demos/WelcomeEmail/Templates", isInlineLocalized: false diff --git a/docs/en/Text-Templating.md b/docs/en/Text-Templating.md index b5d082f627..47e6c4cc80 100644 --- a/docs/en/Text-Templating.md +++ b/docs/en/Text-Templating.md @@ -19,7 +19,7 @@ Template rendering engine is very powerful; * You can define **layout templates** to be used as the layout while rendering other templates. * You can pass arbitrary objects to the template context (beside the model) for advanced scenarios. -ABP Framework provides two types of engines; +ABP Framework provides two templating engines; * **[Razor](Text-Templating-Razor.md)** * **[Scriban](Text-Templating-Scriban.md)** @@ -34,4 +34,4 @@ Get [the source code of the sample application](https://github.com/abpframework/ * [The source code of the sample application](https://github.com/abpframework/abp-samples/tree/master/TextTemplateDemo) developed and referred through this document. * [Localization system](Localization.md). -* [Virtual File System](Virtual-File-System.md). +* [Virtual File System](Virtual-File-System.md). \ No newline at end of file diff --git a/framework/src/Volo.Abp.TextTemplating.Razor/Volo/Abp/TextTemplating/Razor/RazorTemplateDefinitionExtensions.cs b/framework/src/Volo.Abp.TextTemplating.Razor/Volo/Abp/TextTemplating/Razor/RazorTemplateDefinitionExtensions.cs index 1904e3004d..343905ecec 100644 --- a/framework/src/Volo.Abp.TextTemplating.Razor/Volo/Abp/TextTemplating/Razor/RazorTemplateDefinitionExtensions.cs +++ b/framework/src/Volo.Abp.TextTemplating.Razor/Volo/Abp/TextTemplating/Razor/RazorTemplateDefinitionExtensions.cs @@ -4,7 +4,7 @@ namespace Volo.Abp.TextTemplating.Razor { public static class RazorTemplateDefinitionExtensions { - public static TemplateDefinition WithRazorTemplate([NotNull] this TemplateDefinition templateDefinition) + public static TemplateDefinition WithRazorEngine([NotNull] this TemplateDefinition templateDefinition) { return templateDefinition.WithRenderEngine(RazorTemplateRenderingEngine.EngineName); } diff --git a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateDefinitionExtensions.cs b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateDefinitionExtensions.cs index 4575539c4f..c003ed384c 100644 --- a/framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateDefinitionExtensions.cs +++ b/framework/src/Volo.Abp.TextTemplating.Scriban/Volo/Abp/TextTemplating/Scriban/ScribanTemplateDefinitionExtensions.cs @@ -4,7 +4,7 @@ namespace Volo.Abp.TextTemplating.Scriban { public static class ScribanTemplateDefinitionExtensions { - public static TemplateDefinition WithScribanTemplate([NotNull] this TemplateDefinition templateDefinition) + public static TemplateDefinition WithScribanEngine([NotNull] this TemplateDefinition templateDefinition) { return templateDefinition.WithRenderEngine(ScribanTemplateRenderingEngine.EngineName); } diff --git a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs index 4a94f3bb23..236d9a1593 100644 --- a/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs +++ b/framework/src/Volo.Abp.TextTemplating/Volo/Abp/TextTemplating/AbpTextTemplatingModule.cs @@ -4,7 +4,7 @@ using Volo.Abp.TextTemplating.Scriban; namespace Volo.Abp.TextTemplating { - [Obsolete("Use AbpTextTemplatingScribanModule or AbpTextTemplatingRazorModule, This module will remove in the future.")] + [Obsolete("This module will be removed in the future. Please use AbpTextTemplatingScribanModule or AbpTextTemplatingRazorModule.")] [DependsOn(typeof(AbpTextTemplatingScribanModule))] public class AbpTextTemplatingModule : AbpModule { diff --git a/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo/Abp/TextTemplating/Razor/RazorTestTemplateDefinitionProvider.cs b/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo/Abp/TextTemplating/Razor/RazorTestTemplateDefinitionProvider.cs index 08576275f6..80f3f5f020 100644 --- a/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo/Abp/TextTemplating/Razor/RazorTestTemplateDefinitionProvider.cs +++ b/framework/test/Volo.Abp.TextTemplating.Razor.Tests/Volo/Abp/TextTemplating/Razor/RazorTestTemplateDefinitionProvider.cs @@ -8,19 +8,19 @@ namespace Volo.Abp.TextTemplating.Razor { context.GetOrNull(TestTemplates.WelcomeEmail)? .WithVirtualFilePath("/SampleTemplates/WelcomeEmail", false) - .WithRazorTemplate(); + .WithRazorEngine(); context.GetOrNull(TestTemplates.ForgotPasswordEmail)? .WithVirtualFilePath("/SampleTemplates/ForgotPasswordEmail.cshtml", true) - .WithRazorTemplate(); + .WithRazorEngine(); context.GetOrNull(TestTemplates.TestTemplateLayout1)? .WithVirtualFilePath("/SampleTemplates/TestTemplateLayout1.cshtml", true) - .WithRazorTemplate(); + .WithRazorEngine(); context.GetOrNull(TestTemplates.ShowDecimalNumber)? .WithVirtualFilePath("/SampleTemplates/ShowDecimalNumber.cshtml", true) - .WithRazorTemplate(); + .WithRazorEngine(); context.Add(new TemplateDefinition(RazorTestTemplates.TestTemplate).WithVirtualFilePath("/SampleTemplates/TestTemplate.cshtml", true)); } diff --git a/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo/Abp/TextTemplating/Scriban/ScribanTestTemplateDefinitionProvider.cs b/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo/Abp/TextTemplating/Scriban/ScribanTestTemplateDefinitionProvider.cs index 10de5d2886..c809bf49d6 100644 --- a/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo/Abp/TextTemplating/Scriban/ScribanTestTemplateDefinitionProvider.cs +++ b/framework/test/Volo.Abp.TextTemplating.Scriban.Tests/Volo/Abp/TextTemplating/Scriban/ScribanTestTemplateDefinitionProvider.cs @@ -6,19 +6,19 @@ { context.GetOrNull(TestTemplates.WelcomeEmail)? .WithVirtualFilePath("/SampleTemplates/WelcomeEmail", false) - .WithScribanTemplate(); + .WithScribanEngine(); context.GetOrNull(TestTemplates.ForgotPasswordEmail)? .WithVirtualFilePath("/SampleTemplates/ForgotPasswordEmail.tpl", true) - .WithScribanTemplate(); + .WithScribanEngine(); context.GetOrNull(TestTemplates.TestTemplateLayout1)? .WithVirtualFilePath("/SampleTemplates/TestTemplateLayout1.tpl", true) - .WithScribanTemplate(); + .WithScribanEngine(); context.GetOrNull(TestTemplates.ShowDecimalNumber)? .WithVirtualFilePath("/SampleTemplates/ShowDecimalNumber.tpl", true) - .WithScribanTemplate(); + .WithScribanEngine(); } } } 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 0015150288..ee05ce5166 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 @@ -45,7 +45,7 @@ namespace Volo.Abp.TextTemplating layout: null ) .WithVirtualFilePath("/SampleTemplates/TestScribanTemplate.tpl", true) - .WithScribanTemplate() + .WithScribanEngine() ); context.Add( @@ -55,7 +55,7 @@ namespace Volo.Abp.TextTemplating layout: null ) .WithVirtualFilePath("/SampleTemplates/TestRazorTemplate.cshtml", true) - .WithRazorTemplate() + .WithRazorEngine() ); } }