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

10
Content.Server/Storage/Components/EntityStorageComponent.cs
View File

@@ -172,7 +172,7 @@ namespace Content.Server.Storage.Components
{
if (IsWeldedShut)
{
if(!silent) Owner.PopupMessage(user, Loc.GetString("It's welded completely shut!"));
if(!silent) Owner.PopupMessage(user, Loc.GetString("entity-storage-component-welded-shut-message"));
return false;
}
return true;
@@ -410,7 +410,7 @@ namespace Content.Server.Storage.Components
if (Contents.Contains(eventArgs.User))
{
_beingWelded = false;
Owner.PopupMessage(eventArgs.User, Loc.GetString("It's too Cramped!"));
Owner.PopupMessage(eventArgs.User, Loc.GetString("entity-storage-component-already-contains-user-message"));
return false;
}
@@ -474,12 +474,12 @@ namespace Content.Server.Storage.Components
if (IsWeldedShut)
{
data.Visibility = VerbVisibility.Disabled;
var verb = Loc.GetString(component.Open ? "Close" : "Open");
data.Text = Loc.GetString("{0} (welded shut)", verb);
var verb = Loc.GetString(component.Open ? "open-toggle-verb-close" : "open-toggle-verb-open");
data.Text = Loc.GetString("open-toggle-verb-welded-shut-message",("verb", verb));
return;
}
data.Text = Loc.GetString(component.Open ? "Close" : "Open");
data.Text = Loc.GetString(component.Open ? "open-toggle-verb-close" : "open-toggle-verb-open");
data.IconTexture = component.Open ? "/Textures/Interface/VerbIcons/close.svg.192dpi.png" : "/Textures/Interface/VerbIcons/open.svg.192dpi.png";
}

10
Content.Server/Storage/Components/SecretStashComponent.cs
View File

@@ -29,7 +29,7 @@ namespace Content.Server.Storage.Components
[ViewVariables] private ContainerSlot _itemContainer = default!;
public string SecretPartName => _secretPartNameOverride ?? Loc.GetString("{0:theName}", Owner);
public string SecretPartName => _secretPartNameOverride ?? Loc.GetString("comp-secret-stash-secret-part-name", ("name", Owner.Name));
protected override void Initialize()
{
@@ -47,7 +47,7 @@ namespace Content.Server.Storage.Components
{
if (_itemContainer.ContainedEntity != null)
{
Owner.PopupMessage(user, Loc.GetString("There's already something in here?!"));
Owner.PopupMessage(user, Loc.GetString("comp-secret-stash-action-hide-container-not-empty"));
return false;
}
@@ -57,7 +57,7 @@ namespace Content.Server.Storage.Components
if (item.Size > _maxItemSize)
{
Owner.PopupMessage(user,
Loc.GetString("{0:TheName} is too big to fit in {1}!", itemToHide, SecretPartName));
Loc.GetString("comp-secret-stash-action-hide-item-too-big",("item", itemToHide),("stash", SecretPartName)));
return false;
}
@@ -67,7 +67,7 @@ namespace Content.Server.Storage.Components
if (!hands.Drop(itemToHide, _itemContainer))
return false;
Owner.PopupMessage(user, Loc.GetString("comp-secret-stash-action-hide", ("item", itemToHide), ("this", SecretPartName)));
Owner.PopupMessage(user, Loc.GetString("comp-secret-stash-action-hide-success", ("item", itemToHide), ("this", SecretPartName)));
return true;
}
@@ -82,7 +82,7 @@ namespace Content.Server.Storage.Components
if (_itemContainer.ContainedEntity == null)
return false;
Owner.PopupMessage(user, Loc.GetString("There was something inside {0}!", SecretPartName));
Owner.PopupMessage(user, Loc.GetString("There was something inside {0}!", ("stash", SecretPartName)));
if (user.TryGetComponent(out HandsComponent? hands))
{

4
Content.Server/Storage/Components/SecureEntityStorageComponent.cs
View File

@@ -117,7 +117,7 @@ namespace Content.Server.Storage.Components
{
if (!reader.IsAllowed(user))
{
Owner.PopupMessage(user, Loc.GetString("Access denied"));
Owner.PopupMessage(user, Loc.GetString("secure-entity-storage-component-not-allowed-message"));
return false;
}
}
@@ -136,7 +136,7 @@ namespace Content.Server.Storage.Components
return;
}
data.Text = Loc.GetString(component.Locked ? "Unlock" : "Lock");
data.Text = Loc.GetString(component.Locked ? "toggle-lock-verb-unlock" : "toggle-lock-verb-lock");
}
protected override void Activate(IEntity user, SecureEntityStorageComponent component)