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

Remove static ILocalizationManager resolves. (#17392)

Browse Source
This commit is contained in:
Leon Friedrich
2023-06-17 13:57:32 +12:00
committed by GitHub
parent 78043682b9
commit ef0248cd78
5 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/Crayon/CrayonSystem.cs
View File

@@ -62,7 +62,7 @@ public sealed class CrayonSystem : SharedCrayonSystem
} }
_parent.UIUpdateNeeded = false; _parent.UIUpdateNeeded = false;
_label.SetMarkup(Loc.GetString("crayon-drawing-label", _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("crayon-drawing-label",
("color",_parent.Color), ("color",_parent.Color),
("state",_parent.SelectedState), ("state",_parent.SelectedState),
("charges", _parent.Charges), ("charges", _parent.Charges),

4
Content.Client/NetworkConfigurator/Systems/NetworkConfiguratorSystem.cs
View File

@@ -147,8 +147,8 @@ public sealed class NetworkConfiguratorSystem : SharedNetworkConfiguratorSystem
? "network-configurator-examine-mode-link" ? "network-configurator-examine-mode-link"
: "network-configurator-examine-mode-list"; : "network-configurator-examine-mode-list";
_label.SetMarkup(Loc.GetString("network-configurator-item-status-label", _label.SetMarkup(Robust.Shared.Localization.Loc.GetString("network-configurator-item-status-label",
("mode", Loc.GetString(modeLocString)), ("mode", Robust.Shared.Localization.Loc.GetString(modeLocString)),
("keybinding", _keyBindingName))); ("keybinding", _keyBindingName)));
} }
} }

2
Content.Server/Armor/ArmorSystem.cs
View File

@@ -85,7 +85,7 @@ namespace Content.Server.Armor
_examine.AddDetailedExamineVerb(args, component, examineMarkup, Loc.GetString("armor-examinable-verb-text"), "/Textures/Interface/VerbIcons/dot.svg.192dpi.png", Loc.GetString("armor-examinable-verb-message")); _examine.AddDetailedExamineVerb(args, component, examineMarkup, Loc.GetString("armor-examinable-verb-text"), "/Textures/Interface/VerbIcons/dot.svg.192dpi.png", Loc.GetString("armor-examinable-verb-message"));
} }
private static FormattedMessage GetArmorExamine(DamageModifierSet armorModifiers) private FormattedMessage GetArmorExamine(DamageModifierSet armorModifiers)
{ {
var msg = new FormattedMessage(); var msg = new FormattedMessage();

2
Content.Server/Chat/SuicideSystem.cs
View File

@@ -61,7 +61,7 @@ namespace Content.Server.Chat
/// <summary> /// <summary>
/// If not handled, does the default suicide, which is biting your own tongue /// If not handled, does the default suicide, which is biting your own tongue
/// </summary> /// </summary>
private static void DefaultSuicideHandler(EntityUid victim, SuicideEvent suicideEvent) private void DefaultSuicideHandler(EntityUid victim, SuicideEvent suicideEvent)
{ {
if (suicideEvent.Handled) if (suicideEvent.Handled)
return; return;

15
Content.Server/Examine/ExamineSystem.cs
View File

@@ -14,21 +14,14 @@ namespace Content.Server.Examine
{ {
[Dependency] private readonly VerbSystem _verbSystem = default!; [Dependency] private readonly VerbSystem _verbSystem = default!;
private static readonly FormattedMessage _entityNotFoundMessage; private readonly FormattedMessage _entityNotFoundMessage = new();
private readonly FormattedMessage _entityOutOfRangeMessage = new();
private static readonly FormattedMessage _entityOutOfRangeMessage;
static ExamineSystem()
{
_entityNotFoundMessage = new FormattedMessage();
_entityNotFoundMessage.AddText(Loc.GetString("examine-system-entity-does-not-exist"));
_entityOutOfRangeMessage = new FormattedMessage();
_entityOutOfRangeMessage.AddText(Loc.GetString("examine-system-cant-see-entity"));
}
public override void Initialize() public override void Initialize()
{ {
base.Initialize(); base.Initialize();
_entityNotFoundMessage.AddText(Loc.GetString("examine-system-entity-does-not-exist"));
_entityOutOfRangeMessage.AddText(Loc.GetString("examine-system-cant-see-entity"));
SubscribeNetworkEvent<ExamineSystemMessages.RequestExamineInfoMessage>(ExamineInfoRequest); SubscribeNetworkEvent<ExamineSystemMessages.RequestExamineInfoMessage>(ExamineInfoRequest);
} }