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

Fix a few loc bugs with magic mirror/scissors (#36269)

Browse Source 
* Use identity for magic mirror popups

* THE()

* Use correct pronouns in blocked-by-hat message
This commit is contained in:
Tayrtahn
2025-04-02 23:30:30 -04:00
committed by GitHub
parent e4d7f164f6
commit 8007a4ebf7
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Content.Server/MagicMirror/MagicMirrorSystem.cs
View File

@@ -59,7 +59,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
_popup.PopupEntity( _popup.PopupEntity(
component.Target == message.Actor component.Target == message.Actor
? Loc.GetString("magic-mirror-blocked-by-hat-self") ? 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,
message.Actor, message.Actor,
PopupType.Medium); PopupType.Medium);
@@ -95,7 +95,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
} }
else 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; component.DoAfter = doAfterId;
@@ -175,7 +175,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
} }
else 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; component.DoAfter = doAfterId;
@@ -253,7 +253,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
} }
else 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; component.DoAfter = doAfterId;
@@ -331,7 +331,7 @@ public sealed class MagicMirrorSystem : SharedMagicMirrorSystem
} }
else 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; component.DoAfter = doAfterId;

10
Resources/Locale/en-US/character-appearance/components/magic-mirror-component.ftl
View File

@@ -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-slot-self = You're changing your hairstyle.
magic-mirror-change-color-self = You're changing your hair color. 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-add-slot-target = Hair is being added to you by {THE($user)}.
magic-mirror-remove-slot-target = Your hair is being cut off by {$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 {$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 {$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 = 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.