Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

3
Content.Shared/Construction/Steps/ArbitraryInsertConstructionGraphStep.cs
View File

@@ -1,4 +1,5 @@
#nullable enable
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
@@ -13,7 +14,7 @@ namespace Content.Shared.Construction.Steps
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
{
if (string.IsNullOrEmpty(Name)) return;
message.AddMarkup(Robust.Shared.Localization.Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
message.AddMarkup(Loc.GetString("construction-insert-arbitrary-entity", ("stepName", Name)));
}
}
}

5
Content.Shared/Construction/Steps/ComponentConstructionGraphStep.cs
View File

@@ -1,5 +1,6 @@
#nullable enable
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
@@ -24,10 +25,10 @@ namespace Content.Shared.Construction.Steps
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(string.IsNullOrEmpty(Name)
? Robust.Shared.Localization.Loc.GetString(
? Loc.GetString(
"construction-insert-entity-with-component",
("componentName", Component))// Terrible.
: Robust.Shared.Localization.Loc.GetString(
: Loc.GetString(
"construction-insert-exact-entity",
("entityName", Name)));
}

5
Content.Shared/Construction/Steps/MaterialConstructionGraphStep.cs
View File

@@ -1,8 +1,9 @@
#nullable enable
#nullable enable
using System.Diagnostics.CodeAnalysis;
using Content.Shared.Stacks;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Localization;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
@@ -23,7 +24,7 @@ namespace Content.Shared.Construction.Steps
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(Robust.Shared.Localization.Loc.GetString("Next, add [color=yellow]{0}x[/color] [color=cyan]{1}[/color].", Amount, MaterialPrototype.Name));
message.AddMarkup(Loc.GetString("construction-insert-material-entity",("amount", Amount),("materialName", MaterialPrototype.Name)));
}
public override bool EntityValid(IEntity entity)

5
Content.Shared/Construction/Steps/PrototypeConstructionGraphStep.cs
View File

@@ -1,5 +1,6 @@
#nullable enable
using Robust.Shared.GameObjects;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
@@ -18,11 +19,11 @@ namespace Content.Shared.Construction.Steps
public override void DoExamine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(string.IsNullOrEmpty(Name)
? Robust.Shared.Localization.Loc.GetString(
? Loc.GetString(
"construction-insert-prototype-no-name",
("prototypeName", Prototype) // Terrible.
)
: Robust.Shared.Localization.Loc.GetString(
: Loc.GetString(
"construction-insert-prototype",
("entityName", Name)
));

7
Content.Shared/Construction/Steps/ToolConstructionGraphStep.cs
View File

@@ -1,5 +1,6 @@
#nullable enable
#nullable enable
using Content.Shared.Tool;
using Robust.Shared.Localization;
using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Utility;
@@ -18,11 +19,11 @@ namespace Content.Shared.Construction.Steps
{
if (!string.IsNullOrEmpty(ExamineOverride))
{
message.AddMarkup(Robust.Shared.Localization.Loc.GetString(ExamineOverride));
message.AddMarkup(Loc.GetString(ExamineOverride));
return;
}
message.AddMarkup(Robust.Shared.Localization.Loc.GetString($"Next, use a [color=cyan]{Tool.GetToolName()}[/color]."));
message.AddMarkup(Loc.GetString("construction-use-tool-entity", ("toolName", Tool.GetToolName())));
}
}
}