From 1ac21b2179ed32e731338c5a96aa7c0fabb21bfb Mon Sep 17 00:00:00 2001 From: gregory-diaz Date: Mon, 24 Feb 2014 16:43:35 -0800 Subject: [PATCH] More Localization --- ActionBar/HelpTextWidget.cs | 6 +++-- CustomWidgets/ExportQueueItemWindow.cs | 5 +++- MatterControl.userprefs | 31 +++++++++++++++++-------- PrintLibrary/ExportLibraryItemWindow.cs | 5 +++- PrinterCommunication.cs | 5 ++-- 5 files changed, 36 insertions(+), 16 deletions(-) diff --git a/ActionBar/HelpTextWidget.cs b/ActionBar/HelpTextWidget.cs index e66fe7429..01ee812a7 100644 --- a/ActionBar/HelpTextWidget.cs +++ b/ActionBar/HelpTextWidget.cs @@ -130,8 +130,10 @@ namespace MatterHackers.MatterControl { case PrinterCommunication.CommunicationStates.Disconnected: return new LocalizedString("Not connected. Press 'Connect' to enable printing.").Translated; - case PrinterCommunication.CommunicationStates.AttemptingToConnect: - return new LocalizedString("Attempting to connect...").Translated; + case PrinterCommunication.CommunicationStates.AttemptingToConnect: + string attemptToConnect = new LocalizedString ("Attempting to Connect").Translated; + string attemptToConnectFull = string.Format ("{0}...", attemptToConnect); + return attemptToConnectFull; case PrinterCommunication.CommunicationStates.ConnectionLost: case PrinterCommunication.CommunicationStates.FailedToConnect: return new LocalizedString("Unable to communicate with printer.").Translated; diff --git a/CustomWidgets/ExportQueueItemWindow.cs b/CustomWidgets/ExportQueueItemWindow.cs index a2dcd91de..5da005c20 100644 --- a/CustomWidgets/ExportQueueItemWindow.cs +++ b/CustomWidgets/ExportQueueItemWindow.cs @@ -80,7 +80,10 @@ namespace MatterHackers.MatterControl if(showExportGCodeButton) { - Button exportGCode = textImageButtonFactory.Generate(new LocalizedString("Export as GCode").Translated); + string exportGCodeText = new LocalizedString("Export as").Translated; + string exportGCodeTextFull = string.Format("{0} GCode", exportGCodeText); + + Button exportGCode = textImageButtonFactory.Generate(exportGCodeTextFull); //exportGCode.HAnchor = Agg.UI.HAnchor.ParentCenter; exportGCode.Click += new ButtonBase.ButtonEventHandler(exportGCode_Click); topToBottom.AddChild(exportGCode); diff --git a/MatterControl.userprefs b/MatterControl.userprefs index 4e970df75..78a05af8a 100644 --- a/MatterControl.userprefs +++ b/MatterControl.userprefs @@ -1,19 +1,30 @@  - + - - - - - - - - + + + + + + + + + + + - + + + + + + + + + \ No newline at end of file diff --git a/PrintLibrary/ExportLibraryItemWindow.cs b/PrintLibrary/ExportLibraryItemWindow.cs index 5e0e0507e..c716ccd96 100644 --- a/PrintLibrary/ExportLibraryItemWindow.cs +++ b/PrintLibrary/ExportLibraryItemWindow.cs @@ -80,7 +80,10 @@ namespace MatterHackers.MatterControl.PrintLibrary if (showExportGCodeButton) { - Button exportGCode = textImageButtonFactory.Generate(new LocalizedString("Export as GCode").Translated); + string exportGCodeText = new LocalizedString("Export as").Translated; + string exportGCodeTextFull = string.Format ("{0} GCode", exportGCodeText); + + Button exportGCode = textImageButtonFactory.Generate(exportGCodeTextFull); //exportGCode.HAnchor = Agg.UI.HAnchor.ParentCenter; exportGCode.Click += new ButtonBase.ButtonEventHandler(exportGCode_Click); topToBottom.AddChild(exportGCode); diff --git a/PrinterCommunication.cs b/PrinterCommunication.cs index 4480a3874..89cc0aff4 100644 --- a/PrinterCommunication.cs +++ b/PrinterCommunication.cs @@ -486,8 +486,9 @@ namespace MatterHackers.MatterControl return new LocalizedString("Not Connected").Translated; case CommunicationStates.Disconnecting: return new LocalizedString("Disconnecting").Translated; - case CommunicationStates.AttemptingToConnect: - return "Connecting..."; + case CommunicationStates.AttemptingToConnect: + string connectingMessageTxt = new LocalizedString ("Connecting").Translated; + return string.Format("{0}...",connectingMessageTxt); case CommunicationStates.ConnectionLost: return new LocalizedString("Connection Lost").Translated; case CommunicationStates.FailedToConnect: