nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More Localization

Browse source 
Edited previously modified strings for more consistency. Also modified
most strings in Print Level Wizard, and other strings that were not
previously visible because of printer connection difficulties.
This commit is contained in:
gregory-diaz 2014-02-05 18:29:58 -08:00
parent cc0d8a5095
commit ccc0eb898d
14 changed files with 143 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

8
PrinterControls/PrinterConnections/PrinterChooser.cs
View file

@ -17,7 +17,9 @@ namespace MatterHackers.MatterControl
public PrinterChooser(string selectedMake = null)
{
ManufacturerDropList = new StyledDropDownList(new LocalizedString("- Select Make -").Translated);
string defaultManufacturerLbl = new LocalizedString ("Select Make").Translated;
string defaultManufacturerLblFull = string.Format ("- {0} -", defaultManufacturerLbl);
ManufacturerDropList = new StyledDropDownList(defaultManufacturerLblFull);
bool addOther = false;
string pathToWhitelist = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "OEMSettings", "PrinterSettingsWhitelist.txt");
string[] folderWhitelist = File.ReadAllLines(pathToWhitelist);
@ -80,7 +82,9 @@ namespace MatterHackers.MatterControl
public ModelChooser(string manufacturer)
{
ModelDropList = new StyledDropDownList(new LocalizedString("- Select Model -").Translated);
string defaultModelDropDownLbl = new LocalizedString("Select Model").Translated;
string defaultModelDropDownLblFull = string.Format("- {0} -", defaultModelDropDownLbl);
ModelDropList = new StyledDropDownList(defaultModelDropDownLblFull);
string pathToModels = Path.Combine(ApplicationDataStorage.Instance.ApplicationStaticDataPath, "PrinterSettings", manufacturer);
if (Directory.Exists(pathToModels))
{

4
PrinterControls/PrinterConnections/SetupStepInstallDriver.cs
View file

@ -161,7 +161,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
{
try
{
printerDriverMessage.Text = new LocalizedString("Installing...").Translated;
string printerDriverMessageLbl = new LocalizedString("Installing").Translated;
string printerDriverMessageLblFull = string.Format("{0}...", printerDriverMessageLbl);
printerDriverMessage.Text = printerDriverMessageLblFull;
InstallDriver(this.printerDriverFilePath);
return true;
}

14
PrinterControls/PrinterConnections/SetupStepMakeModelName.cs
View file

@ -77,7 +77,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
container.Margin = new BorderDouble(0, 5);
BorderDouble elementMargin = new BorderDouble(top: 3);
TextWidget printerNameLabel = new TextWidget(new LocalizedString("Printer Name:").Translated, 0, 0, 12);
string printerNameLabelTxt = new LocalizedString("Printer Name").Translated;
string printerNameLabelTxtFull = string.Format ("{0}:", printerNameLabelTxt);
TextWidget printerNameLabel = new TextWidget(printerNameLabelTxtFull, 0, 0, 12);
printerNameLabel.TextColor = this.defaultTextColor;
printerNameLabel.HAnchor = HAnchor.ParentLeftRight;
printerNameLabel.Margin = new BorderDouble(0, 0, 0, 1);
@ -103,7 +105,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
container.Margin = new BorderDouble(0, 5);
BorderDouble elementMargin = new BorderDouble(top: 3);
TextWidget printerManufacturerLabel = new TextWidget(new LocalizedString("Select Make:").Translated, 0, 0, 12);
string printerManufacturerLabelTxt = new LocalizedString("Select Make").Translated;
string printerManufacturerLabelTxtFull = string.Format("{0}:", printerManufacturerLabelTxt);
TextWidget printerManufacturerLabel = new TextWidget(printerManufacturerLabelTxtFull, 0, 0, 12);
printerManufacturerLabel.TextColor = this.defaultTextColor;
printerManufacturerLabel.HAnchor = HAnchor.ParentLeftRight;
printerManufacturerLabel.Margin = elementMargin;
@ -132,7 +136,9 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
container.Margin = new BorderDouble(0, 5);
BorderDouble elementMargin = new BorderDouble(top: 3);
TextWidget printerModelLabel = new TextWidget(new LocalizedString("Select Model:").Translated, 0, 0, 12);
string printerModelLabelTxt = new LocalizedString("Select Model").Translated;
string printerModelLabelTxtFull = string.Format ("{0}:", printerModelLabelTxt);
TextWidget printerModelLabel = new TextWidget(printerModelLabelTxtFull, 0, 0, 12);
printerModelLabel.TextColor = this.defaultTextColor;
printerModelLabel.HAnchor = HAnchor.ParentLeftRight;
printerModelLabel.Margin = elementMargin;
@ -399,7 +405,7 @@ namespace MatterHackers.MatterControl.PrinterControls.PrinterConnections
else
{
this.printerNameError.TextColor = RGBA_Bytes.Red;
this.printerNameError.Text = "Printer name cannot be blank";
this.printerNameError.Text = "Printer name cannot be blank";
this.printerNameError.Visible = true;
return false;
}

4
PrinterControls/TemperatureIndicator.cs
View file

@ -1,4 +1,4 @@
/*
/*
Copyright (c) 2013, Lars Brubaker
All rights reserved.
@ -404,7 +404,7 @@ namespace MatterHackers.MatterControl
public class ExtruderTemperatureControlWidget : TemperatureControlBase
{
public ExtruderTemperatureControlWidget()
: base("Extruder Temperature Override", "Extruder Temperature Settings")
: base("Extruder Temperature Override", "Extruder Temperature Settings")
{
AddHandlers();
}