Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 42 additions & 1 deletion DesktopClock.Tests/TimeStringFormatterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,48 @@ public void Format_UsesHumanizerWhenCountdownFormatMissing()
" ",
CultureInfo.CurrentCulture);

Assert.Equal(countdownTo.Humanize(utcDate: false, dateToCompareAgainst: nowDateTime), result);
var localNow = DateTime.SpecifyKind(nowDateTime, DateTimeKind.Local);
Assert.Equal(countdownTo.Humanize(utcDate: false, dateToCompareAgainst: localNow), result);
}
finally
{
CultureInfo.CurrentCulture = originalCulture;
CultureInfo.CurrentUICulture = originalUiCulture;
}
}

[Theory]
[InlineData(0, "now")]
[InlineData(3, "3 hours from now")]
[InlineData(-3, "3 hours ago")]
[InlineData(72, "3 days from now")]
[InlineData(-72, "3 days ago")]
public void Format_HumanizedCountdownIsRelativeToNow(int hoursFromNow, string expected)
{
// The wall-clock values have Kind Unspecified, which Humanizer used to shift by the
// machine's UTC offset, e.g. a target of "now" read as "6 hours from now" on UTC-6.
var originalCulture = CultureInfo.CurrentCulture;
var originalUiCulture = CultureInfo.CurrentUICulture;

try
{
var enUs = new CultureInfo("en-US");
CultureInfo.CurrentCulture = enUs;
CultureInfo.CurrentUICulture = enUs;

var now = new DateTimeOffset(2026, 1, 1, 12, 0, 0, TimeSpan.Zero);
var countdownTo = now.DateTime.AddHours(hoursFromNow);

var result = TimeStringFormatter.Format(
now,
now.DateTime,
TimeZoneInfo.Utc,
countdownTo,
"HH:mm",
"",
CultureInfo.CurrentCulture);

Assert.Equal(expected, result);
}
finally
{
Expand Down
4 changes: 3 additions & 1 deletion DesktopClock/Utilities/TimeStringFormatter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ public static string Format(
}
else if (string.IsNullOrWhiteSpace(countdownFormat))
{
result = countdownTo.Humanize(utcDate: false, dateToCompareAgainst: nowDateTime);
// Humanizer shifts Unspecified times by the UTC offset when localizing, so pin the Kind to make that conversion a no-op.
var localNow = DateTime.SpecifyKind(nowDateTime, DateTimeKind.Local);
result = countdownTo.Humanize(utcDate: false, dateToCompareAgainst: localNow);
}
else
{
Expand Down