ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-15 05:04:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make DateTime/TimeSpan localizable

Browse source
This commit is contained in:
Soreepeong 2024-02-28 00:57:54 +09:00
parent edb13c18e3
commit 18c1084fe3
4 changed files with 154 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Dalamud/Interface/ImGuiNotification/Internal/ActiveNotification.ImGui.cs
View file

@ -2,6 +2,7 @@ using System.Numerics;
using Dalamud.Interface.Internal;
using Dalamud.Interface.Utility;
using Dalamud.Utility;
using ImGuiNET;
@ -288,8 +289,8 @@ internal sealed partial class ActiveNotification
ImGui.PushStyleColor(ImGuiCol.Text, NotificationConstants.WhenTextColor);
ImGui.TextUnformatted(
ImGui.IsWindowHovered(ImGuiHoveredFlags.AllowWhenBlockedByActiveItem)
? this.CreatedAt.FormatAbsoluteDateTime()
: this.CreatedAt.FormatRelativeDateTime());
? this.CreatedAt.LocAbsolute()
: this.CreatedAt.LocRelativePastLong());
ImGui.PopStyleColor();
ImGui.PopStyleVar();
}
@ -304,7 +305,7 @@ internal sealed partial class ActiveNotification
ltOffset.X = height;
var agoText = this.CreatedAt.FormatRelativeDateTimeShort();
var agoText = this.CreatedAt.LocRelativePastShort();
var agoSize = ImGui.CalcTextSize(agoText);
rtOffset.X -= agoSize.X;
ImGui.SetCursorPos(rtOffset with { Y = NotificationConstants.ScaledWindowPadding });

66
Dalamud/Interface/ImGuiNotification/Internal/NotificationConstants.cs
View file

@ -1,4 +1,3 @@
using System.Diagnostics;
using System.Numerics;
using Dalamud.Interface.Colors;
@ -91,31 +90,6 @@ internal static class NotificationConstants
/// <summary>Color for the background progress bar (determinate progress only).</summary>
public static readonly Vector4 BackgroundProgressColorMin = new(1f, 1f, 1f, 0.05f);
/// <summary>Gets the relative time format strings.</summary>
private static readonly (TimeSpan MinSpan, string? FormatString)[] RelativeFormatStrings =
{
(TimeSpan.FromDays(7), null),
(TimeSpan.FromDays(2), "{0:%d} days ago"),
(TimeSpan.FromDays(1), "yesterday"),
(TimeSpan.FromHours(2), "{0:%h} hours ago"),
(TimeSpan.FromHours(1), "an hour ago"),
(TimeSpan.FromMinutes(2), "{0:%m} minutes ago"),
(TimeSpan.FromMinutes(1), "a minute ago"),
(TimeSpan.FromSeconds(2), "{0:%s} seconds ago"),
(TimeSpan.FromSeconds(1), "a second ago"),
(TimeSpan.MinValue, "just now"),
};
/// <summary>Gets the relative time format strings.</summary>
private static readonly (TimeSpan MinSpan, string FormatString)[] RelativeFormatStringsShort =
{
(TimeSpan.FromDays(1), "{0:%d}d"),
(TimeSpan.FromHours(1), "{0:%h}h"),
(TimeSpan.FromMinutes(1), "{0:%m}m"),
(TimeSpan.FromSeconds(1), "{0:%s}s"),
(TimeSpan.MinValue, "now"),
};
/// <summary>Gets the scaled padding of the window (dot(.) in the above diagram).</summary>
public static float ScaledWindowPadding => MathF.Round(16 * ImGuiHelpers.GlobalScale);
@ -142,46 +116,6 @@ internal static class NotificationConstants
/// <summary>Gets the string format of the initiator name field, if the initiator is unloaded.</summary>
public static string UnloadedInitiatorNameFormat => "{0} (unloaded)";
/// <summary>Formats an instance of <see cref="DateTime"/> as a relative time.</summary>
/// <param name="when">When.</param>
/// <returns>The formatted string.</returns>
public static string FormatRelativeDateTime(this DateTime when)
{
var ts = DateTime.Now - when;
foreach (var (minSpan, formatString) in RelativeFormatStrings)
{
if (ts < minSpan)
continue;
if (formatString is null)
break;
return string.Format(formatString, ts);
}
return when.FormatAbsoluteDateTime();
}
/// <summary>Formats an instance of <see cref="DateTime"/> as an absolute time.</summary>
/// <param name="when">When.</param>
/// <returns>The formatted string.</returns>
public static string FormatAbsoluteDateTime(this DateTime when) => $"{when:G}";
/// <summary>Formats an instance of <see cref="DateTime"/> as a relative time.</summary>
/// <param name="when">When.</param>
/// <returns>The formatted string.</returns>
public static string FormatRelativeDateTimeShort(this DateTime when)
{
var ts = DateTime.Now - when;
foreach (var (minSpan, formatString) in RelativeFormatStringsShort)
{
if (ts < minSpan)
continue;
return string.Format(formatString, ts);
}
Debug.Assert(false, "must not reach here");
return "???";
}
/// <summary>Gets the color corresponding to the notification type.</summary>
/// <param name="type">The notification type.</param>
/// <returns>The corresponding color.</returns>