yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v10/dev' into v11/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	version.json
This commit is contained in:
Bjarke Berg
2023-06-27 09:07:40 +02:00
parent 3c81f968c3 1133c4e7f2
commit c7699f2909
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web.Common/Filters/JsonDateTimeFormatAttribute.cs
View File

@@ -1,4 +1,5 @@
using System.Buffers;
using System.Globalization;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Options;
@@ -42,7 +43,7 @@ public sealed class JsonDateTimeFormatAttribute : TypeFilterAttribute
{
var serializerSettings = new JsonSerializerSettings();
serializerSettings.Converters.Add(
new IsoDateTimeConverter { DateTimeFormat = _format });
new IsoDateTimeConverter { DateTimeFormat = _format, Culture = CultureInfo.InvariantCulture });
objectResult.Formatters.Clear();
objectResult.Formatters.Add(
new AngularJsonMediaTypeFormatter(serializerSettings, _arrayPool, _options));