Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs
===================================================================
diff -u -r75ac52f6f7e203e77dd212e6c32d68e7e58c28b2 -r8aea6e032ff8aeb4a4f1b85210fd0e2fbbce3a4a
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 75ac52f6f7e203e77dd212e6c32d68e7e58c28b2)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs	(.../WaveHeightCalculationService.cs)	(revision 8aea6e032ff8aeb4a4f1b85210fd0e2fbbce3a4a)
@@ -21,6 +21,7 @@
 
 using System.IO;
 using log4net;
+using Ringtoets.Common.Service.MessageProviders;
 using Ringtoets.Common.Service.Properties;
 using Ringtoets.HydraRing.Calculation.Data;
 using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
@@ -43,13 +44,12 @@
         /// Performs validation of the values in the given <paramref name="hydraulicBoundaryDatabaseFilePath"/>. Error information is logged during
         /// the execution of the operation.
         /// </summary>
-        /// <param name="hydraulicBoundaryLocation">The <see cref="IHydraulicBoundaryLocation"/> for which to validate the values.</param>
+        /// <param name="name">The name to use in the validation logs.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The HLCD file that should be used for performing the calculation.</param>
         /// <returns><c>False</c> if the connection to <paramref name="hydraulicBoundaryDatabaseFilePath"/> contains validation errors; <c>True</c> otherwise.</returns>
-        internal static bool Validate(IHydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath)
+        internal static bool Validate(string name, string hydraulicBoundaryDatabaseFilePath)
         {
-            var calculationName = string.Format(Resources.WaveHeightCalculationService_Name_Wave_height_for_location_0_, hydraulicBoundaryLocation.Name);
-            CalculationServiceHelper.LogValidationBeginTime(calculationName);
+            CalculationServiceHelper.LogValidationBeginTime(name);
 
             string validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabaseFilePath);
             var isValid = string.IsNullOrEmpty(validationProblem);
@@ -60,7 +60,7 @@
                                                             validationProblem);
             }
 
-            CalculationServiceHelper.LogValidationEndTime(calculationName);
+            CalculationServiceHelper.LogValidationEndTime(name);
 
             return isValid;
         }
@@ -69,12 +69,15 @@
         /// Performs a wave height calculation based on the supplied <see cref="IHydraulicBoundaryLocation"/> and returns the result
         /// if the calculation was successful. Error and status information is logged during the execution of the operation.
         /// </summary>
+        /// <param name="messageProvider">The message provider for the services.</param>
         /// <param name="hydraulicBoundaryLocation">The <see cref="IHydraulicBoundaryLocation"/> to perform the calculation for.</param>
         /// <param name="hydraulicBoundaryDatabaseFilePath">The HLCD file that should be used for performing the calculation.</param>
         /// <param name="ringId">The id of the ring to perform the calculation for.</param>
         /// <param name="norm">The norm to use during the calculation.</param>
         /// <returns>A <see cref="ReliabilityIndexCalculationOutput"/> on a successful calculation, <c>null</c> otherwise.</returns>
-        internal static ReliabilityIndexCalculationOutput Calculate(IHydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath,
+        internal static ReliabilityIndexCalculationOutput Calculate(ICalculationMessageProvider messageProvider,
+                                                                    IHydraulicBoundaryLocation hydraulicBoundaryLocation,
+                                                                    string hydraulicBoundaryDatabaseFilePath,
                                                                     string ringId, double norm)
         {
             var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath);
@@ -96,17 +99,17 @@
                             targetProbabilityCalculationParser
                         });
 
-                    VerifyOutput(targetProbabilityCalculationParser.Output, hydraulicBoundaryLocation.Name);
+                    VerifyOutput(targetProbabilityCalculationParser.Output, messageProvider, hydraulicBoundaryLocation.Name);
                 });
 
             return targetProbabilityCalculationParser.Output;
         }
 
-        private static void VerifyOutput(ReliabilityIndexCalculationOutput output, string name)
+        private static void VerifyOutput(ReliabilityIndexCalculationOutput output, ICalculationMessageProvider messageProvider, string locationName)
         {
             if (output == null)
             {
-                log.ErrorFormat(Resources.WaveHeightCalculationService_Calculate_Error_in_wave_height_0_calculation, name);
+                log.Error(messageProvider.GetCalculationFailedMessage(locationName));
             }
         }