Fix lathe materials list bug (#26826)

Fix lathe material list bug

diff --git a/Content.Client/Lathe/UI/LatheMenu.xaml.cs b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
index 21897681c132eacb298ce57ab3fd8abb07665d35..ca8d2561270b8851f5fd1a6398bb39ba225ea7d7 100644 (file)
--- a/Content.Client/Lathe/UI/LatheMenu.xaml.cs
+++ b/Content.Client/Lathe/UI/LatheMenu.xaml.cs
@@ -141,17 +141,18 @@ public sealed partial class LatheMenu : DefaultWindow
 
             var name = Loc.GetString(proto.Name);
 
-            string amountText;
+            string tooltipText;
             if (missingSheets > 0)
             {
-                amountText = Loc.GetString("lathe-menu-material-amount-missing", ("amount", sheets), ("missingAmount", missingSheets), ("unit", unit), ("material", name));
+                tooltipText = Loc.GetString("lathe-menu-material-amount-missing", ("amount", sheets), ("missingAmount", missingSheets), ("unit", unit), ("material", name));
             }
             else
             {
-                amountText = Loc.GetString("lathe-menu-material-amount", ("amount", sheets), ("unit", unit), ("material", name));
+                var amountText = Loc.GetString("lathe-menu-material-amount", ("amount", sheets), ("unit", unit));
+                tooltipText = Loc.GetString("lathe-menu-tooltip-display", ("material", name), ("amount", amountText));
             }
 
-            sb.AppendLine(amountText);
+            sb.AppendLine(tooltipText);
         }
 
         if (!string.IsNullOrWhiteSpace(prototype.Description))

diff --git a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
index 72b836e69c22df6864764351e6b4539a1855e91b..71dd50d409183851be0acf8398deb390169db71b 100644 (file)
--- a/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
+++ b/Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
@@ -10,8 +10,8 @@ lathe-menu-material-display = {$material} ({$amount})
 lathe-menu-tooltip-display = {$amount} of {$material}
 lathe-menu-description-display = [italic]{$description}[/italic]
 lathe-menu-material-amount = { $amount ->
-    [1] {NATURALFIXED($amount, 2)} {$unit} of {$material}
-    *[other] {NATURALFIXED($amount, 2)} {MAKEPLURAL($unit)} of {$material}
+    [1] {NATURALFIXED($amount, 2)} {$unit}
+    *[other] {NATURALFIXED($amount, 2)} {MAKEPLURAL($unit)}
 }
 lathe-menu-material-amount-missing = { $amount ->
     [1] {NATURALFIXED($amount, 2)} {$unit} of {$material} ([color=red]{NATURALFIXED($missingAmount, 2)} {$unit} missing[/color])