From 5ecb623e4567fe4b711a0d16b23da762d61a1c8a Mon Sep 17 00:00:00 2001 From: Kyle Tyo Date: Sun, 16 Feb 2025 15:35:44 -0500 Subject: [PATCH 1/4] Update ContentLocalizationManager.cs --- Content.Shared/Localizations/ContentLocalizationManager.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index d20d8a3134..8275ed0c40 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -148,7 +148,8 @@ namespace Content.Shared.Localizations public static string FormatPlaytime(TimeSpan time) { var hours = (int)time.TotalHours; - var minutes = (int)Math.Ceiling(time.TotalMinutes); + var rounded = (int)Math.Ceiling(time.TotalMinutes); + var minutes = rounded - hours * 60; return Loc.GetString($"zzzz-fmt-playtime", ("hours", hours), ("minutes", minutes)); } From f6fda97b7213f5fae644f8f2a5f1514aea6b9d6d Mon Sep 17 00:00:00 2001 From: Kyle Tyo Date: Sun, 16 Feb 2025 15:40:30 -0500 Subject: [PATCH 2/4] I'm gonna do something drastic I swear. --- Content.Shared/Localizations/ContentLocalizationManager.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 8275ed0c40..c2055d0f49 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -148,8 +148,9 @@ namespace Content.Shared.Localizations public static string FormatPlaytime(TimeSpan time) { var hours = (int)time.TotalHours; - var rounded = (int)Math.Ceiling(time.TotalMinutes); - var minutes = rounded - hours * 60; + var minutes = time.Minutes; + if (hours == 0 && minutes == 0) + minutes = 1; return Loc.GetString($"zzzz-fmt-playtime", ("hours", hours), ("minutes", minutes)); } From 0fbacd7dcbe9bb9c678d4e6611f3291501dac74f Mon Sep 17 00:00:00 2001 From: Kyle Tyo Date: Sun, 16 Feb 2025 23:06:28 -0500 Subject: [PATCH 3/4] Update ContentLocalizationManager.cs --- Content.Shared/Localizations/ContentLocalizationManager.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index c2055d0f49..0ff4352ef5 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -147,10 +147,9 @@ namespace Content.Shared.Localizations /// public static string FormatPlaytime(TimeSpan time) { + time = TimeSpan.FromSeconds(Math.Ceiling(time.TotalSeconds)); var hours = (int)time.TotalHours; var minutes = time.Minutes; - if (hours == 0 && minutes == 0) - minutes = 1; return Loc.GetString($"zzzz-fmt-playtime", ("hours", hours), ("minutes", minutes)); } From 1d360956a78512be0a3cebd215c7bdc35591aed3 Mon Sep 17 00:00:00 2001 From: Kyle Tyo Date: Mon, 17 Feb 2025 01:58:40 -0500 Subject: [PATCH 4/4] made requested changes. --- Content.Shared/Localizations/ContentLocalizationManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Shared/Localizations/ContentLocalizationManager.cs b/Content.Shared/Localizations/ContentLocalizationManager.cs index 0ff4352ef5..8ed2ef086f 100644 --- a/Content.Shared/Localizations/ContentLocalizationManager.cs +++ b/Content.Shared/Localizations/ContentLocalizationManager.cs @@ -147,7 +147,7 @@ namespace Content.Shared.Localizations /// public static string FormatPlaytime(TimeSpan time) { - time = TimeSpan.FromSeconds(Math.Ceiling(time.TotalSeconds)); + time = TimeSpan.FromMinutes(Math.Ceiling(time.TotalMinutes)); var hours = (int)time.TotalHours; var minutes = time.Minutes; return Loc.GetString($"zzzz-fmt-playtime", ("hours", hours), ("minutes", minutes));