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

Identity loc string fixes (#10137)

Browse Source 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
This commit is contained in:
Leon Friedrich
2022-07-31 15:43:38 +12:00
committed by GitHub
parent f9d2a4e3e3
commit ddfa328442
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Chemistry/EntitySystems/ChemistrySystem.Injector.cs
View File

@@ -195,7 +195,7 @@ public sealed partial class ChemistrySystem
if (user != target)
{
// Create a pop-up for the target
var userName = Identity.Name(user, EntityManager);
var userName = Identity.Entity(user, EntityManager);
_popup.PopupEntity(Loc.GetString("injector-component-injecting-target",
("user", userName)), user, Filter.Entities(target));

6
Content.Server/Nutrition/EntitySystems/DrinkSystem.cs
View File

@@ -250,7 +250,7 @@ namespace Content.Server.Nutrition.EntitySystems
if (forceDrink)
{
var userName = Identity.Name(user, EntityManager);
var userName = Identity.Entity(user, EntityManager);
_popupSystem.PopupEntity(Loc.GetString("drink-component-force-feed", ("user", userName)),
user, Filter.Entities(target));
@@ -335,8 +335,8 @@ namespace Content.Server.Nutrition.EntitySystems
if (forceDrink)
{
var targetName = Identity.Name(uid, EntityManager);
var userName = Identity.Name(args.User, EntityManager);
var targetName = Identity.Entity(uid, EntityManager);
var userName = Identity.Entity(args.User, EntityManager);
_popupSystem.PopupEntity(
Loc.GetString("drink-component-force-feed-success", ("user", userName)), uid, Filter.Entities(uid));

6
Content.Server/Nutrition/EntitySystems/FoodSystem.cs
View File

@@ -115,7 +115,7 @@ namespace Content.Server.Nutrition.EntitySystems
if (forceFeed)
{
var userName = Identity.Name(user, EntityManager);
var userName = Identity.Entity(user, EntityManager);
_popupSystem.PopupEntity(Loc.GetString("food-system-force-feed", ("user", userName)),
user, Filter.Entities(target));
@@ -179,8 +179,8 @@ namespace Content.Server.Nutrition.EntitySystems
if (forceFeed)
{
var targetName = Identity.Name(uid, EntityManager);
var userName = Identity.Name(args.User, EntityManager);
var targetName = Identity.Entity(uid, EntityManager);
var userName = Identity.Entity(args.User, EntityManager);
_popupSystem.PopupEntity(Loc.GetString("food-system-force-feed-success", ("user", userName)),
uid, Filter.Entities(uid));

6
Resources/Locale/en-US/nutrition/components/drink-component.ftl
View File

@@ -15,9 +15,9 @@ drink-component-try-use-drink-had-enough = You can't drink more!
drink-component-try-use-drink-cannot-drink-other = They can't drink anything!
drink-component-try-use-drink-had-enough-other = They can't drink more!
drink-component-try-use-drink-success-slurp = Slurp
drink-component-force-feed = {$user} is trying to make you drink something!
drink-component-force-feed-success = {$user} forced you to drink something!
drink-component-force-feed-success-user = You successfully feed {$target}
drink-component-force-feed = {CAPITALIZE(THE($user))} is trying to make you drink something!
drink-component-force-feed-success = {CAPITALIZE(THE($user))} forced you to drink something!
drink-component-force-feed-success-user = You successfully feed {THE($target)}
drink-system-verb-drink = Drink

6
Resources/Locale/en-US/nutrition/components/food-component.ftl
View File

@@ -20,6 +20,6 @@ food-system-verb-eat = Eat
## Force feeding
food-system-force-feed = {$user} is trying feed you something!
food-system-force-feed-success = {$user} forced you to eat something!
food-system-force-feed-success-user = You successfully feed {$target}
food-system-force-feed = {CAPITALIZE(THE($user))} is trying feed you something!
food-system-force-feed-success = {CAPITALIZE(THE($user))} forced you to eat something!
food-system-force-feed-success-user = You successfully feed {THE($target)}