Skip to content

Use locale-aware date/time formatting throughout UI #48

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
erikdarlingdata merged 2 commits into from
Feb 15, 2026
Merged

Use locale-aware date/time formatting throughout UI #48

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
5bfc15d
Use locale-aware date/time formatting throughout UI (#41)
erikdarlingdata Feb 15, 2026
f132193
Switch time range picker to 24-hour format in both apps
erikdarlingdata Feb 15, 2026
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
4 changes: 2 additions & 2 deletions Dashboard/CollectorScheduleWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
<DataGridTextColumn Header="Collector" Binding="{Binding DisplayName}" Width="180" IsReadOnly="True"/>
<DataGridTextColumn Header="Frequency (min)" Binding="{Binding FrequencyMinutes, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" Width="110"/>
<DataGridTextColumn Header="Retention (days)" Binding="{Binding RetentionDays, Mode=TwoWay, UpdateSourceTrigger=LostFocus}" Width="110"/>
<DataGridTextColumn Header="Last Run" Binding="{Binding LastRunTime, StringFormat='{}{0:MM/dd HH:mm}'}" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Header="Next Run" Binding="{Binding NextRunTime, StringFormat='{}{0:MM/dd HH:mm}'}" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Header="Last Run" Binding="{Binding LastRunTime, StringFormat='{}{0:g}'}" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Header="Next Run" Binding="{Binding NextRunTime, StringFormat='{}{0:g}'}" Width="100" IsReadOnly="True"/>
<DataGridTextColumn Header="Description" Binding="{Binding Description}" Width="*" IsReadOnly="True"/>
</DataGrid.Columns>
</DataGrid>
Expand Down
2 changes: 1 addition & 1 deletion Dashboard/ManageServersWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
<DataGridTextColumn Header="Display Name" Binding="{Binding DisplayName}" Width="150"/>
<DataGridTextColumn Header="Server" Binding="{Binding ServerName}" Width="180"/>
<DataGridTextColumn Header="Authentication" Binding="{Binding AuthenticationDisplay}" Width="120"/>
<DataGridTextColumn Header="Last Connected" Binding="{Binding LastConnected, StringFormat='{}{0:MM/dd/yyyy HH:mm}'}" Width="130"/>
<DataGridTextColumn Header="Last Connected" Binding="{Binding LastConnected, StringFormat='{}{0:g}'}" Width="130"/>
</DataGrid.Columns>
</DataGrid>
</Border>
Expand Down
5 changes: 2 additions & 3 deletions Dashboard/Models/ServerConnectionStatus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

using System;
using System.Globalization;

namespace PerformanceMonitorDashboard.Models
{
Expand Down Expand Up @@ -127,7 +126,7 @@ public string LastCheckedDisplay
if (elapsed.TotalHours < 24)
return $"Checked {(int)elapsed.TotalHours}h ago";

return $"Checked {LastChecked.Value.ToString("MMM d, h:mm tt", CultureInfo.CurrentCulture)}";
return $"Checked {LastChecked.Value.ToString("g")}";
}
}

Expand All @@ -147,7 +146,7 @@ public string StatusDurationDisplay
{
if (ServerStartTime.HasValue)
{
return $"Online since {ServerStartTime.Value.ToString("MMM d, h:mm tt", CultureInfo.CurrentCulture)}";
return $"Online since {ServerStartTime.Value.ToString("g")}";
}
return "Online";
}
Expand Down
2 changes: 1 addition & 1 deletion Dashboard/ServerTab.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ private void InitializeTimeComboBoxes()
for (int h = 0; h < 24; h++)
{
var dt = DateTime.Today.AddHours(h);
hours.Add(dt.ToString("h tt")); // "12 AM", "1 AM", ..., "11 PM"
hours.Add(dt.ToString("HH:00")); // "00:00", "01:00", ..., "23:00"
}

GlobalFromHour.ItemsSource = hours;
Expand Down
2 changes: 1 addition & 1 deletion Lite/Controls/ServerTab.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ private void InitializeTimeComboBoxes()
for (int h = 0; h < 24; h++)
{
var dt = DateTime.Today.AddHours(h);
hours.Add(dt.ToString("h tt")); // "12 AM", "1 AM", ..., "11 PM"
hours.Add(dt.ToString("HH:00")); // "00:00", "01:00", ..., "23:00"
}

FromHourCombo.ItemsSource = hours;
Expand Down
5 changes: 2 additions & 3 deletions Lite/Models/ServerConnectionStatus.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
*/

using System;
using System.Globalization;

namespace PerformanceMonitorLite.Models;

Expand Down Expand Up @@ -146,7 +145,7 @@ public string LastCheckedDisplay
if (elapsed.TotalHours < 24)
return $"Checked {(int)elapsed.TotalHours}h ago";

return $"Checked {LastChecked.Value.ToString("MMM d, h:mm tt", CultureInfo.CurrentCulture)}";
return $"Checked {LastChecked.Value.ToString("g")}";
}
}

Expand All @@ -166,7 +165,7 @@ public string StatusDurationDisplay
{
if (ServerStartTime.HasValue)
{
return $"Online since {ServerStartTime.Value.ToString("MMM d, h:mm tt", CultureInfo.CurrentCulture)}";
return $"Online since {ServerStartTime.Value.ToString("g")}";
}
return "Online";
}
Expand Down
8 changes: 4 additions & 4 deletions Lite/Services/LocalDataService.CollectionHealth.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ public class CollectionLogRow
public string Status { get; set; } = "";
public string? ErrorMessage { get; set; }

public string CollectionTimeFormatted => CollectionTime.ToLocalTime().ToString("MM/dd HH:mm:ss");
public string CollectionTimeFormatted => CollectionTime.ToLocalTime().ToString("g");

public string DurationFormatted => DurationMs.HasValue
? (DurationMs.Value < 1000 ? $"{DurationMs.Value} ms" : $"{DurationMs.Value / 1000.0:F1} s")
Expand Down Expand Up @@ -167,15 +167,15 @@ public string HealthStatus
: $"{AvgDurationMs / 1000:F1} s";

public string LastSuccessFormatted => LastSuccessTime.HasValue
? LastSuccessTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
? LastSuccessTime.Value.ToLocalTime().ToString("g")
: "Never";

public string LastRunFormatted => LastRunTime.HasValue
? LastRunTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
? LastRunTime.Value.ToLocalTime().ToString("g")
: "Never";

public string LastErrorFormatted => LastErrorTime.HasValue
? LastErrorTime.Value.ToLocalTime().ToString("MM/dd HH:mm:ss")
? LastErrorTime.Value.ToLocalTime().ToString("g")
: "";
}