SS220 comments

Author: stalengd

Content.Client/Info/PlaytimeStats/PlaytimeStatsEntry.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Localizations;
+using Content.Shared.Localizations; // SS220 Playtime Format Fix
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
@@ -17,7 +17,7 @@ public PlaytimeStatsEntry(string role, TimeSpan playtime, StyleBox styleBox)
 
         RoleLabel.Text = role;
         Playtime = playtime;  // store the TimeSpan value directly
-        PlaytimeLabel.Text = ContentLocalizationManager.FormatPlaytime(playtime);  // convert to string for display
+        PlaytimeLabel.Text = ContentLocalizationManager.FormatPlaytime(playtime);  // convert to string for display  // SS220 Playtime Format Fix
         BackgroundColorPanel.PanelOverride = styleBox;
     }
 

Content.Client/Info/PlaytimeStats/PlaytimeStatsWindow.cs

@@ -104,7 +104,7 @@ private void PopulatePlaytimeData()
     {
         var overallPlaytime = _jobRequirementsManager.FetchOverallPlaytime();
 
-        OverallPlaytimeLabel.Text = Loc.GetString("ui-playtime-overall", ("time", overallPlaytime));
+        OverallPlaytimeLabel.Text = Loc.GetString("ui-playtime-overall", ("time", overallPlaytime)); // SS220 Playtime Format Fix
 
         var rolePlaytimes = _jobRequirementsManager.FetchPlaytimeByRoles();
 

Content.Shared/Localizations/ContentLocalizationManager.cs

@@ -40,7 +40,7 @@ public void Initialize()
             _loc.AddFunction(culture, "LOC", FormatLoc);
             _loc.AddFunction(culture, "NATURALFIXED", FormatNaturalFixed);
             _loc.AddFunction(culture, "NATURALPERCENT", FormatNaturalPercent);
-            _loc.AddFunction(culture, "PLAYTIME", FormatPlaytime);
+            _loc.AddFunction(culture, "PLAYTIME", FormatPlaytime); // SS220 Playtime Format Fix
 
 
             /*
@@ -192,6 +192,7 @@ public static string FormatDirection(Direction dir)
             return Loc.GetString($"zzzz-fmt-direction-{dir.ToString()}");
         }
 
+        // SS220 Playtime Format Fix begin
         /// <summary>
         /// Formats playtime as hours and minutes.
         /// </summary>
@@ -201,6 +202,7 @@ public static string FormatPlaytime(TimeSpan time)
             var minutes = time.Minutes;
             return Loc.GetString($"zzzz-fmt-playtime", ("hours", hours), ("minutes", minutes));
         }
+        // SS220 Playtime Format Fix end
 
         private static ILocValue FormatLoc(LocArgs args)
         {
@@ -291,6 +293,7 @@ private static ILocValue FormatUnits(LocArgs args)
             return new LocValueString(res);
         }
 
+        // SS220 Playtime Format Fix begin
         private static ILocValue FormatPlaytime(LocArgs args)
         {
             var time = TimeSpan.Zero;
@@ -300,5 +303,6 @@ private static ILocValue FormatPlaytime(LocArgs args)
             }
             return new LocValueString(FormatPlaytime(time));
         }
+        // SS220 Playtime Format Fix end
     }
 }

Content.Shared/Roles/JobRequirement/DepartmentTimeRequirement.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Localizations;
+using Content.Shared.Localizations; // SS220 Playtime Format Fix
 using Content.Shared.Preferences;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
@@ -50,7 +50,7 @@ public override bool Check(IEntityManager entManager,
 
         var deptDiffSpan = Time - playtime;
         var deptDiff = deptDiffSpan.TotalMinutes;
-        var formattedDeptDiff = ContentLocalizationManager.FormatPlaytime(deptDiffSpan);
+        var formattedDeptDiff = ContentLocalizationManager.FormatPlaytime(deptDiffSpan); // SS220 Playtime Format Fix
         var nameDepartment = "role-timer-department-unknown";
 
         if (protoManager.TryIndex(Department, out var departmentIndexed))

Content.Shared/Roles/JobRequirement/OverallPlaytimeRequirement.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Localizations;
+using Content.Shared.Localizations; // SS220 Playtime Format Fix
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Preferences;
 using JetBrains.Annotations;
@@ -28,7 +28,7 @@ public override bool Check(IEntityManager entManager,
         var overallTime = playTimes.GetValueOrDefault(PlayTimeTrackingShared.TrackerOverall);
         var overallDiffSpan = Time - overallTime;
         var overallDiff = overallDiffSpan.TotalMinutes;
-        var formattedOverallDiff = ContentLocalizationManager.FormatPlaytime(overallDiffSpan);
+        var formattedOverallDiff = ContentLocalizationManager.FormatPlaytime(overallDiffSpan); // SS220 Playtime Format Fix
 
         if (!Inverted)
         {

Content.Shared/Roles/JobRequirement/RoleTimeRequirement.cs

@@ -1,5 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
-using Content.Shared.Localizations;
+using Content.Shared.Localizations; // SS220 Playtime Format Fix
 using Content.Shared.Players.PlayTimeTracking;
 using Content.Shared.Preferences;
 using Content.Shared.Roles.Jobs;
@@ -37,7 +37,7 @@ public override bool Check(IEntityManager entManager,
         playTimes.TryGetValue(proto, out var roleTime);
         var roleDiffSpan = Time - roleTime;
         var roleDiff = roleDiffSpan.TotalMinutes;
-        var formattedRoleDiff = ContentLocalizationManager.FormatPlaytime(roleDiffSpan);
+        var formattedRoleDiff = ContentLocalizationManager.FormatPlaytime(roleDiffSpan); // SS220 Playtime Format Fix
         var departmentColor = Color.Yellow;
 
         if (entManager.EntitySysManager.TryGetEntitySystem(out SharedJobSystem? jobSystem))