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

Radio fix (#3501)

Browse Source 
* Fix headset formatted text wrap and move to translation file

* Update Loc.GetString refrences to new version
This commit is contained in:
ShadowCommander
2021-03-04 02:31:22 -08:00
committed by GitHub
parent 9e148db8e4
commit 6357569791
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs
View File

@@ -1,4 +1,4 @@
using System.Collections.Generic; using System.Collections.Generic;
using Content.Server.GameObjects.EntitySystems; using Content.Server.GameObjects.EntitySystems;
using Content.Server.Interfaces; using Content.Server.Interfaces;
using Content.Shared.Chat; using Content.Shared.Chat;
@@ -74,7 +74,7 @@ namespace Content.Server.GameObjects.Components.Headset
msg.Channel = ChatChannel.Radio; msg.Channel = ChatChannel.Radio;
msg.Message = message; msg.Message = message;
msg.MessageWrap = Loc.GetString("[{0}] {1} says, \"{{0}}\"", channel, source.Name); msg.MessageWrap = Loc.GetString("chat-radio-message-wrap", ("channel", channel), ("name", source.Name));
_netManager.ServerSendMessage(msg, playerChannel); _netManager.ServerSendMessage(msg, playerChannel);
} }
} }
@@ -92,11 +92,11 @@ namespace Content.Server.GameObjects.Components.Headset
public void Examine(FormattedMessage message, bool inDetailsRange) public void Examine(FormattedMessage message, bool inDetailsRange)
{ {
message.AddText(Loc.GetString("It is set to broadcast over the {0} frequency.", BroadcastFrequency)); message.AddText(Loc.GetString("examine-radio-frequency", ("frequency", BroadcastFrequency)));
message.AddText(Loc.GetString("A small screen on the headset displays the following available frequencies:"));
message.AddText("\n"); message.AddText("\n");
message.AddText(Loc.GetString("Use {0} for the currently tuned frequency.", ";")); message.AddText(Loc.GetString("examine-headset"));
message.AddText("\n");
message.AddText(Loc.GetString("examine-headset-chat-prefix", ("prefix", ";")));
} }
} }
} }

8
Resources/Locale/en-US/components/headset-component.ftl Normal file
View File

@@ -0,0 +1,8 @@
# Chat window radio wrap (prefix and postfix)
chat-radio-message-wrap = \\[{$channel}\\] {$name} says, "{"{"}0{"}"}"
examine-radio-frequency = It is set to broadcast over the {$frequency} frequency.
examine-headset = A small screen on the headset displays the following available frequencies:
examine-headset-chat-prefix = Use {$prefix} for the currently tuned frequency.