Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs =================================================================== diff -u -r7c60a75a8c4e1059ba6678277ea3249dd76f9788 -rcfc663ba43f203e8e268f5527c4fa298aa3b6cde --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision 7c60a75a8c4e1059ba6678277ea3249dd76f9788) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs (.../HydraulicBoundaryDatabaseImporter.cs) (revision cfc663ba43f203e8e268f5527c4fa298aa3b6cde) @@ -26,6 +26,7 @@ using Ringtoets.Common.IO.FileImporters; using Ringtoets.HydraRing.IO.HydraulicBoundaryDatabase; using Ringtoets.Integration.IO.Handlers; +using Ringtoets.Integration.IO.Properties; namespace Ringtoets.Integration.IO.Importers { @@ -69,7 +70,7 @@ private ReadResult ReadHydraulicBoundaryDatabase() { - NotifyProgress("Inlezen van het hydraulische belastingen bestand.", 1, 1); + NotifyProgress(Resources.HydraulicBoundaryDatabaseImporter_ReadHydraulicBoundaryDatabase_Read_HRD_file, 1, 1); try { using (HydraulicBoundaryDatabaseReader reader = new HydraulicBoundaryDatabaseReader(FilePath)) @@ -92,7 +93,8 @@ private ReadResult HandleCriticalFileReadError(Exception e) { - string errorMessage = $"{e.Message} {Environment.NewLine}Er is geen hydraulische belastingen database gekoppeld."; + string errorMessage = string.Format(Resources.HydraulicBoundaryDatabaseImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported, + e.Message); Log.Error(errorMessage); return new ReadResult(true); } Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r2a81f01756e227d5ce93717b21b87e8a5cd5fcbb -rcfc663ba43f203e8e268f5527c4fa298aa3b6cde --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2a81f01756e227d5ce93717b21b87e8a5cd5fcbb) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cfc663ba43f203e8e268f5527c4fa298aa3b6cde) @@ -111,6 +111,26 @@ } /// + /// Looks up a localized string similar to {0} + ///Er is geen hydraulische belastingen database gekoppeld.. + /// + internal static string HydraulicBoundaryDatabaseImporter_HandleCriticalFileReadError_Error_0_No_HydraulicBoundaryDatabase_imported { + get { + return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_HandleCriticalFileReadError_Error_0_No_Hydrauli" + + "cBoundaryDatabase_imported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Inlezen van het hydraulische belastingen bestand.. + /// + internal static string HydraulicBoundaryDatabaseImporter_ReadHydraulicBoundaryDatabase_Read_HRD_file { + get { + return ResourceManager.GetString("HydraulicBoundaryDatabaseImporter_ReadHydraulicBoundaryDatabase_Read_HRD_file", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Assemblage. /// internal static string SerializableAssembly_IdPrefix { Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx =================================================================== diff -u -r0a5e20eb2965487e2cb839621f8c690ce30c7f55 -rcfc663ba43f203e8e268f5527c4fa298aa3b6cde --- Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision 0a5e20eb2965487e2cb839621f8c690ce30c7f55) +++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Properties/Resources.resx (.../Resources.resx) (revision cfc663ba43f203e8e268f5527c4fa298aa3b6cde) @@ -153,4 +153,11 @@ Veiligheidsoordeel is (deels) gebaseerd op handmatig ingevoerde toetsoordelen. Tijdens het exporteren worden handmatig ingevoerde toetsoordelen genegeerd. + + Inlezen van het hydraulische belastingen bestand. + + + {0} +Er is geen hydraulische belastingen database gekoppeld. + \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs =================================================================== diff -u -r7c60a75a8c4e1059ba6678277ea3249dd76f9788 -rcfc663ba43f203e8e268f5527c4fa298aa3b6cde --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision 7c60a75a8c4e1059ba6678277ea3249dd76f9788) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs (.../HydraulicBoundaryDatabaseImporterTest.cs) (revision cfc663ba43f203e8e268f5527c4fa298aa3b6cde) @@ -79,7 +79,7 @@ Action call = () => importSuccessful = importer.Import(); // Assert - string expectedMessage = $@"Fout bij het lezen van bestand '{path}': bestandspad mag niet verwijzen naar een lege bestandsnaam. " + string expectedMessage = $@"Fout bij het lezen van bestand '{path}': bestandspad mag niet verwijzen naar een lege bestandsnaam." + $"{Environment.NewLine}Er is geen hydraulische belastingen database gekoppeld."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importSuccessful); @@ -103,7 +103,7 @@ Action call = () => importSuccessful = importer.Import(); // Assert - string expectedMessage = $@"Fout bij het lezen van bestand '{path}': het bestand bestaat niet. " + string expectedMessage = $@"Fout bij het lezen van bestand '{path}': het bestand bestaat niet." + $"{Environment.NewLine}Er is geen hydraulische belastingen database gekoppeld."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsFalse(importSuccessful);