Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs =================================================================== diff -u -r1355 -r1358 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 1355) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 1358) @@ -181,7 +181,7 @@ Assert.AreEqual(2, output.Results.CalculationMessages.Length); Assert.AreEqual("Location 101, subsoil scenario 'segment1_1D1', design scenario '1': " + "The calculation failed with error message " + - "'The design was not successful in location '101', soilprofile 'segment1_1D1', " + + "'The design was not successful. " + "The new shoulder width is too large to fit in the current surface line.'", output.Results.CalculationMessages[0].Message1); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs =================================================================== diff -u -r1343 -r1358 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1343) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1358) @@ -263,7 +263,7 @@ } /// - /// Looks up a localized string similar to The design was not successful in location '{0}', soilprofile '{1}'. + /// Looks up a localized string similar to The design was not successful.. /// internal static string DesignUnsuccessful { get { Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx =================================================================== diff -u -r1343 -r1358 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 1343) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.resx (.../Resources.resx) (revision 1358) @@ -238,7 +238,7 @@ No Dam input object defined for Bligh - The design was not successful in location '{0}', soilprofile '{1}' + The design was not successful. Factor achieved = {0:0.000}, Factor required = {1:0.000}. Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs =================================================================== diff -u -r1354 -r1358 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs (.../DesignCalculatorShoulderPerPoint.cs) (revision 1354) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/DikesDesign/DesignCalculatorShoulderPerPoint.cs (.../DesignCalculatorShoulderPerPoint.cs) (revision 1358) @@ -141,17 +141,15 @@ bool designSuccessful = kernelWrapper.EvaluateDesign(damKernelInput, kernelDataInput, kernelDataOutput, out designAdvise, out evaluationMessage); if (!designSuccessful) { - throw new DesignCalculatorException(String.Format(Resources.DesignUnsuccessful, - damKernelInput.Location.Name, damKernelInput.SubSoilScenario) + ", " + evaluationMessage); + throw new DesignCalculatorException(Resources.DesignUnsuccessful + " " + evaluationMessage); } } catch (Exception exception) { string resultMessage = exception.Message; kernelWrapper.PostProcess(damKernelInput, kernelDataOutput, designScenario, resultMessage, out designResults); ChangeSafetyFactor(designResults, -1); - throw new DesignCalculatorException(String.Format(Resources.DesignUnsuccessful, - damKernelInput.Location.Name, damKernelInput.SubSoilScenario) + ", " + resultMessage); + throw new DesignCalculatorException(Resources.DesignUnsuccessful + " " + resultMessage); } finally { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingSellmeijerVnkTests.cs =================================================================== diff -u -r1354 -r1358 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingSellmeijerVnkTests.cs (.../PipingSellmeijerVnkTests.cs) (revision 1354) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/PipingSellmeijerVnkTests.cs (.../PipingSellmeijerVnkTests.cs) (revision 1358) @@ -155,8 +155,8 @@ output.Results.CalculationResults.DesignResults[0].PipingDesignResults.ResultMessage); Assert.AreEqual("Location Profiel 1, subsoil scenario 'soilprofile_01', design scenario '1': " + "The calculation failed with error message " + - "'The design was not successful in location 'Profiel 1', soilprofile 'soilprofile_01', " + - "The new shoulder width is too large to fit in the current surface line.'", + "'The design was not successful. " + + "The new shoulder width is too large to fit in the current surface line.'", output.Results.CalculationMessages[0].Message1); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx =================================================================== diff -u -r1347 -r1358 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 1347) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/Properties/Resources.nl-NL.resx (.../Resources.nl-NL.resx) (revision 1358) @@ -184,7 +184,7 @@ Maximum aantal iteraties {0} is overschreden. - Het ontwerpen is niet gelukt in locatie '{0}', ondergrondprofiel '{1}' + Het ontwerpen is niet gelukt. Factor bereikt = {1:0.000}, Factor benodigd = {1:0.000}.