Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationService.cs
===================================================================
diff -u -r7d7a01ed91dd10bc4795528179b5f35e5f59f1bd -r3138d37a28dbf3a67ca33262e9ee404f082857c1
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationService.cs (.../DuneLocationCalculationService.cs) (revision 7d7a01ed91dd10bc4795528179b5f35e5f59f1bd)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationService.cs (.../DuneLocationCalculationService.cs) (revision 3138d37a28dbf3a67ca33262e9ee404f082857c1)
@@ -157,9 +157,9 @@
{
string lastErrorContent = calculator.LastErrorFileContent;
log.Error(string.IsNullOrEmpty(lastErrorContent)
- ? string.Format(Resources.DuneErosionBoundaryCalculationService_Calculate_Error_in_DuneErosionBoundaryCalculation_0_no_error_report,
+ ? string.Format(Resources.DuneLocationCalculationService_Calculate_Error_in_DuneLocationCalculation_0_no_error_report,
duneLocationName)
- : string.Format(Resources.DuneErosionBoundaryCalculationService_Calculate_Error_in_DuneErosionBoundaryCalculation_0_click_details_for_last_error_report_1,
+ : string.Format(Resources.DuneLocationCalculationService_Calculate_Error_in_DuneLocationCalculation_0_click_details_for_last_error_report_1,
duneLocationName, lastErrorContent));
exceptionThrown = true;
@@ -172,11 +172,11 @@
bool hasErrorOccurred = CalculationServiceHelper.HasErrorOccurred(canceled, exceptionThrown, lastErrorFileContent);
if (hasErrorOccurred)
{
- log.ErrorFormat(Resources.DuneErosionBoundaryCalculationService_Calculate_Error_in_DuneErosionBoundaryCalculation_0_click_details_for_last_error_report_1,
+ log.ErrorFormat(Resources.DuneLocationCalculationService_Calculate_Error_in_DuneLocationCalculation_0_click_details_for_last_error_report_1,
duneLocationName, lastErrorFileContent);
}
- log.InfoFormat(Resources.DuneErosionBoundaryCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0,
+ log.InfoFormat(Resources.DuneLocationCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0,
calculator.OutputDirectory);
CalculationServiceHelper.LogCalculationEnd();
@@ -214,7 +214,7 @@
if (converged != CalculationConvergence.CalculatedConverged)
{
- log.WarnFormat(Resources.DuneErosionBoundaryCalculationService_CreateDuneLocationOutput_Calculation_for_DuneLocation_0_not_converged, duneLocationName);
+ log.WarnFormat(Resources.DuneLocationCalculationService_CreateDuneLocationCalculationOutput_Calculation_for_DuneLocation_0_not_converged, duneLocationName);
}
return new DuneLocationCalculationOutput(converged,
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.Designer.cs
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r3138d37a28dbf3a67ca33262e9ee404f082857c1
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3138d37a28dbf3a67ca33262e9ee404f082857c1)
@@ -40,7 +40,7 @@
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
@@ -92,53 +92,53 @@
}
///
- /// Looks up a localized string similar to Hydraulische randvoorwaarden berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden..
+ /// Looks up a localized string similar to Locatie '{0}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. Deze locatie is niet toegevoegd aan de hydraulische randvoorwaarden voor toetsspoor duinen..
///
- internal static string DuneErosionBoundaryCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0 {
+ internal static string DuneErosionDataSynchronizationService_SetDuneLocations_Location_0_is_dune_location_but_name_is_not_according_format {
get {
- return ResourceManager.GetString("DuneErosionBoundaryCalculationService_Calculate_Calculation_temporary_directory_c" +
- "an_be_found_on_location_0", resourceCulture);
+ return ResourceManager.GetString("DuneErosionDataSynchronizationService_SetDuneLocations_Location_0_is_dune_locatio" +
+ "n_but_name_is_not_according_format", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Hydraulische randvoorwaarden berekening voor locatie '{0}' is mislukt. Bekijk het foutrapport door op details te klikken.
- ///{1}.
+ /// Looks up a localized string similar to Hydraulische randvoorwaarden berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden..
///
- internal static string DuneErosionBoundaryCalculationService_Calculate_Error_in_DuneErosionBoundaryCalculation_0_click_details_for_last_error_report_1 {
+ internal static string DuneLocationCalculationService_Calculate_Calculation_temporary_directory_can_be_found_on_location_0 {
get {
- return ResourceManager.GetString("DuneErosionBoundaryCalculationService_Calculate_Error_in_DuneErosionBoundaryCalcu" +
- "lation_0_click_details_for_last_error_report_1", resourceCulture);
+ return ResourceManager.GetString("DuneLocationCalculationService_Calculate_Calculation_temporary_directory_can_be_f" +
+ "ound_on_location_0", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Hydraulische randvoorwaarden berekening voor locatie '{0}' is mislukt. Er is geen foutrapport beschikbaar..
+ /// Looks up a localized string similar to Hydraulische randvoorwaarden berekening voor locatie '{0}' is mislukt. Bekijk het foutrapport door op details te klikken.
+ ///{1}.
///
- internal static string DuneErosionBoundaryCalculationService_Calculate_Error_in_DuneErosionBoundaryCalculation_0_no_error_report {
+ internal static string DuneLocationCalculationService_Calculate_Error_in_DuneLocationCalculation_0_click_details_for_last_error_report_1 {
get {
- return ResourceManager.GetString("DuneErosionBoundaryCalculationService_Calculate_Error_in_DuneErosionBoundaryCalcu" +
- "lation_0_no_error_report", resourceCulture);
+ return ResourceManager.GetString("DuneLocationCalculationService_Calculate_Error_in_DuneLocationCalculation_0_click" +
+ "_details_for_last_error_report_1", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Hydraulische randvoorwaarden berekening voor locatie '{0}' is niet geconvergeerd..
+ /// Looks up a localized string similar to Hydraulische randvoorwaarden berekening voor locatie '{0}' is mislukt. Er is geen foutrapport beschikbaar..
///
- internal static string DuneErosionBoundaryCalculationService_CreateDuneLocationOutput_Calculation_for_DuneLocation_0_not_converged {
+ internal static string DuneLocationCalculationService_Calculate_Error_in_DuneLocationCalculation_0_no_error_report {
get {
- return ResourceManager.GetString("DuneErosionBoundaryCalculationService_CreateDuneLocationOutput_Calculation_for_Du" +
- "neLocation_0_not_converged", resourceCulture);
+ return ResourceManager.GetString("DuneLocationCalculationService_Calculate_Error_in_DuneLocationCalculation_0_no_er" +
+ "ror_report", resourceCulture);
}
}
///
- /// Looks up a localized string similar to Locatie '{0}' moet voldoen aan het formaat 'Naam_Vaknummer_Metrering'. Deze locatie is niet toegevoegd aan de hydraulische randvoorwaarden voor toetsspoor duinen..
+ /// Looks up a localized string similar to Hydraulische randvoorwaarden berekening voor locatie '{0}' is niet geconvergeerd..
///
- internal static string DuneErosionDataSynchronizationService_SetDuneLocations_Location_0_is_dune_location_but_name_is_not_according_format {
+ internal static string DuneLocationCalculationService_CreateDuneLocationCalculationOutput_Calculation_for_DuneLocation_0_not_converged {
get {
- return ResourceManager.GetString("DuneErosionDataSynchronizationService_SetDuneLocations_Location_0_is_dune_locatio" +
- "n_but_name_is_not_according_format", resourceCulture);
+ return ResourceManager.GetString("DuneLocationCalculationService_CreateDuneLocationCalculationOutput_Calculation_fo" +
+ "r_DuneLocation_0_not_converged", resourceCulture);
}
}
}
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.resx
===================================================================
diff -u -r92210258706d0f57e05552037b676bd941a6fe19 -r3138d37a28dbf3a67ca33262e9ee404f082857c1
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.resx (.../Resources.resx) (revision 92210258706d0f57e05552037b676bd941a6fe19)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/Properties/Resources.resx (.../Resources.resx) (revision 3138d37a28dbf3a67ca33262e9ee404f082857c1)
@@ -117,17 +117,17 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
Hydraulische randvoorwaarden berekening is uitgevoerd op de tijdelijke locatie '{0}'. Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.
-
+
Hydraulische randvoorwaarden berekening voor locatie '{0}' is mislukt. Bekijk het foutrapport door op details te klikken.
{1}
-
+
Hydraulische randvoorwaarden berekening voor locatie '{0}' is mislukt. Er is geen foutrapport beschikbaar.
-
+
Hydraulische randvoorwaarden berekening voor locatie '{0}' is niet geconvergeerd.