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

Removed old Loc.GetString() use instances (#4155)

Browse Source 
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Galactic Chimp
2021-06-21 02:13:54 +02:00
committed by GitHub
parent 4a46fbe6dd
commit 392b820796
523 changed files with 3082 additions and 1551 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
Content.Server/Chat/Managers/ChatManager.cs
View File

@@ -56,11 +56,6 @@ namespace Content.Server.Chat.Managers
private const int VoiceRange = 7; // how far voice goes in world units
/// <summary>
/// The message displayed to the player when it exceeds the chat character limit
/// </summary>
private const string MaxLengthExceededMessage = "Your message exceeded {0} character limit";
//TODO: make prio based?
private readonly List<TransformChat> _chatTransformHandlers = new();
private bool _oocEnabled = true;
@@ -83,13 +78,13 @@ namespace Content.Server.Chat.Managers
private void OnOocEnabledChanged(bool val)
{
_oocEnabled = val;
DispatchServerAnnouncement(val ? "OOC chat has been enabled." : "OOC chat has been disabled.");
DispatchServerAnnouncement(Loc.GetString(val ? "chat-manager-ooc-chat-enabled-message" : "chat-manager-ooc-chat-disabled-message"));
}
private void OnAdminOocEnabledChanged(bool val)
{
_adminOocEnabled = val;
DispatchServerAnnouncement(val ? "Admin OOC chat has been enabled." : "Admin OOC chat has been disabled.");
DispatchServerAnnouncement(Loc.GetString(val ? "chat-manager-admin-ooc-chat-enabled-message" : "chat-manager-admin-ooc-chat-disabled-message"));
}
public void DispatchServerAnnouncement(string message)
@@ -97,7 +92,7 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Server;
msg.Message = message;
msg.MessageWrap = "SERVER: {0}";
msg.MessageWrap = Loc.GetString("chat-manager-server-wrap-message");
_netManager.ServerSendToAll(msg);
Logger.InfoS("SERVER", message);
}
@@ -107,7 +102,7 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Radio;
msg.Message = message;
msg.MessageWrap = $"{sender} Announcement:\n{{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-sender-announcement-wrap-message", ("sender", sender));
_netManager.ServerSendToAll(msg);
}
@@ -116,7 +111,7 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Server;
msg.Message = message;
msg.MessageWrap = "SERVER: {0}";
msg.MessageWrap = Loc.GetString("chat-manager-server-wrap-message");
_netManager.ServerSendMessage(msg, player.ConnectedClient);
}
@@ -131,7 +126,7 @@ namespace Content.Server.Chat.Managers
if (source.TryGetComponent(out ActorComponent? actor) &&
message.Length > MaxMessageLength)
{
var feedback = Loc.GetString(MaxLengthExceededMessage, MaxMessageLength);
var feedback = Loc.GetString("chat-manager-max-message-length-exceeded-message", ("limit", MaxMessageLength));
DispatchServerMessage(actor.PlayerSession, feedback);
@@ -170,7 +165,7 @@ namespace Content.Server.Chat.Managers
}
else
{
source.PopupMessage(Loc.GetString("You don't have a headset on!"));
source.PopupMessage(Loc.GetString("chat-manager-no-headset-on-message"));
}
}
else
@@ -188,7 +183,7 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Local;
msg.Message = message;
msg.MessageWrap = Loc.GetString("{0} says, \"{{0}}\"", source.Name);
msg.MessageWrap = Loc.GetString("chat-manager-entity-say-wrap-message",("entityName", source.Name));
msg.SenderEntity = source.Uid;
_netManager.ServerSendToMany(msg, clients);
}
@@ -209,7 +204,7 @@ namespace Content.Server.Chat.Managers
// Check if message exceeds the character limit
if (action.Length > MaxMessageLength)
{
DispatchServerMessage(actor.PlayerSession, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
DispatchServerMessage(actor.PlayerSession, Loc.GetString("chat-manager-max-message-length-exceeded-message",("limit", MaxMessageLength)));
return;
}
@@ -221,7 +216,7 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Emotes;
msg.Message = action;
msg.MessageWrap = $"{source.Name} {{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-entity-me-wrap-message", ("entityName",source.Name));
msg.SenderEntity = source.Uid;
_netManager.ServerSendToMany(msg, clients.ToList());
}
@@ -243,7 +238,7 @@ namespace Content.Server.Chat.Managers
// Check if message exceeds the character limit
if (message.Length > MaxMessageLength)
{
DispatchServerMessage(player, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
DispatchServerMessage(player, Loc.GetString("chat-manager-max-message-length-exceeded-message", ("limit", MaxMessageLength)));
return;
}
@@ -252,7 +247,7 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.OOC;
msg.Message = message;
msg.MessageWrap = $"OOC: {player.Name}: {{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-send-ooc-wrap-message", ("playerName",player.Name));
if (_adminManager.HasAdminFlag(player, AdminFlags.Admin))
{
var prefs = _preferencesManager.GetPreferences(player.UserId);
@@ -261,7 +256,7 @@ namespace Content.Server.Chat.Managers
if (player.ConnectedClient.UserData.PatronTier is { } patron &&
PatronOocColors.TryGetValue(patron, out var patronColor))
{
msg.MessageWrap = $"OOC: [color={patronColor}]{player.Name}[/color]: {{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-send-ooc-patron-wrap-message", ("patronColor", patronColor),("playerName", player.Name));
}
//TODO: player.Name color, this will need to change the structure of the MsgChatMessage
@@ -275,7 +270,7 @@ namespace Content.Server.Chat.Managers
// Check if message exceeds the character limit
if (message.Length > MaxMessageLength)
{
DispatchServerMessage(player, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
DispatchServerMessage(player, Loc.GetString("chat-manager-max-message-length-exceeded-message",("limit", MaxMessageLength)));
return;
}
@@ -286,7 +281,9 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Dead;
msg.Message = message;
msg.MessageWrap = $"{Loc.GetString("DEAD")}: {player.AttachedEntity?.Name}: {{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-send-dead-chat-wrap-message",
("deadChannelName", Loc.GetString("chat-manager-dead-channel-name")),
("playerName", player.AttachedEntity?.Name ?? "???"));
msg.SenderEntity = player.AttachedEntityUid.GetValueOrDefault();
_netManager.ServerSendToMany(msg, clients.ToList());
}
@@ -296,7 +293,7 @@ namespace Content.Server.Chat.Managers
// Check if message exceeds the character limit
if (message.Length > MaxMessageLength)
{
DispatchServerMessage(player, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
DispatchServerMessage(player, Loc.GetString("chat-manager-max-message-length-exceeded-message", ("limit", MaxMessageLength)));
return;
}
@@ -307,7 +304,9 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.Dead;
msg.Message = message;
msg.MessageWrap = $"{Loc.GetString("ADMIN")}:(${player.ConnectedClient.UserName}): {{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-send-admin-dead-chat-wrap-message",
("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
("userName", player.ConnectedClient.UserName));
_netManager.ServerSendToMany(msg, clients.ToList());
}
@@ -324,7 +323,7 @@ namespace Content.Server.Chat.Managers
// Check if message exceeds the character limit
if (message.Length > MaxMessageLength)
{
DispatchServerMessage(player, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
DispatchServerMessage(player, Loc.GetString("chat-manager-max-message-length-exceeded-message", ("limit", MaxMessageLength)));
return;
}
@@ -336,7 +335,9 @@ namespace Content.Server.Chat.Managers
msg.Channel = ChatChannel.AdminChat;
msg.Message = message;
msg.MessageWrap = $"{Loc.GetString("ADMIN")}: {player.Name}: {{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-send-admin-chat-wrap-message",
("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")),
("playerName", player.Name));
_netManager.ServerSendToMany(msg, clients.ToList());
}
@@ -350,7 +351,8 @@ namespace Content.Server.Chat.Managers
msg.Channel = ChatChannel.AdminChat;
msg.Message = message;
msg.MessageWrap = $"{Loc.GetString("ADMIN")}: {{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-send-admin-announcement-wrap-message",
("adminChannelName", Loc.GetString("chat-manager-admin-channel-name")));
_netManager.ServerSendToMany(msg, clients.ToList());
}
@@ -362,7 +364,7 @@ namespace Content.Server.Chat.Managers
var msg = _netManager.CreateNetMessage<MsgChatMessage>();
msg.Channel = ChatChannel.OOC;
msg.Message = message;
msg.MessageWrap = $"OOC: (D){sender}: {{0}}";
msg.MessageWrap = Loc.GetString("chat-manager-send-hook-ooc-wrap-message", ("senderName", sender));
_netManager.ServerSendToAll(msg);
}