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

4
Content.Server/Fluids/Components/BucketComponent.cs
View File

@@ -64,13 +64,13 @@ namespace Content.Server.Fluids.Components
if (CurrentVolume <= 0)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Bucket is empty"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("bucket-component-bucket-is-empty-message"));
return false;
}
if (mopComponent.CurrentVolume == mopComponent.MaxVolume)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Mop is full"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("bucket-component-mop-is-full-message"));
return false;
}

2
Content.Server/Fluids/Components/MopComponent.cs
View File

@@ -110,7 +110,7 @@ namespace Content.Server.Fluids.Components
if (currentVolume <= 0)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Mop needs to be wet!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("mop-component-mop-is-dry-message"));
return false;
}

2
Content.Server/Fluids/Components/PuddleComponent.cs
View File

@@ -144,7 +144,7 @@ namespace Content.Server.Fluids.Components
{
if(Slippery)
{
message.AddText(Loc.GetString("It looks slippery."));
message.AddText(Loc.GetString("puddle-component-examine-is-slipper-text"));
}
}

8
Content.Server/Fluids/Components/SpillableComponent.cs
View File

@@ -1,4 +1,4 @@
using Content.Shared.ActionBlocker;
using Content.Shared.ActionBlocker;
using Content.Shared.Chemistry.Reagent;
using Content.Shared.Chemistry.Solution.Components;
using Content.Shared.DragDrop;
@@ -31,7 +31,7 @@ namespace Content.Server.Fluids.Components
return;
}
data.Text = Loc.GetString("Spill liquid");
data.Text = Loc.GetString("spill-target-verb-get-data-text");
data.Visibility = solutionComponent.DrainAvailable > ReagentUnit.Zero
? VerbVisibility.Visible
: VerbVisibility.Disabled;
@@ -44,12 +44,12 @@ namespace Content.Server.Fluids.Components
if (!solutionComponent.CanDrain)
{
user.PopupMessage(user,
Loc.GetString("You can't pour anything from {0:theName}!", component.Owner));
Loc.GetString("spill-target-verb-activate-cannot-drain-message",("owner", component.Owner)));
}
if (solutionComponent.DrainAvailable <= 0)
{
user.PopupMessage(user, Loc.GetString("{0:theName} is empty!", component.Owner));
user.PopupMessage(user, Loc.GetString("spill-target-verb-activate-is-empty-message",("owner", component.Owner)));
}
// Need this as when we split the component's owner may be deleted

6
Content.Server/Fluids/Components/SprayComponent.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
using Content.Server.Chemistry.Components;
using Content.Shared.ActionBlocker;
@@ -101,13 +101,13 @@ namespace Content.Server.Fluids.Components
if (_hasSafety && _safety)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("Its safety is on!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("spray-component-safety-on-message"));
return true;
}
if (CurrentVolume <= 0)
{
Owner.PopupMessage(eventArgs.User, Loc.GetString("It's empty!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("spray-component-is-empty-message"));
return true;
}