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

4
Content.Server/Body/Behavior/LungBehavior.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using Content.Server.Atmos;
using Content.Server.Atmos.Components;
@@ -59,7 +59,7 @@ namespace Content.Server.Body.Behavior
if (_gameTiming.CurTime >= _lastGaspPopupTime + GaspPopupCooldown)
{
_lastGaspPopupTime = _gameTiming.CurTime;
Owner.PopupMessageEveryone(Loc.GetString("Gasp"));
Owner.PopupMessageEveryone(Loc.GetString("lung-behavior-gasp"));
}
Inhale(CycleDelay);

12
Content.Server/Body/Mechanism/MechanismComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.UserInterface;
@@ -56,7 +56,7 @@ namespace Content.Server.Body.Mechanism
if (!part.TryAddMechanism(this))
{
eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("You can't fit it in!"));
eventArgs.Target.PopupMessage(eventArgs.User, Loc.GetString("mechanism-component-cannot-fit-message"));
}
}
@@ -89,7 +89,7 @@ namespace Content.Server.Body.Mechanism
else // If surgery cannot be performed, show message saying so.
{
eventArgs.Target?.PopupMessage(eventArgs.User,
Loc.GetString("You see no way to install the {0}.", Owner.Name));
Loc.GetString("mechanism-component-no-way-to-install-message", ("partName", Owner.Name)));
}
}
@@ -115,14 +115,14 @@ namespace Content.Server.Body.Mechanism
if (!OptionsCache.TryGetValue(key, out var targetObject))
{
BodyCache.Owner.PopupMessage(PerformerCache,
Loc.GetString("You see no useful way to use the {0} anymore.", Owner.Name));
Loc.GetString("mechanism-component-no-useful-way-to-use-message",("partName", Owner.Name)));
return;
}
var target = (SharedBodyPartComponent) targetObject;
var message = target.TryAddMechanism(this)
? Loc.GetString("You jam {0:theName} inside {1:them}.", Owner, PerformerCache)
: Loc.GetString("You can't fit it in!");
? Loc.GetString("mechanism-component-jam-inside-message",("ownerName", Owner),("them", PerformerCache))
: Loc.GetString("mechanism-component-cannot-fit-message");
BodyCache.Owner.PopupMessage(PerformerCache, message);

12
Content.Server/Body/Part/BodyPartComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System.Collections.Generic;
using System.Threading.Tasks;
using Content.Server.UserInterface;
@@ -153,7 +153,7 @@ namespace Content.Server.Body.Part
else // If surgery cannot be performed, show message saying so.
{
eventArgs.Target?.PopupMessage(eventArgs.User,
Loc.GetString("You see no way to install {0:theName}.", Owner));
Loc.GetString("bodypart-component-no-way-to-install-message", ("partName", Owner)));
}
}
@@ -180,13 +180,13 @@ namespace Content.Server.Body.Part
if (!_optionsCache.TryGetValue(key, out var targetObject))
{
_owningBodyCache.Owner.PopupMessage(_surgeonCache,
Loc.GetString("You see no useful way to attach {0:theName} anymore.", Owner));
Loc.GetString("bodypart-component-no-way-to-attach-message", ("partName", Owner)));
}
var target = (string) targetObject!;
var message = _owningBodyCache.TryAddPart(target, this)
? Loc.GetString("You attach {0:theName}.", Owner)
: Loc.GetString("You can't attach {0:theName}!", Owner);
? Loc.GetString("bodypart-component-attach-success-message",("partName", Owner))
: Loc.GetString("bodypart-component-attach-fail-message",("partName", Owner));
_owningBodyCache.Owner.PopupMessage(_surgeonCache, message);
}
@@ -256,7 +256,7 @@ namespace Content.Server.Body.Part
}
data.Visibility = VerbVisibility.Visible;
data.Text = Loc.GetString("Attach Body Part");
data.Text = Loc.GetString("attach-bodypart-verb-get-data-text");
}
protected override void Activate(IEntity user, BodyPartComponent component)

28
Content.Server/Body/Surgery/BiologicalSurgeryDataComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -97,20 +97,20 @@ namespace Content.Server.Body.Surgery
if (HasIncisionNotClamped())
{
toReturn.Append(Loc.GetString("The skin on {0:their} {1} has an incision, but it is prone to bleeding.",
Owner, Parent.Name));
toReturn.Append(Loc.GetString("biological-surgery-data-component-has-incision-not-clamped-message",
("owner", Owner),("bodyPart", Parent.Name)));
}
else if (HasClampedIncisionNotRetracted())
{
toReturn.AppendLine(Loc.GetString("The skin on {0:their} {1} has an incision, but it is not retracted.",
Owner, Parent.Name));
toReturn.AppendLine(Loc.GetString("biological-surgery-data-component-has-clamped-incision-not-retracted-message",
("owner", Owner),("bodyPary", Parent.Name)));
}
else if (HasFullyOpenIncision())
{
toReturn.AppendLine(Loc.GetString("There is an incision on {0:their} {1}.\n", Owner, Parent.Name));
toReturn.AppendLine(Loc.GetString("biological-surgery-data-component-has-fully-open-incision-message", ("owner", Owner), ("bodyPart", Parent.Name)) + "\n");
foreach (var mechanism in _disconnectedOrgans)
{
toReturn.AppendLine(Loc.GetString("{0:their} {1} is loose.", Owner, mechanism.Name));
toReturn.AppendLine(Loc.GetString("biological-surgery-data-component-part-is-loose-message",("owner", Owner), ("bodyPart", mechanism.Name)));
}
}
@@ -225,7 +225,7 @@ namespace Content.Server.Body.Surgery
return;
}
performer.PopupMessage(Loc.GetString("Cut open the skin..."));
performer.PopupMessage(Loc.GetString("biological-surgery-data-component-open-skin-message"));
if (await SurgeryDoAfter(performer))
{
@@ -237,7 +237,7 @@ namespace Content.Server.Body.Surgery
{
if (Parent == null) return;
performer.PopupMessage(Loc.GetString("Clamp the vessels..."));
performer.PopupMessage(Loc.GetString("biological-surgery-data-component-clamp-vessels-message"));
if (await SurgeryDoAfter(performer))
{
@@ -249,7 +249,7 @@ namespace Content.Server.Body.Surgery
{
if (Parent == null) return;
performer.PopupMessage(Loc.GetString("Retracting the skin..."));
performer.PopupMessage(Loc.GetString("biological-surgery-data-component-retract-skin-message"));
if (await SurgeryDoAfter(performer))
{
@@ -261,7 +261,7 @@ namespace Content.Server.Body.Surgery
{
if (Parent == null) return;
performer.PopupMessage(Loc.GetString("Cauterizing the incision..."));
performer.PopupMessage(Loc.GetString("biological-surgery-data-component-cauterize-incision-message"));
if (await SurgeryDoAfter(performer))
{
@@ -299,7 +299,7 @@ namespace Content.Server.Body.Surgery
return;
}
performer.PopupMessage(Loc.GetString("Loosening the organ..."));
performer.PopupMessage(Loc.GetString("biological-surgery-data-component-loosen-organ-message"));
if (!performer.HasComponent<DoAfterComponent>())
{
@@ -340,7 +340,7 @@ namespace Content.Server.Body.Surgery
return;
}
performer.PopupMessage(Loc.GetString("Removing the organ..."));
performer.PopupMessage(Loc.GetString("biological-surgery-data-component-remove-organ-message"));
if (!performer.HasComponent<DoAfterComponent>())
{
@@ -361,7 +361,7 @@ namespace Content.Server.Body.Surgery
if (Parent == null) return;
if (container is not SharedBodyComponent body) return;
performer.PopupMessage(Loc.GetString("Sawing off the limb!"));
performer.PopupMessage(Loc.GetString("biological-surgery-data-component-remove-bodypart-message"));
if (await SurgeryDoAfter(performer))
{

6
Content.Server/Body/Surgery/Components/SurgeryToolComponent.cs
View File

@@ -1,4 +1,4 @@
#nullable enable
#nullable enable
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
@@ -265,7 +265,7 @@ namespace Content.Server.Body.Surgery.Components
if (PerformerCache == null) return;
BodyCache?.Owner.PopupMessage(PerformerCache,
Loc.GetString("You see no useful way to use {0:theName}.", Owner));
Loc.GetString("surgery-tool-component-not-useful-message", ("bodyPart", Owner)));
}
private void NotUsefulAnymorePopup()
@@ -273,7 +273,7 @@ namespace Content.Server.Body.Surgery.Components
if (PerformerCache == null) return;
BodyCache?.Owner.PopupMessage(PerformerCache,
Loc.GetString("You see no useful way to use {0:theName} anymore.", Owner));
Loc.GetString("surgery-tool-component-not-useful-anymore-message", ("bodyPart", Owner)));
}
}
}