Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs =================================================================== diff -u -r7570b93f301f4503b1c787ecdba215f41eda684a -r6fe344de0a63225913ee3feda5eac7b09b07a970 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 7570b93f301f4503b1c787ecdba215f41eda684a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 6fe344de0a63225913ee3feda5eac7b09b07a970) @@ -25,13 +25,13 @@ /// False if contains validation errors; True otherwise. public static bool Validate(PipingData pipingData) { - pipingDataLogger.Info(String.Format(Resources.Validation_Subject_0_Started_Time_1_, + pipingDataLogger.Info(String.Format(Resources.Validation_Subject_0_started_Time_1_, pipingData.Name, DateTimeService.CurrentTimeAsString)); var validationResults = new PipingCalculation(CreateInputFromData(pipingData)).Validate(); - LogMessagesAsError(Resources.ErrorInPipingValidation_0, validationResults.ToArray()); + LogMessagesAsError(Resources.Error_in_piping_validation_0, validationResults.ToArray()); - pipingDataLogger.Info(String.Format(Resources.Validation_Subject_0_Ended_Time_1_, + pipingDataLogger.Info(String.Format(Resources.Validation_Subject_0_ended_Time_1_, pipingData.Name, DateTimeService.CurrentTimeAsString)); return validationResults.Count == 0; @@ -46,7 +46,7 @@ /// Consider calling first to see if calculation is possible. public static void Calculate(PipingData pipingData) { - pipingDataLogger.Info(String.Format(Resources.Calculation_Subject_0_Started_Time_1_, + pipingDataLogger.Info(String.Format(Resources.Calculation_Subject_0_started_Time_1_, pipingData.Name, DateTimeService.CurrentTimeAsString)); try @@ -62,11 +62,11 @@ } catch (PipingCalculationException e) { - LogMessagesAsError(Resources.ErrorInPipingCalculation_0, e.Message); + LogMessagesAsError(Resources.Error_in_piping_calculation_0, e.Message); } finally { - pipingDataLogger.Info(String.Format(Resources.Calculation_Subject_0_Ended_Time_1_, + pipingDataLogger.Info(String.Format(Resources.Calculation_Subject_0_ended_Time_1_, pipingData.Name, DateTimeService.CurrentTimeAsString)); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r6fe344de0a63225913ee3feda5eac7b09b07a970 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6fe344de0a63225913ee3feda5eac7b09b07a970) @@ -63,54 +63,54 @@ /// /// Looks up a localized string similar to Berekening van '{0}' beëindigd om: {1}. /// - internal static string Calculation_Subject_0_Ended_Time_1_ { + internal static string Calculation_Subject_0_ended_Time_1_ { get { - return ResourceManager.GetString("Calculation_Subject_0_Ended_Time_1_", resourceCulture); + return ResourceManager.GetString("Calculation_Subject_0_ended_Time_1_", resourceCulture); } } /// /// Looks up a localized string similar to Berekening van '{0}' gestart om: {1}. /// - internal static string Calculation_Subject_0_Started_Time_1_ { + internal static string Calculation_Subject_0_started_Time_1_ { get { - return ResourceManager.GetString("Calculation_Subject_0_Started_Time_1_", resourceCulture); + return ResourceManager.GetString("Calculation_Subject_0_started_Time_1_", resourceCulture); } } /// /// Looks up a localized string similar to Piping berekening niet gelukt: {0}. /// - internal static string ErrorInPipingCalculation_0 { + internal static string Error_in_piping_calculation_0 { get { - return ResourceManager.GetString("ErrorInPipingCalculation_0", resourceCulture); + return ResourceManager.GetString("Error_in_piping_calculation_0", resourceCulture); } } /// /// Looks up a localized string similar to Validatie mislukt: {0}. /// - internal static string ErrorInPipingValidation_0 { + internal static string Error_in_piping_validation_0 { get { - return ResourceManager.GetString("ErrorInPipingValidation_0", resourceCulture); + return ResourceManager.GetString("Error_in_piping_validation_0", resourceCulture); } } /// /// Looks up a localized string similar to Validatie van '{0}' beëindigd om: {1}. /// - internal static string Validation_Subject_0_Ended_Time_1_ { + internal static string Validation_Subject_0_ended_Time_1_ { get { - return ResourceManager.GetString("Validation_Subject_0_Ended_Time_1_", resourceCulture); + return ResourceManager.GetString("Validation_Subject_0_ended_Time_1_", resourceCulture); } } /// /// Looks up a localized string similar to Validatie van '{0}' gestart om: {1}. /// - internal static string Validation_Subject_0_Started_Time_1_ { + internal static string Validation_Subject_0_started_Time_1_ { get { - return ResourceManager.GetString("Validation_Subject_0_Started_Time_1_", resourceCulture); + return ResourceManager.GetString("Validation_Subject_0_started_Time_1_", resourceCulture); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r6fe344de0a63225913ee3feda5eac7b09b07a970 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx (.../Resources.resx) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Properties/Resources.resx (.../Resources.resx) (revision 6fe344de0a63225913ee3feda5eac7b09b07a970) @@ -117,22 +117,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Berekening van '{0}' beëindigd om: {1} - + Berekening van '{0}' gestart om: {1} - + Piping berekening niet gelukt: {0} - + Validatie mislukt: {0} - + Validatie van '{0}' beëindigd om: {1} - + Validatie van '{0}' gestart om: {1} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiGuiPluginTest.cs =================================================================== diff -u -r5552de6bc97b4453d8624038df442dc15ecd5d70 -r6fe344de0a63225913ee3feda5eac7b09b07a970 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiGuiPluginTest.cs (.../WtiGuiPluginTest.cs) (revision 5552de6bc97b4453d8624038df442dc15ecd5d70) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/WtiGuiPluginTest.cs (.../WtiGuiPluginTest.cs) (revision 6fe344de0a63225913ee3feda5eac7b09b07a970) @@ -35,7 +35,7 @@ Assert.IsInstanceOf(wtiGuiPlugin); Assert.AreEqual(GuiPluginResources.Wti_application_gui_name, wtiGuiPlugin.Name); Assert.AreEqual(GuiPluginResources.WtiGuiPlugin_DisplayName, wtiGuiPlugin.DisplayName); - Assert.AreEqual(GuiPluginResources.WtiGuiPlugin_DisplayName, wtiGuiPlugin.Description); + Assert.AreEqual(GuiPluginResources.WtiGuiPlugin_Description, wtiGuiPlugin.Description); Assert.AreEqual("0.5.0.0", wtiGuiPlugin.Version); Assert.IsInstanceOf(wtiGuiPlugin.RibbonCommandHandler); }