tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix lathe materials list bug (#26826)

Browse Source 
Fix lathe material list bug
This commit is contained in:
Crotalus
2024-04-08 15:46:42 +02:00
committed by GitHub
parent 3851fcbc32
commit a9df8cf18a
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Client/Lathe/UI/LatheMenu.xaml.cs
View File

@@ -141,17 +141,18 @@ public sealed partial class LatheMenu : DefaultWindow
var name = Loc.GetString(proto.Name); var name = Loc.GetString(proto.Name);
string amountText; string tooltipText;
if (missingSheets > 0) 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 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)) if (!string.IsNullOrWhiteSpace(prototype.Description))

4
Resources/Locale/en-US/lathe/ui/lathe-menu.ftl
View File

@@ -10,8 +10,8 @@ lathe-menu-material-display = {$material} ({$amount})
lathe-menu-tooltip-display = {$amount} of {$material} lathe-menu-tooltip-display = {$amount} of {$material}
lathe-menu-description-display = [italic]{$description}[/italic] lathe-menu-description-display = [italic]{$description}[/italic]
lathe-menu-material-amount = { $amount -> lathe-menu-material-amount = { $amount ->
[1] {NATURALFIXED($amount, 2)} {$unit} of {$material} [1] {NATURALFIXED($amount, 2)} {$unit}
*[other] {NATURALFIXED($amount, 2)} {MAKEPLURAL($unit)} of {$material} *[other] {NATURALFIXED($amount, 2)} {MAKEPLURAL($unit)}
} }
lathe-menu-material-amount-missing = { $amount -> lathe-menu-material-amount-missing = { $amount ->
[1] {NATURALFIXED($amount, 2)} {$unit} of {$material} ([color=red]{NATURALFIXED($missingAmount, 2)} {$unit} missing[/color]) [1] {NATURALFIXED($amount, 2)} {$unit} of {$material} ([color=red]{NATURALFIXED($missingAmount, 2)} {$unit} missing[/color])