diff --git a/Results/Properties/AssemblyInfo.cs b/Results/Properties/AssemblyInfo.cs index a7137f81a..55d7c4b08 100644 --- a/Results/Properties/AssemblyInfo.cs +++ b/Results/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2.14.586.0")] -[assembly: AssemblyFileVersion("2.14.586.0")] +[assembly: AssemblyVersion("2.14.587.0")] +[assembly: AssemblyFileVersion("2.14.587.0")] diff --git a/Results/WMeterRsltItemSpec.cs b/Results/WMeterRsltItemSpec.cs index a27da1cfd..c5ed4ac73 100644 --- a/Results/WMeterRsltItemSpec.cs +++ b/Results/WMeterRsltItemSpec.cs @@ -316,8 +316,8 @@ namespace Results AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrLFlow, "iPerl Q2CorrLFlow", Quantity.Number, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrLFlow.ToString()))); AllItems.Add(new WMeterRsltItemSpec(ItemID.Q2CorrFlowRight, "iPerl Q2CorrFlowRight", Quantity.Volume, ItemCategory.MeterResult, (w, t, u, f, p) => (w.Q2CorrFlowRight.ToString()))); #endif - AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone, Strings.Test_done + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : (w.GetMeterTestRslt(t).TestDone ? Strings.Yes : Strings.No))); - AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed, Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) == null) ? "" : (w.GetMeterTestRslt(t).Passed ? Strings.Yes : Strings.No))); + AllItems.Add(new WMeterRsltItemSpec(ItemID.TestDone, Strings.Test_done + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).TestDone) ? Strings.Yes : Strings.No)); + AllItems.Add(new WMeterRsltItemSpec(ItemID.TestPassed, Strings.Test_passed + "()", Quantity.Boolean, ItemCategory.TestResult, (w, t, u, f, p) => (w.GetMeterTestRslt(t) != null && w.GetMeterTestRslt(t).Passed) ? Strings.Yes : Strings.No)); } /// diff --git a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/Printer.cs b/TestBenchFramework/BenchControl/Output/Printers/Enhanced/Printer.cs index ff5a995e2..e58cdc6dd 100644 --- a/TestBenchFramework/BenchControl/Output/Printers/Enhanced/Printer.cs +++ b/TestBenchFramework/BenchControl/Output/Printers/Enhanced/Printer.cs @@ -106,6 +106,9 @@ namespace TBF.BenchControl.Output.Printers.Enhanced completed = true; }); + thread.CurrentCulture = Thread.CurrentThread.CurrentCulture; + thread.CurrentUICulture = Thread.CurrentThread.CurrentUICulture; + if (printerCfg.Culture > Culture.system && printerCfg.Culture < Culture.Count) { thread.CurrentCulture = new CultureInfo(printerCfg.Culture.ToString()); diff --git a/TestBenchFramework/Properties/AssemblyInfo.cs b/TestBenchFramework/Properties/AssemblyInfo.cs index 19107b0c1..379e068d0 100644 --- a/TestBenchFramework/Properties/AssemblyInfo.cs +++ b/TestBenchFramework/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.14.586.1")] -[assembly: AssemblyFileVersion("2.14.586.1")] +[assembly: AssemblyVersion("2.14.587.1")] +[assembly: AssemblyFileVersion("2.14.587.1")]