From 8007a4ebf7517484fffad0814355c1440f21f4f5 Mon Sep 17 00:00:00 2001 From: Tayrtahn Date: Wed, 2 Apr 2025 23:30:30 -0400 Subject: [PATCH] Fix a few loc bugs with magic mirror/scissors (#36269) * Use identity for magic mirror popups * THE() * Use correct pronouns in blocked-by-hat message --- Content.Server/MagicMirror/MagicMirrorSystem.cs | 10 +++++----- .../components/magic-mirror-component.ftl | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Content.Server/MagicMirror/MagicMirrorSystem.cs b/Content.Server/MagicMirror/MagicMirrorSystem.cs index 082fc81bd2..f3be03b4b0 100644 --- a/Content.Server/MagicMirror/MagicMirrorSystem.cs +++ b/Content.Server/MagicMirror/MagicMirrorSystem.cs @@ -59,7 +59,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem _popup.PopupEntity( component.Target == message.Actor ? Loc.GetString("magic-mirror-blocked-by-hat-self") - : Loc.GetString("magic-mirror-blocked-by-hat-self-target"), + : Loc.GetString("magic-mirror-blocked-by-hat-self-target", ("target", Identity.Entity(message.Actor, EntityManager))), message.Actor, message.Actor, PopupType.Medium); @@ -95,7 +95,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem } else { - _popup.PopupEntity(Loc.GetString("magic-mirror-change-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); + _popup.PopupEntity(Loc.GetString("magic-mirror-change-slot-target", ("user", Identity.Entity(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); } component.DoAfter = doAfterId; @@ -175,7 +175,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem } else { - _popup.PopupEntity(Loc.GetString("magic-mirror-change-color-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); + _popup.PopupEntity(Loc.GetString("magic-mirror-change-color-target", ("user", Identity.Entity(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); } component.DoAfter = doAfterId; @@ -253,7 +253,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem } else { - _popup.PopupEntity(Loc.GetString("magic-mirror-remove-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); + _popup.PopupEntity(Loc.GetString("magic-mirror-remove-slot-target", ("user", Identity.Entity(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); } component.DoAfter = doAfterId; @@ -331,7 +331,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem } else { - _popup.PopupEntity(Loc.GetString("magic-mirror-add-slot-target", ("user", Identity.Name(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); + _popup.PopupEntity(Loc.GetString("magic-mirror-add-slot-target", ("user", Identity.Entity(message.Actor, EntityManager))), component.Target.Value, component.Target.Value, PopupType.Medium); } component.DoAfter = doAfterId; diff --git a/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl b/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl index 0906cccee5..1b22fbf828 100644 --- a/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl +++ b/Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl @@ -6,10 +6,10 @@ magic-mirror-remove-slot-self = You're removing some of your hair. magic-mirror-change-slot-self = You're changing your hairstyle. magic-mirror-change-color-self = You're changing your hair color. -magic-mirror-add-slot-target = Hair is being added to you by {$user}. -magic-mirror-remove-slot-target = Your hair is being cut off by {$user}. -magic-mirror-change-slot-target = Your hairstyle is being changed by {$user}. -magic-mirror-change-color-target = Your hair color is being changed by {$user}. +magic-mirror-add-slot-target = Hair is being added to you by {THE($user)}. +magic-mirror-remove-slot-target = Your hair is being cut off by {THE($user)}. +magic-mirror-change-slot-target = Your hairstyle is being changed by {THE($user)}. +magic-mirror-change-color-target = Your hair color is being changed by {THE($user)}. magic-mirror-blocked-by-hat-self = You need to take off your hat before changing your hair. -magic-mirror-blocked-by-hat-self-target = You try to change their hair but their clothes gets in the way. +magic-mirror-blocked-by-hat-self-target = You try to change {POSS-ADJ($target)} hair but {POSS-ADJ($target)} clothes get in the way. -- 2.51.2