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/Nutrition/Components/CreamPiedComponent.cs
View File

@@ -43,8 +43,8 @@ namespace Content.Server.Nutrition.Components
if (eventArgs.Thrown.Deleted || !eventArgs.Thrown.TryGetComponent(out CreamPieComponent? creamPie)) return;
CreamPied = true;
Owner.PopupMessage(Loc.GetString("You have been creamed by {0:theName}!", eventArgs.Thrown));
Owner.PopupMessageOtherClients(Loc.GetString("{0:theName} has been creamed by {1:theName}!", Owner, eventArgs.Thrown));
Owner.PopupMessage(Loc.GetString("cream-pied-component-on-hit-by-message",("thrower", eventArgs.Thrown)));
Owner.PopupMessageOtherClients(Loc.GetString("cream-pied-component-on-hit-by-message-others", ("owner", Owner),("thrower", eventArgs.Thrown)));
if (Owner.TryGetComponent(out StunnableComponent? stun))
{

16
Content.Server/Nutrition/Components/DrinkComponent.cs
View File

@@ -138,7 +138,7 @@ namespace Content.Server.Nutrition.Components
if (!Owner.TryGetComponent(out ISolutionInteractionsComponent? contents) ||
contents.DrainAvailable <= 0)
{
args.User.PopupMessage(Loc.GetString("{0:theName} is empty!", Owner));
args.User.PopupMessage(Loc.GetString("drink-component-on-use-is-empty",("owner", Owner)));
return true;
}
@@ -163,15 +163,15 @@ namespace Content.Server.Nutrition.Components
return;
}
var color = Empty ? "gray" : "yellow";
var openedText = Loc.GetString(Empty ? "Empty" : "Opened");
message.AddMarkup(Loc.GetString("[color={0}]{1}[/color]", color, openedText));
var openedText = Loc.GetString(Empty ? "drink-component-on-examine-is-empty" : "drink-component-on-examine-is-opened");
message.AddMarkup(Loc.GetString("drink-component-on-examine-details-text",("colorName", color),("text", openedText)));
}
private bool TryUseDrink(IEntity user, IEntity target, bool forced = false)
{
if (!Opened)
{
target.PopupMessage(Loc.GetString("Open {0:theName} first!", Owner));
target.PopupMessage(Loc.GetString("drink-component-try-use-drink-not-open",("owner", Owner)));
return false;
}
@@ -181,7 +181,7 @@ namespace Content.Server.Nutrition.Components
{
if (!forced)
{
target.PopupMessage(Loc.GetString("{0:theName} is empty!", Owner));
target.PopupMessage(Loc.GetString("drink-component-try-use-drink-is-empty", ("entity",Owner)));
}
return false;
@@ -190,7 +190,7 @@ namespace Content.Server.Nutrition.Components
if (!target.TryGetComponent(out SharedBodyComponent? body) ||
!body.TryGetMechanismBehaviors<StomachBehavior>(out var stomachs))
{
target.PopupMessage(Loc.GetString("You can't drink {0:theName}!", Owner));
target.PopupMessage(Loc.GetString("drink-component-try-use-drink-cannot-drink",("owner", Owner)));
return false;
}
@@ -208,7 +208,7 @@ namespace Content.Server.Nutrition.Components
// All stomach are full or can't handle whatever solution we have.
if (firstStomach == null)
{
target.PopupMessage(Loc.GetString("You've had enough {0:theName}!", Owner));
target.PopupMessage(Loc.GetString("drink-component-try-use-drink-had-enough",("owner", Owner)));
if (!interactions.CanRefill)
{
@@ -225,7 +225,7 @@ namespace Content.Server.Nutrition.Components
SoundSystem.Play(Filter.Pvs(target), _useSound, target, AudioParams.Default.WithVolume(-2f));
}
target.PopupMessage(Loc.GetString("Slurp"));
target.PopupMessage(Loc.GetString("drink-component-try-use-drink-success-slurp"));
UpdateAppearance();
// TODO: Account for partial transfer.

6
Content.Server/Nutrition/Components/FoodComponent.cs
View File

@@ -97,7 +97,7 @@ namespace Content.Server.Nutrition.Components
if (UsesRemaining <= 0)
{
user.PopupMessage(Loc.GetString("{0:TheName} is empty!", Owner));
user.PopupMessage(Loc.GetString("food-component-try-use-food-is-empty", ("entity", Owner)));
return false;
}
@@ -150,7 +150,7 @@ namespace Content.Server.Nutrition.Components
if (firstStomach == null)
{
trueTarget.PopupMessage(user, Loc.GetString("You can't eat any more!"));
trueTarget.PopupMessage(user, Loc.GetString("food-you-cannot-eat-any-more"));
return false;
}
@@ -165,7 +165,7 @@ namespace Content.Server.Nutrition.Components
SoundSystem.Play(Filter.Pvs(trueTarget), UseSound, trueTarget, AudioParams.Default.WithVolume(-1f));
}
trueTarget.PopupMessage(user, Loc.GetString("Nom"));
trueTarget.PopupMessage(user, Loc.GetString("food-nom"));
// If utensils were used
if (utensils != null)

2
Content.Server/Nutrition/Components/SliceableFoodComponent.cs
View File

@@ -81,7 +81,7 @@ namespace Content.Server.Nutrition.Components
public void Examine(FormattedMessage message, bool inDetailsRange)
{
message.AddMarkup(Loc.GetString($"There are { Count } slices remaining."));
message.AddMarkup(Loc.GetString("sliceable-food-component-on-examine-remaining-slices-text", ("remainingCount", Count)));
}
}
}