Skip to content

Commit 48c5743

Browse files
Undo the previous changes - Date format culture invariant
2 parents debfcde + 47fe2db commit 48c5743

File tree

4 files changed

+4
-34
lines changed

4 files changed

+4
-34
lines changed

src/Sitecore.AspNetCore.SDK.RenderingEngine/TagHelpers/Fields/DateTagHelper.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,7 @@ public override void Process(TagHelperContext context, TagHelperOutput output)
6767

6868
CultureInfo culture = !string.IsNullOrWhiteSpace(Culture) ? CultureInfo.CreateSpecificCulture(Culture) : CultureInfo.CurrentCulture;
6969

70-
CultureInfo formatCulture = !string.IsNullOrWhiteSpace(Culture) ? culture : CultureInfo.InvariantCulture;
71-
72-
string formattedDate = !string.IsNullOrWhiteSpace(DateFormat)
73-
? field.Value.ToString(DateFormat, formatCulture)
74-
: field.Value.ToString(culture);
70+
string formattedDate = !string.IsNullOrWhiteSpace(DateFormat) ? field.Value.ToString(DateFormat, culture) : field.Value.ToString(culture);
7571

7672
HtmlString html = outputEditableMarkup ? new HtmlString(field.EditableMarkup) : new HtmlString(formattedDate);
7773

tests/Sitecore.AspNetCore.SDK.RenderingEngine.Integration.Tests/Fixtures/Binding/ViewFieldsBindingFixture.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
using System.Globalization;
2-
using System.Net;
1+
using System.Net;
32
using FluentAssertions;
43
using HtmlAgilityPack;
5-
using Microsoft.AspNetCore.Localization;
64
using Microsoft.AspNetCore.TestHost;
75
using Sitecore.AspNetCore.SDK.AutoFixture.Mocks;
86
using Sitecore.AspNetCore.SDK.LayoutService.Client.Extensions;
@@ -39,13 +37,6 @@ public ViewFieldsBindingFixture()
3937
.Configure(app =>
4038
{
4139
app.UseRouting();
42-
app.UseRequestLocalization(options =>
43-
{
44-
var culture = new CultureInfo("en-US");
45-
options.DefaultRequestCulture = new RequestCulture(culture);
46-
options.SupportedCultures = [culture];
47-
options.SupportedUICultures = [culture];
48-
});
4940
app.UseSitecoreRenderingEngine();
5041
app.UseEndpoints(endpoints =>
5142
{

tests/Sitecore.AspNetCore.SDK.RenderingEngine.Integration.Tests/Fixtures/TagHelpers/DateFieldTagHelperFixture.cs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
using System.Net;
33
using FluentAssertions;
44
using HtmlAgilityPack;
5-
using Microsoft.AspNetCore.Localization;
65
using Microsoft.AspNetCore.TestHost;
76
using Sitecore.AspNetCore.SDK.AutoFixture.Mocks;
87
using Sitecore.AspNetCore.SDK.LayoutService.Client.Extensions;
@@ -39,13 +38,6 @@ public DateFieldTagHelperFixture()
3938
.Configure(app =>
4039
{
4140
app.UseRouting();
42-
app.UseRequestLocalization(options =>
43-
{
44-
var culture = new CultureInfo("en-US");
45-
options.DefaultRequestCulture = new RequestCulture(culture);
46-
options.SupportedCultures = [culture];
47-
options.SupportedUICultures = [culture];
48-
});
4941
app.UseSitecoreRenderingEngine();
5042
app.UseEndpoints(endpoints =>
5143
{
@@ -103,7 +95,7 @@ public async Task DateTagHelper_GeneratesProperDate()
10395
// Assert
10496
sectionNode.ChildNodes[1].InnerHtml.Should().Be("05/04/2012");
10597
sectionNode.ChildNodes[3].InnerHtml.Should().Be("05/04/2012 00:00:00");
106-
sectionNode.ChildNodes[5].InnerHtml.Should().Be(TestConstants.DateTimeValue.ToString(new CultureInfo("en-US")));
98+
sectionNode.ChildNodes[5].InnerHtml.Should().Be(TestConstants.DateTimeValue.ToString(CultureInfo.CurrentCulture));
10799
sectionNode.ChildNodes[9].InnerHtml.Should().Contain("04.05.2012");
108100
}
109101

tests/Sitecore.AspNetCore.SDK.RenderingEngine.Integration.Tests/Fixtures/TagHelpers/RichTextFieldTagHelperFixture.cs

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
using System.Globalization;
2-
using System.Net;
1+
using System.Net;
32
using System.Text.Encodings.Web;
43
using FluentAssertions;
54
using HtmlAgilityPack;
6-
using Microsoft.AspNetCore.Localization;
75
using Microsoft.AspNetCore.TestHost;
86
using Sitecore.AspNetCore.SDK.AutoFixture.Mocks;
97
using Sitecore.AspNetCore.SDK.LayoutService.Client.Extensions;
@@ -41,13 +39,6 @@ public RichTextFieldTagHelperFixture()
4139
.Configure(app =>
4240
{
4341
app.UseRouting();
44-
app.UseRequestLocalization(options =>
45-
{
46-
var culture = new CultureInfo("en-US");
47-
options.DefaultRequestCulture = new RequestCulture(culture);
48-
options.SupportedCultures = [culture];
49-
options.SupportedUICultures = [culture];
50-
});
5142
app.UseSitecoreRenderingEngine();
5243
app.UseEndpoints(endpoints =>
5344
{

0 commit comments

Comments
 (0)