diff --git a/Resources/Locale/en-US/console.ftl b/Resources/Locale/en-US/console.ftl deleted file mode 100644 index d051871409..0000000000 --- a/Resources/Locale/en-US/console.ftl +++ /dev/null @@ -1 +0,0 @@ -console-line-edit-placeholder = Command Here diff --git a/Resources/Locale/en-US/custom-controls.ftl b/Resources/Locale/en-US/custom-controls.ftl new file mode 100644 index 0000000000..4ce6fe3630 --- /dev/null +++ b/Resources/Locale/en-US/custom-controls.ftl @@ -0,0 +1,7 @@ +## EntitySpawnWindow + +entity-spawn-window-title = Entity Spawn Panel +entity-spawn-window-search-bar-placeholder = search +entity-spawn-window-clear-button = Clear +entity-spawn-window-erase-button-text = Erase Mode +entity-spawn-window-override-menu-tooltip = Override placement \ No newline at end of file diff --git a/Resources/Locale/en-US/tab-container.ftl b/Resources/Locale/en-US/tab-container.ftl new file mode 100644 index 0000000000..b0702d01b3 --- /dev/null +++ b/Resources/Locale/en-US/tab-container.ftl @@ -0,0 +1 @@ +tab-container-not-tab-title-provided = No title \ No newline at end of file diff --git a/Resources/Locale/en-US/view-variables.ftl b/Resources/Locale/en-US/view-variables.ftl new file mode 100644 index 0000000000..1ae92fa19e --- /dev/null +++ b/Resources/Locale/en-US/view-variables.ftl @@ -0,0 +1,11 @@ +## ViewVariablesInstanceEntity + +view-variable-instance-entity-server-components-add-component-button-placeholder = Add Component +view-variable-instance-entity-client-variables-tab-title = Client Variables +view-variable-instance-entity-client-components-tab-title = Client Components +view-variable-instance-entity-server-variables-tab-title = Server Variables +view-variable-instance-entity-server-components-tab-title = Server Components +view-variable-instance-entity-client-components-search-bar-placeholder = Search +view-variable-instance-entity-server-components-search-bar-placeholder = Search +view-variable-instance-entity-add-window-server-components = Add Component [S] +view-variable-instance-entity-add-window-client-components = Add Component [C] \ No newline at end of file diff --git a/Robust.Client/Console/Commands/Scripting.cs b/Robust.Client/Console/Commands/Scripting.cs index e14a8c916d..d52ae321bf 100644 --- a/Robust.Client/Console/Commands/Scripting.cs +++ b/Robust.Client/Console/Commands/Scripting.cs @@ -1,6 +1,5 @@ using Robust.Shared.Console; using Robust.Shared.IoC; -using Robust.Shared.Localization; namespace Robust.Client.Console.Commands { @@ -41,7 +40,7 @@ namespace Robust.Client.Console.Commands var mgr = IoCManager.Resolve(); if (!mgr.CanScript) { - shell.WriteError(Loc.GetString("You do not have server side scripting permission.")); + shell.WriteError("You do not have server side scripting permission."); return; } diff --git a/Robust.Client/Console/ScriptConsoleClient.cs b/Robust.Client/Console/ScriptConsoleClient.cs index f179df5d9d..e12a1ed0be 100644 --- a/Robust.Client/Console/ScriptConsoleClient.cs +++ b/Robust.Client/Console/ScriptConsoleClient.cs @@ -1,5 +1,4 @@ #if CLIENT_SCRIPTING -using System; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Linq; @@ -14,7 +13,6 @@ using Microsoft.CodeAnalysis.Text; using Robust.Client.UserInterface.CustomControls; using Robust.Client.ViewVariables; using Robust.Shared.IoC; -using Robust.Shared.Localization; using Robust.Shared.Maths; using Robust.Shared.Reflection; using Robust.Shared.Scripting; @@ -43,14 +41,14 @@ namespace Robust.Client.Console public ScriptConsoleClient() { - Title = Loc.GetString("Robust C# Interactive (CLIENT)"); + Title = "Robust C# Interactive (CLIENT)"; ScriptInstanceShared.InitDummy(); _globals = new ScriptGlobalsImpl(this); IoCManager.InjectDependencies(this); - OutputPanel.AddText(Loc.GetString(@"Robust C# interactive console (CLIENT).")); + OutputPanel.AddText("Robust C# interactive console (CLIENT)."); OutputPanel.AddText(">"); } diff --git a/Robust.Client/Console/WatchWindow.cs b/Robust.Client/Console/WatchWindow.cs index ac4adb44a0..e3daefab4a 100644 --- a/Robust.Client/Console/WatchWindow.cs +++ b/Robust.Client/Console/WatchWindow.cs @@ -8,8 +8,6 @@ using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.CustomControls; using Robust.Shared.IoC; -using Robust.Shared.Localization; -using Robust.Shared.Maths; using Robust.Shared.Reflection; using Robust.Shared.Scripting; using Robust.Shared.Timing; @@ -31,7 +29,7 @@ namespace Robust.Client.Console ScriptInstanceShared.InitDummy(); - Title = Loc.GetString("Watch Window"); + Title = "Watch Window"; var mainVBox = new VBoxContainer { @@ -49,11 +47,11 @@ namespace Robust.Client.Console (_addWatchEdit = new HistoryLineEdit { HorizontalExpand = true, - PlaceHolder = Loc.GetString("Add watch (C# interactive)") + PlaceHolder = "Add watch (C# interactive)" }), (_addWatchButton = new Button { - Text = Loc.GetString("Add") + Text = "Add" }) } } @@ -118,7 +116,7 @@ namespace Robust.Client.Console }), (delButton = new Button { - Text = Loc.GetString("Remove") + Text = "Remove" }), } }); @@ -178,7 +176,7 @@ namespace Robust.Client.Console ClipText = true, HorizontalExpand = true }, - (delButton = new Button {Text = Loc.GetString("Remove")}) + (delButton = new Button {Text = "Remove"}) } }); diff --git a/Robust.Client/UserInterface/Controls/TabContainer.cs b/Robust.Client/UserInterface/Controls/TabContainer.cs index 05d0ff1ef0..3f5c5e08dc 100644 --- a/Robust.Client/UserInterface/Controls/TabContainer.cs +++ b/Robust.Client/UserInterface/Controls/TabContainer.cs @@ -1,4 +1,4 @@ -using System; +using System; using Robust.Client.Graphics; using Robust.Shared.Input; using Robust.Shared.Localization; @@ -75,7 +75,7 @@ namespace Robust.Client.UserInterface.Controls var control = GetChild(tab); var title = control.GetValue(TabTitleProperty); - return title ?? control.Name ?? Loc.GetString("No title"); + return title ?? control.Name ?? Loc.GetString("tab-container-not-tab-title-provided"); } public static string? GetTabTitle(Control control) diff --git a/Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs b/Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs index 795381893a..da8d2e296a 100644 --- a/Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs +++ b/Robust.Client/UserInterface/CustomControls/EntitySpawnWindow.cs @@ -65,7 +65,7 @@ namespace Robust.Client.UserInterface.CustomControls this.prototypeManager = prototypeManager; this.resourceCache = resourceCache; - Title = Loc.GetString("Entity Spawn Panel"); + Title = Loc.GetString("entity-spawn-window-title"); SetSize = (250, 300); @@ -83,13 +83,13 @@ namespace Robust.Client.UserInterface.CustomControls (SearchBar = new LineEdit { HorizontalExpand = true, - PlaceHolder = Loc.GetString("Search") + PlaceHolder = Loc.GetString("entity-spawn-window-search-bar-placeholder") }), (ClearButton = new Button { Disabled = true, - Text = Loc.GetString("Clear"), + Text = Loc.GetString("entity-spawn-window-clear-button"), }) } }, @@ -109,13 +109,13 @@ namespace Robust.Client.UserInterface.CustomControls (EraseButton = new Button { ToggleMode = true, - Text = Loc.GetString("Erase Mode") + Text = Loc.GetString("entity-spawn-window-erase-button-text") }), (OverrideMenu = new OptionButton { HorizontalExpand = true, - ToolTip = Loc.GetString("Override placement") + ToolTip = Loc.GetString("entity-spawn-window-override-menu-tooltip") }) } }, diff --git a/Robust.Client/UserInterface/CustomControls/ScriptConsole.cs b/Robust.Client/UserInterface/CustomControls/ScriptConsole.cs index 5b867af694..35a5b32313 100644 --- a/Robust.Client/UserInterface/CustomControls/ScriptConsole.cs +++ b/Robust.Client/UserInterface/CustomControls/ScriptConsole.cs @@ -1,6 +1,5 @@ using Robust.Client.Graphics; using Robust.Client.UserInterface.Controls; -using Robust.Shared.Localization; using Robust.Shared.Maths; namespace Robust.Client.UserInterface.CustomControls @@ -37,9 +36,9 @@ namespace Robust.Client.UserInterface.CustomControls (InputBar = new HistoryLineEdit { HorizontalExpand = true, - PlaceHolder = Loc.GetString("Your C# code here.") + PlaceHolder = "Your C# code here." }), - (RunButton = new Button {Text = Loc.GetString("Run")}) + (RunButton = new Button {Text = "Run"}) } }, } diff --git a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs index 60742b8a56..33f3aeb94d 100644 --- a/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs +++ b/Robust.Client/ViewVariables/Instances/ViewVariablesInstanceEntity.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; @@ -120,7 +120,7 @@ namespace Robust.Client.ViewVariables.Instances var clientVBox = new VBoxContainer {SeparationOverride = 0}; _tabs.AddChild(clientVBox); - _tabs.SetTabTitle(TabClientVars, "Client Variables"); + _tabs.SetTabTitle(TabClientVars, Loc.GetString("view-variable-instance-entity-client-variables-tab-title")); var first = true; foreach (var group in LocalPropertyList(obj, ViewVariablesManager, _robustSerializer)) @@ -138,7 +138,7 @@ namespace Robust.Client.ViewVariables.Instances _clientComponents = new VBoxContainer {SeparationOverride = 0}; _tabs.AddChild(_clientComponents); - _tabs.SetTabTitle(TabClientComponents, "Client Components"); + _tabs.SetTabTitle(TabClientComponents, Loc.GetString("view-variable-instance-entity-client-components-tab-title")); PopulateClientComponents(); @@ -146,11 +146,11 @@ namespace Robust.Client.ViewVariables.Instances { _serverVariables = new VBoxContainer {SeparationOverride = 0}; _tabs.AddChild(_serverVariables); - _tabs.SetTabTitle(TabServerVars, "Server Variables"); + _tabs.SetTabTitle(TabServerVars, Loc.GetString("view-variable-instance-entity-server-variables-tab-title")); _serverComponents = new VBoxContainer {SeparationOverride = 0}; _tabs.AddChild(_serverComponents); - _tabs.SetTabTitle(TabServerComponents, "Server Components"); + _tabs.SetTabTitle(TabServerComponents, Loc.GetString("view-variable-instance-entity-server-components-tab-title")); PopulateServerComponents(false); } @@ -162,13 +162,13 @@ namespace Robust.Client.ViewVariables.Instances _clientComponents.AddChild(_clientComponentsSearchBar = new LineEdit { - PlaceHolder = Loc.GetString("Search"), + PlaceHolder = Loc.GetString("view-variable-instance-entity-client-components-search-bar-placeholder"), HorizontalExpand = true, }); _clientComponents.AddChild(_clientComponentsAddButton = new Button() { - Text = Loc.GetString("Add Component"), + Text = Loc.GetString("view-variable-instance-entity-server-components-add-component-button-placeholder"), HorizontalExpand = true, }); @@ -198,13 +198,13 @@ namespace Robust.Client.ViewVariables.Instances _serverComponents.AddChild(_serverComponentsSearchBar = new LineEdit { - PlaceHolder = Loc.GetString("Search"), + PlaceHolder = Loc.GetString("view-variable-instance-entity-server-components-search-bar-placeholder"), HorizontalExpand = true, }); _serverComponents.AddChild(_serverComponentsAddButton = new Button() { - Text = Loc.GetString("Add Component"), + Text = Loc.GetString("view-variable-instance-entity-server-components-add-component-button-placeholder"), HorizontalExpand = true, }); @@ -336,7 +336,7 @@ namespace Robust.Client.ViewVariables.Instances { _addComponentWindow?.Dispose(); - _addComponentWindow = new ViewVariablesAddWindow(GetValidComponentsForAdding(), "Add Component [C]"); + _addComponentWindow = new ViewVariablesAddWindow(GetValidComponentsForAdding(), Loc.GetString("view-variable-instance-entity-add-window-client-components")); _addComponentWindow.AddButtonPressed += TryAdd; _addComponentServer = false; @@ -349,7 +349,7 @@ namespace Robust.Client.ViewVariables.Instances if (_entitySession == null) return; - _addComponentWindow = new ViewVariablesAddWindow(await GetValidServerComponentsForAdding(), "Add Component [S]"); + _addComponentWindow = new ViewVariablesAddWindow(await GetValidServerComponentsForAdding(), Loc.GetString("view-variable-instance-entity-add-window-server-components")); _addComponentWindow.AddButtonPressed += TryAdd; _addComponentServer = true; diff --git a/Robust.Shared/Localization/Loc.cs b/Robust.Shared/Localization/Loc.cs index d2816b0844..ffece25345 100644 --- a/Robust.Shared/Localization/Loc.cs +++ b/Robust.Shared/Localization/Loc.cs @@ -68,7 +68,6 @@ namespace Robust.Shared.Localization LocalizationManager.LoadCulture(resourceManager, culture); } - /// /// Remnants of the old Localization system. /// It exists to prevent source errors and allow existing game text to *mostly* work diff --git a/Robust.Shared/Timing/PauseManager.cs b/Robust.Shared/Timing/PauseManager.cs index eca00334c4..714c6c6b31 100644 --- a/Robust.Shared/Timing/PauseManager.cs +++ b/Robust.Shared/Timing/PauseManager.cs @@ -4,7 +4,6 @@ using System.Globalization; using Robust.Shared.Console; using Robust.Shared.GameObjects; using Robust.Shared.IoC; -using Robust.Shared.Localization; using Robust.Shared.Log; using Robust.Shared.Map; using Robust.Shared.ViewVariables; @@ -166,7 +165,7 @@ namespace Robust.Shared.Timing { if (args.Length != 1) { - shell.WriteLine(Loc.GetString("Need to supply a valid MapId")); + shell.WriteLine("Need to supply a valid MapId"); return; }