Index: Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs =================================================================== diff -u -reff889238a2ecfab9aacabe9b99a35c6989006d9 -r23673a3afadbf542d649f724cb6557c1da742cf8 --- Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision eff889238a2ecfab9aacabe9b99a35c6989006d9) +++ Core/Common/src/Core.Common.Gui/Forms/ProgressDialog/ActivityProgressDialog.cs (.../ActivityProgressDialog.cs) (revision 23673a3afadbf542d649f724cb6557c1da742cf8) @@ -197,7 +197,7 @@ labelActivityProgressText.Text = !progressTextNullOrEmpty ? activity.ProgressText.Length <= maximumNumberOfProgressTextCharacters ? activity.ProgressText - : activity.ProgressText.Take(maximumNumberOfProgressTextCharacters) + "..." + : activity.ProgressText.Substring(0, maximumNumberOfProgressTextCharacters) + "..." : ""; }); } Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -ref1c61d94f2aec3b4ff32fcf03253d7ad386c8e5 -r23673a3afadbf542d649f724cb6557c1da742cf8 --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision ef1c61d94f2aec3b4ff32fcf03253d7ad386c8e5) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 23673a3afadbf542d649f724cb6557c1da742cf8) @@ -70,7 +70,7 @@ } /// - /// Looks up a localized string similar to Stap {0} van {1}. + /// Looks up a localized string similar to Taak {0} van {1}. /// public static string ActivityProgressDialog_OnShown_Executing_step_0_of_1 { get { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -ref1c61d94f2aec3b4ff32fcf03253d7ad386c8e5 -r23673a3afadbf542d649f724cb6557c1da742cf8 --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision ef1c61d94f2aec3b4ff32fcf03253d7ad386c8e5) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 23673a3afadbf542d649f724cb6557c1da742cf8) @@ -524,7 +524,7 @@ ..\Resources\Busy indicator.gif;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - Stap {0} van {1} + Taak {0} van {1} Huidige stap afronden, daarna annuleren... Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f -r23673a3afadbf542d649f724cb6557c1da742cf8 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 23673a3afadbf542d649f724cb6557c1da742cf8) @@ -61,8 +61,8 @@ } /// - /// Looks up a localized string similar to Weet u zeker dat u de referentielijn wilt vervangen? - ///Als u door gaat zullen alle vakindelingen, berekende hydrolische randvoorwaarden en berekeningsresultaten worden verwijderd.. + /// Looks up a localized string similar to Als u de referentielijn vervangt zullen alle vakindelingen, berekende hydraulische randvoorwaarden en berekeningsresultaten worden verwijderd. + ///Weet u zeker dat u wilt doorgaan?. /// internal static string ReferenceLineImporter_ConfirmImport_Confirm_referenceline_import_which_clears_data_when_performed { get { @@ -72,7 +72,7 @@ } /// - /// Looks up a localized string similar to Referentielijn vervangen?. + /// Looks up a localized string similar to Bevestigen. /// internal static string ReferenceLineImporter_ConfirmImport_DialogTitle { get { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f -r23673a3afadbf542d649f724cb6557c1da742cf8 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 925d8a1d7dec6ef95d89b2ff67d78c8d5a49387f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 23673a3afadbf542d649f724cb6557c1da742cf8) @@ -1,113 +1,132 @@  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 1.3 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + mimetype: application/x-microsoft.net.object.bytearray.base64 + value : The object must be serialized into a byte array + : using a System.ComponentModel.TypeConverter + : and then encoded with base64 encoding. + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + {0} Er is geen referentielijn geïmporteerd. - Referentielijn vervangen? + Bevestigen - Weet u zeker dat u de referentielijn wilt vervangen? -Als u door gaat zullen alle vakindelingen, berekende hydrolische randvoorwaarden en berekeningsresultaten worden verwijderd. + Als u de referentielijn vervangt zullen alle vakindelingen, berekende hydraulische randvoorwaarden en berekeningsresultaten worden verwijderd. +Weet u zeker dat u wilt doorgaan? Referentielijn importeren afgebroken. Geen data ingelezen. Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ReferenceLineImporterTest.cs =================================================================== diff -u -rb3d4bbd1f4cff028627bbf1591929a0b67bfccb9 -r23673a3afadbf542d649f724cb6557c1da742cf8 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision b3d4bbd1f4cff028627bbf1591929a0b67bfccb9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/ReferenceLineImporterTest.cs (.../ReferenceLineImporterTest.cs) (revision 23673a3afadbf542d649f724cb6557c1da742cf8) @@ -215,9 +215,9 @@ Assert.AreSame(originalReferenceLine, assessmentSection.ReferenceLine); Assert.AreSame(assessmentSection.ReferenceLine, referenceLineContext.WrappedData); - Assert.AreEqual("Referentielijn vervangen?", messageBoxTitle); - var expectedText = "Weet u zeker dat u de referentielijn wilt vervangen?" + Environment.NewLine + - "Als u door gaat zullen alle vakindelingen, berekende hydrolische randvoorwaarden en berekeningsresultaten worden verwijderd."; + Assert.AreEqual("Bevestigen", messageBoxTitle); + var expectedText = "Als u de referentielijn vervangt zullen alle vakindelingen, berekende hydraulische randvoorwaarden en berekeningsresultaten worden verwijderd." + Environment.NewLine + + "Weet u zeker dat u wilt doorgaan?"; Assert.AreEqual(expectedText, messageBoxText); mocks.VerifyAll(); @@ -290,9 +290,9 @@ Assert.AreEqual(198237.375, point2Ds[123].X, 1e-6); Assert.AreEqual(514879.781, point2Ds[123].Y, 1e-6); - Assert.AreEqual("Referentielijn vervangen?", messageBoxTitle); - var expectedText = "Weet u zeker dat u de referentielijn wilt vervangen?" + Environment.NewLine + - "Als u door gaat zullen alle vakindelingen, berekende hydrolische randvoorwaarden en berekeningsresultaten worden verwijderd."; + Assert.AreEqual("Bevestigen", messageBoxTitle); + var expectedText = "Als u de referentielijn vervangt zullen alle vakindelingen, berekende hydraulische randvoorwaarden en berekeningsresultaten worden verwijderd." + Environment.NewLine + + "Weet u zeker dat u wilt doorgaan?"; Assert.AreEqual(expectedText, messageBoxText); // TODO: Clear 'vakindelingen' on all failure mechanisms