Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
@@ -79,7 +79,7 @@
}
catch (UpliftVanCalculatorException e)
{
- CalculationServiceHelper.LogExceptionAsError(Resources.MacroStabilityInwardsCalculationService_Calculate_Error_in_MacroStabilityInwards_validation, e);
+ CalculationServiceHelper.LogExceptionAsError(Resources.MacroStabilityInwardsCalculationService_Validate_Error_in_MacroStabilityInwards_validation, e);
CalculationServiceHelper.LogValidationEnd();
return false;
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r457252870eff6f6c559976ae2a479112b5754bec -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 457252870eff6f6c559976ae2a479112b5754bec)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
@@ -82,7 +82,7 @@
}
///
- /// Looks up a localized string similar to Macrostabiliteit berekening mislukt..
+ /// Looks up a localized string similar to Macrostabiliteit binnenwaarts berekening mislukt..
///
internal static string MacroStabilityInwardsCalculationService_Calculate_Error_in_MacroStabilityInwards_calculation {
get {
@@ -92,12 +92,12 @@
}
///
- /// Looks up a localized string similar to Macrostabiliteit validatie mislukt..
+ /// Looks up a localized string similar to Macrostabiliteit binnenwaarts validatie mislukt..
///
- internal static string MacroStabilityInwardsCalculationService_Calculate_Error_in_MacroStabilityInwards_validation {
+ internal static string MacroStabilityInwardsCalculationService_Validate_Error_in_MacroStabilityInwards_validation {
get {
- return ResourceManager.GetString("MacroStabilityInwardsCalculationService_Calculate_Error_in_MacroStabilityInwards_" +
- "validation", resourceCulture);
+ return ResourceManager.GetString("MacroStabilityInwardsCalculationService_Validate_Error_in_MacroStabilityInwards_v" +
+ "alidation", resourceCulture);
}
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx
===================================================================
diff -u -r457252870eff6f6c559976ae2a479112b5754bec -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 457252870eff6f6c559976ae2a479112b5754bec)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/Properties/Resources.resx (.../Resources.resx) (revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
@@ -130,9 +130,9 @@
Kan het toetspeil niet afleiden op basis van de invoer.
- Macrostabiliteit berekening mislukt.
+ Macrostabiliteit binnenwaarts berekening mislukt.
-
- Macrostabiliteit validatie mislukt.
+
+ Macrostabiliteit binnenwaarts validatie mislukt.
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision d485f27eb5a6d688406882dce60c3229e22f2ac2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
@@ -337,7 +337,7 @@
TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, tuples =>
{
Tuple tuple = tuples.ElementAt(1);
- Assert.AreEqual("Macrostabiliteit validatie mislukt.", tuple.Item1);
+ Assert.AreEqual("Macrostabiliteit binnenwaarts validatie mislukt.", tuple.Item1);
Assert.AreEqual(Level.Error, tuple.Item2);
Assert.IsInstanceOf(tuple.Item3);
});
@@ -576,7 +576,7 @@
TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, tuples =>
{
Tuple tuple = tuples.ElementAt(1);
- Assert.AreEqual("Macrostabiliteit berekening mislukt.", tuple.Item1);
+ Assert.AreEqual("Macrostabiliteit binnenwaarts berekening mislukt.", tuple.Item1);
Assert.AreEqual(Level.Error, tuple.Item2);
Assert.IsInstanceOf(tuple.Item3);
});
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs
===================================================================
diff -u -r7371a70ed0751d341d41a7b951b780d286f83791 -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 7371a70ed0751d341d41a7b951b780d286f83791)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
@@ -113,10 +113,7 @@
}
catch (PipingCalculatorException e)
{
- CalculationServiceHelper.LogMessagesAsError(Resources.Error_in_piping_calculation_0, new[]
- {
- e.Message
- });
+ CalculationServiceHelper.LogExceptionAsError(Resources.Error_in_piping_calculation, e);
}
finally
{
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
@@ -82,11 +82,11 @@
}
///
- /// Looks up a localized string similar to Piping berekening mislukt: {0}.
+ /// Looks up a localized string similar to Piping berekening mislukt..
///
- internal static string Error_in_piping_calculation_0 {
+ internal static string Error_in_piping_calculation {
get {
- return ResourceManager.GetString("Error_in_piping_calculation_0", resourceCulture);
+ return ResourceManager.GetString("Error_in_piping_calculation", resourceCulture);
}
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r3f515e610bde480dd6cdf54dc0887f072d0fb6d2
--- Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx (.../Resources.resx) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx (.../Resources.resx) (revision 3f515e610bde480dd6cdf54dc0887f072d0fb6d2)
@@ -117,8 +117,8 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Piping berekening mislukt: {0}
+
+ Piping berekening mislukt.
Kan de dikte van het watervoerend pakket niet afleiden op basis van de invoer.