Skip to content

Making Culture Invariant When Validating Date to negate deferent formats #17257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Matthew-Wise merged 2 commits into from
Oct 12, 2024
Merged

Making Culture Invariant When Validating Date to negate deferent formats #17257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c12c606
CultureInfo.InvariantCulture,
IbrahimMNada Oct 11, 2024
3c174a7
adding unitTests by @Matthew-Wise
IbrahimMNada Oct 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/Umbraco.Core/PropertyEditors/Validators/DateTimeValidator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.ComponentModel.DataAnnotations;
using System.Globalization;
using Umbraco.Extensions;

namespace Umbraco.Cms.Core.PropertyEditors.Validators;
Expand All @@ -16,7 +17,7 @@ public IEnumerable<ValidationResult> Validate(object? value, string? valueType,
yield break;
}

if (DateTime.TryParse(value.ToString(), out DateTime dt) == false)
if (DateTime.TryParse(value.ToString(), CultureInfo.InvariantCulture, out DateTime dt) == false)
{
yield return new ValidationResult(
string.Format("The string value {0} cannot be parsed into a DateTime", value),
Expand Down
29 changes: 29 additions & 0 deletions ...Umbraco.Tests.UnitTests/Umbraco.Core/PropertyEditors/Validators/DateTimeValidatorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System.Globalization;
using NUnit.Framework;
using Umbraco.Cms.Core.PropertyEditors.Validators;

namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.PropertyEditors.Validators;

[TestFixture]
public class DateTimeValidatorTests
{
[TestCase("en-US", "yyyy-MM-dd HH:mm:ss", TestName = "US Thread, DateTimeValidator")]
[TestCase("en-US", "dd-MM-yyyy HH:mm:ss", TestName = "US Thread, DateTimeValidator ar-SA format")]
[TestCase("ar-SA", "dd-MM-yyyy HH:mm:ss", TestName = "Arabian Saudi Thread, DateTimeValidator")]
[TestCase("ar-SA", "yyyy-MM-dd HH:mm:ss", TestName = "Arabian Saudi Thread, DateTimeValidator US format")]
public void DateTimeValidatorIsCultureInvariant(string culture, string format)
{
var dateString = DateTime.Now.ToString(format);

var cultureInfo = new CultureInfo(culture);
Thread.CurrentThread.CurrentCulture = cultureInfo;
Thread.CurrentThread.CurrentUICulture = cultureInfo;

var validator = new DateTimeValidator();
var validationResults = validator.Validate(dateString, "DATETIME", new Dictionary<string, object>
{
["format"] = format
});
CollectionAssert.IsEmpty(validationResults);
}
}