From: Tayrtahn <tayrtahn@gmail.com>
Date: Sun, 12 Jan 2025 14:33:53 +0000 (-0500)
Subject: Fix force-feeding Loc strings not using target's gender (#34276)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=924f64e979596b4c59b633671d3e6649143d56e3;p=space-station-14.git

Fix force-feeding Loc strings not using target's gender (#34276)
---

diff --git a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
index 158c7f4955..fd68f611c1 100644
--- a/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
+++ b/Content.Server/Nutrition/EntitySystems/FoodSystem.cs
@@ -268,7 +268,7 @@ public sealed class FoodSystem : EntitySystem
         if (stomachToUse == null)
         {
             _solutionContainer.TryAddSolution(soln.Value, split);
-            _popup.PopupEntity(forceFeed ? Loc.GetString("food-system-you-cannot-eat-any-more-other") : Loc.GetString("food-system-you-cannot-eat-any-more"), args.Target.Value, args.User);
+            _popup.PopupEntity(forceFeed ? Loc.GetString("food-system-you-cannot-eat-any-more-other", ("target", args.Target.Value)) : Loc.GetString("food-system-you-cannot-eat-any-more"), args.Target.Value, args.User);
             return;
         }
 
diff --git a/Resources/Locale/en-US/nutrition/components/food-component.ftl b/Resources/Locale/en-US/nutrition/components/food-component.ftl
index 4eae610085..3de156fdef 100644
--- a/Resources/Locale/en-US/nutrition/components/food-component.ftl
+++ b/Resources/Locale/en-US/nutrition/components/food-component.ftl
@@ -14,11 +14,11 @@ food-system-remove-mask = You need to take off the {$entity} first.
 ## System
 
 food-system-you-cannot-eat-any-more = You can't eat any more!
-food-system-you-cannot-eat-any-more-other = They can't eat any more!
+food-system-you-cannot-eat-any-more-other = {CAPITALIZE(SUBJECT($target))} can't eat any more!
 food-system-try-use-food-is-empty = {CAPITALIZE(THE($entity))} is empty!
 food-system-wrong-utensil = You can't eat {THE($food)} with {INDEFINITE($utensil)} {$utensil}.
 food-system-cant-digest = You can't digest {THE($entity)}!
-food-system-cant-digest-other = They can't digest {THE($entity)}!
+food-system-cant-digest-other = {CAPITALIZE(SUBJECT($target))} can't digest {THE($entity)}!
 
 food-system-verb-eat = Eat