diff --git a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs index 241d103dc9..71c6ee7996 100644 --- a/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs +++ b/Content.Server/GameObjects/Components/Chemistry/SolutionComponent.cs @@ -234,7 +234,10 @@ namespace Content.Server.GameObjects.Components.Chemistry var heldEntityName = hands.GetActiveHand.Owner?.Prototype?.Name ?? ""; var myName = component.Owner.Prototype?.Name ?? ""; - data.Text= $"Transfer liquid from [{heldEntityName}] to [{myName}]."; + var locHeldEntityName = Loc.GetString(heldEntityName); + var locMyName = Loc.GetString(myName); + + data.Text = Loc.GetString("Transfer liquid from [{0}] to [{1}].", locHeldEntityName, locMyName); return; } @@ -334,7 +337,10 @@ namespace Content.Server.GameObjects.Components.Chemistry var heldEntityName = hands.GetActiveHand.Owner?.Prototype?.Name ?? ""; var myName = component.Owner.Prototype?.Name ?? ""; - data.Text = $"Transfer liquid from [{myName}] to [{heldEntityName}]."; + var locHeldEntityName = Loc.GetString(heldEntityName); + var locMyName = Loc.GetString(myName); + + data.Text = Loc.GetString("Transfer liquid from [{0}] to [{1}].", locMyName, locHeldEntityName); return; } diff --git a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs index f03abfd8b0..aa007c3cdf 100644 --- a/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs +++ b/Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs @@ -294,7 +294,7 @@ namespace Content.Server.GameObjects.Components.Disposal { protected override void GetData(IEntity user, IDisposalTubeComponent component, VerbData data) { - data.Text = "Tube Directions"; + data.Text = Loc.GetString("Tube Directions"); data.CategoryData = VerbCategories.Debug; data.Visibility = VerbVisibility.Invisible; diff --git a/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs b/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs index 24b56c876f..1eb779557b 100644 --- a/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs +++ b/Content.Server/GameObjects/Components/Fluids/CanSpillComponent.cs @@ -4,6 +4,7 @@ using Content.Shared.GameObjects.EntitySystems; using Content.Shared.GameObjects.Verbs; using Robust.Shared.GameObjects; using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Localization; namespace Content.Server.GameObjects.Components.Fluids { @@ -28,7 +29,7 @@ namespace Content.Server.GameObjects.Components.Fluids return; } - data.Text = "Spill liquid"; + data.Text = Loc.GetString("Spill liquid"); data.Visibility = solutionComponent.CurrentVolume > ReagentUnit.Zero ? VerbVisibility.Visible : VerbVisibility.Disabled; diff --git a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs index b2daa8e37c..6e607ae9c8 100644 --- a/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs +++ b/Content.Server/GameObjects/Components/Interactable/HandheldLightComponent.cs @@ -273,12 +273,12 @@ namespace Content.Server.GameObjects.Components.Interactable if (component.Cell == null) { - data.Text = "Eject cell (cell missing)"; + data.Text = Loc.GetString("Eject cell (cell missing)"); data.Visibility = VerbVisibility.Disabled; } else { - data.Text = "Eject cell"; + data.Text = Loc.GetString("Eject cell"); } } diff --git a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs index ab4c181253..6bbdacca5e 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/EntityStorageComponent.cs @@ -428,7 +428,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage return; } - data.Text = component.Open ? "Close" : "Open"; + data.Text = Loc.GetString(component.Open ? "Close" : "Open"); } void IExAct.OnExplosion(ExplosionEventArgs eventArgs) diff --git a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs index 93260ae1bb..4eead02f0f 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/ItemComponent.cs @@ -15,6 +15,7 @@ using Robust.Shared.GameObjects.Components; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.Interfaces.Map; using Robust.Shared.IoC; +using Robust.Shared.Localization; using Robust.Shared.Serialization; namespace Content.Server.GameObjects.Components.Items.Storage @@ -122,7 +123,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage return; } - data.Text = "Pick Up"; + data.Text = Loc.GetString("Pick Up"); } protected override void Activate(IEntity user, ItemComponent component) diff --git a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs index dcdab4725b..dca9f41cc8 100644 --- a/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs +++ b/Content.Server/GameObjects/Components/Items/Storage/SecureEntityStorageComponent.cs @@ -146,7 +146,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage return; } - data.Text = component.Locked ? Loc.GetString("Unlock") : Loc.GetString("Lock"); + data.Text = Loc.GetString(component.Locked ? "Unlock" : "Lock"); } protected override void Activate(IEntity user, SecureEntityStorageComponent component) diff --git a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs index e0f0f436ed..986b404aea 100644 --- a/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs +++ b/Content.Server/GameObjects/Components/Power/ApcNetComponents/PowerReceiverUsers/BaseCharger.cs @@ -137,11 +137,13 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece if (component._container.ContainedEntity != null || handsComponent.GetActiveHand == null) { data.Visibility = VerbVisibility.Disabled; - data.Text = "Insert"; + data.Text = Loc.GetString("Insert"); return; } - data.Text = $"Insert {handsComponent.GetActiveHand.Owner.Name}"; + var heldItemName = Loc.GetString(handsComponent.GetActiveHand.Owner.Name); + + data.Text = Loc.GetString("Insert {0}", heldItemName); } protected override void Activate(IEntity user, BaseCharger component) @@ -173,12 +175,14 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents.PowerRece } if (component._container.ContainedEntity == null) { - data.Text = "Eject"; + data.Text = Loc.GetString("Eject"); data.Visibility = VerbVisibility.Disabled; return; } - data.Text = $"Eject {component._container.ContainedEntity.Name}"; + var containerItemName = Loc.GetString(component._container.ContainedEntity.Name); + + data.Text = Loc.GetString("Eject {0}", containerItemName); } protected override void Activate(IEntity user, BaseCharger component) diff --git a/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs b/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs index 564decbb9c..6534dfe9b6 100644 --- a/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs +++ b/Content.Server/GameObjects/Components/Rotatable/RotatableComponent.cs @@ -43,7 +43,7 @@ namespace Content.Server.GameObjects.Components.Rotatable } data.CategoryData = VerbCategories.Rotate; - data.Text = "Rotate clockwise"; + data.Text = Loc.GetString("Rotate clockwise"); data.IconTexture = "/Textures/Interface/VerbIcons/rotate_cw.svg.96dpi.png"; } @@ -65,7 +65,7 @@ namespace Content.Server.GameObjects.Components.Rotatable } data.CategoryData = VerbCategories.Rotate; - data.Text = "Rotate counter-clockwise"; + data.Text = Loc.GetString("Rotate counter-clockwise"); data.IconTexture = "/Textures/Interface/VerbIcons/rotate_ccw.svg.96dpi.png"; } diff --git a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs index 420837f29e..ea47b05290 100644 --- a/Content.Server/GameObjects/Components/Strap/StrapComponent.cs +++ b/Content.Server/GameObjects/Components/Strap/StrapComponent.cs @@ -215,7 +215,7 @@ namespace Content.Server.GameObjects.Components.Strap } data.Visibility = VerbVisibility.Visible; - data.Text = buckle.BuckledTo == null ? Loc.GetString("Buckle") : Loc.GetString("Unbuckle"); + data.Text = Loc.GetString(buckle.BuckledTo == null ? "Buckle" : "Unbuckle"); } protected override void Activate(IEntity user, StrapComponent component) diff --git a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs index 6ede88e76a..15bbd862c8 100644 --- a/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Melee/StunbatonComponent.cs @@ -269,12 +269,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Melee if (component.Cell == null) { - data.Text = "Eject cell (cell missing)"; + data.Text = Loc.GetString("Eject cell (cell missing)"); data.Visibility = VerbVisibility.Disabled; } else { - data.Text = "Eject cell"; + data.Text = Loc.GetString("Eject cell"); } } diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs index d81aa8115e..e6e6094dab 100644 --- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs +++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs @@ -18,6 +18,7 @@ using Robust.Shared.Audio; using Robust.Shared.GameObjects; using Robust.Shared.GameObjects.Systems; using Robust.Shared.Interfaces.GameObjects; +using Robust.Shared.Localization; using Robust.Shared.Map; using Robust.Shared.Serialization; using Robust.Shared.ViewVariables; @@ -302,12 +303,12 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels if (component.PowerCell == null) { - data.Text = "Eject cell (cell missing)"; + data.Text = Loc.GetString("Eject cell (cell missing)"); data.Visibility = VerbVisibility.Disabled; } else { - data.Text = "Eject cell"; + data.Text = Loc.GetString("Eject cell"); } } diff --git a/Content.Server/GlobalVerbs/ControlMobVerb.cs b/Content.Server/GlobalVerbs/ControlMobVerb.cs index 390094d763..48e226a855 100644 --- a/Content.Server/GlobalVerbs/ControlMobVerb.cs +++ b/Content.Server/GlobalVerbs/ControlMobVerb.cs @@ -6,6 +6,7 @@ using Robust.Server.Console; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Localization; namespace Content.Server.GlobalVerbs { @@ -35,7 +36,7 @@ namespace Content.Server.GlobalVerbs if (groupController.CanCommand(player.playerSession, "controlmob")) { data.Visibility = VerbVisibility.Visible; - data.Text = "Control Mob"; + data.Text = Loc.GetString("Control Mob"); data.CategoryData = VerbCategories.Debug; } } diff --git a/Content.Server/GlobalVerbs/RejuvenateVerb.cs b/Content.Server/GlobalVerbs/RejuvenateVerb.cs index 8d49222da8..e7b949f6b8 100644 --- a/Content.Server/GlobalVerbs/RejuvenateVerb.cs +++ b/Content.Server/GlobalVerbs/RejuvenateVerb.cs @@ -6,6 +6,7 @@ using Robust.Server.Console; using Robust.Server.Interfaces.GameObjects; using Robust.Shared.Interfaces.GameObjects; using Robust.Shared.IoC; +using Robust.Shared.Localization; namespace Content.Server.GlobalVerbs { @@ -20,7 +21,7 @@ namespace Content.Server.GlobalVerbs public override void GetData(IEntity user, IEntity target, VerbData data) { - data.Text = "Rejuvenate"; + data.Text = Loc.GetString("Rejuvenate"); data.CategoryData = VerbCategories.Debug; data.Visibility = VerbVisibility.Invisible;