Index: Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs =================================================================== diff -u -r5c6efff7898381b19025262256fca49528e03e3b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5c6efff7898381b19025262256fca49528e03e3b) +++ Core/Common/src/Core.Common.Base/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -61,6 +61,124 @@ } /// + /// Looks up a localized string similar to Activiteit is '{0}', Initialize() moet aangeroepen worden voor Execute(). + /// + internal static string Activity_Execute_Activity_is__0___Initialize___must_be_called_before_Execute__ { + get { + return ResourceManager.GetString("Activity_Execute_Activity_is__0___Initialize___must_be_called_before_Execute__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kan Execute() niet aanroepen voor activiteit met de '{0}' status.. + /// + internal static string Activity_Execute_Can_t_call_Execute___for_activity_in__0__state_ { + get { + return ResourceManager.GetString("Activity_Execute_Can_t_call_Execute___for_activity_in__0__state_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Activiteit geannuleerd {0}. + /// + internal static string ActivityRunner_Completed_Cancelled_activity__0_ { + get { + return ResourceManager.GetString("ActivityRunner_Completed_Cancelled_activity__0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Activiteit voltooid {0}. + /// + internal static string ActivityRunner_Completed_Finished_activity__0_ { + get { + return ResourceManager.GetString("ActivityRunner_Completed_Finished_activity__0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Enqueued activity {0}. + /// + internal static string ActivityRunner_Enqueue_Enqueued_activity__0_ { + get { + return ResourceManager.GetString("ActivityRunner_Enqueue_Enqueued_activity__0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Een fout is opgetreden tijdens het uitvoeren van een achtergrond activiteit:. + /// + internal static string ActivityRunner_OnTaskCompleted_An_error_occured_while_running_a_background_activity__ { + get { + return ResourceManager.GetString("ActivityRunner_OnTaskCompleted_An_error_occured_while_running_a_background_activi" + + "ty__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Een fout is opgetreden tijdens het uitvoeren van activiteit {0}:. + /// + internal static string ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity__0___ { + get { + return ResourceManager.GetString("ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity__0___", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Opschonen van {0} is mislukt.. + /// + internal static string ActivityRunner_RunActivity_Clean_up_of__0__has_failed_ { + get { + return ResourceManager.GetString("ActivityRunner_RunActivity_Clean_up_of__0__has_failed_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Uitvoering van {0} is geannuleerd.. + /// + internal static string ActivityRunner_RunActivity_Execution_of__0__has_been_canceled_ { + get { + return ResourceManager.GetString("ActivityRunner_RunActivity_Execution_of__0__has_been_canceled_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Uitvoering van {0} is mislukt.. + /// + internal static string ActivityRunner_RunActivity_Execution_of__0__has_failed_ { + get { + return ResourceManager.GetString("ActivityRunner_RunActivity_Execution_of__0__has_failed_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Afwerking van {0} is mislukt.. + /// + internal static string ActivityRunner_RunActivity_Finishing_of__0__has_failed_ { + get { + return ResourceManager.GetString("ActivityRunner_RunActivity_Finishing_of__0__has_failed_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Initialisatie van {0} is mislukt.. + /// + internal static string ActivityRunner_RunActivity_Initialization_of__0__has_failed_ { + get { + return ResourceManager.GetString("ActivityRunner_RunActivity_Initialization_of__0__has_failed_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} van {1}. + /// + internal static string FileImportActivity_ImportFromFile__0__of__1_ { + get { + return ResourceManager.GetString("FileImportActivity_ImportFromFile__0__of__1_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Alle plugins waren geactiveerd.. /// internal static string RingtoetsApplication_ActivatePlugins_All_plugins_were_activated_ { Index: Core/Common/src/Core.Common.Base/Properties/Resources.resx =================================================================== diff -u -r5c6efff7898381b19025262256fca49528e03e3b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision 5c6efff7898381b19025262256fca49528e03e3b) +++ Core/Common/src/Core.Common.Base/Properties/Resources.resx (.../Resources.resx) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -174,4 +174,43 @@ Registreren "importers"... + + Activiteit is '{0}', Initialize() moet aangeroepen worden voor Execute() + + + Kan Execute() niet aanroepen voor activiteit met de '{0}' status. + + + Activiteit geannuleerd {0} + + + Activiteit voltooid {0} + + + Een fout is opgetreden tijdens het uitvoeren van een achtergrond activiteit: + + + Een fout is opgetreden tijdens het uitvoeren van activiteit {0}: + + + Enqueued activity {0} + + + Initialisatie van {0} is mislukt. + + + Uitvoering van {0} is geannuleerd. + + + Uitvoering van {0} is mislukt. + + + Afwerking van {0} is mislukt. + + + Opschonen van {0} is mislukt. + + + {0} van {1} + \ No newline at end of file Index: Core/Common/src/Core.Common.Base/Workflow/Activity.cs =================================================================== diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Base/Workflow/Activity.cs (.../Activity.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755) +++ Core/Common/src/Core.Common.Base/Workflow/Activity.cs (.../Activity.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using Core.Common.Base.Properties; using Core.Common.Utils.Collections.Generic; using log4net; @@ -68,12 +69,12 @@ { if (Status == ActivityStatus.Finished || Status == ActivityStatus.Cancelled || Status == ActivityStatus.Failed || Status == ActivityStatus.None) { - throw new InvalidOperationException(string.Format("Activity is {0}, Initialize() must be called before Execute()", Status)); + throw new InvalidOperationException(string.Format(Resources.Activity_Execute_Activity_is__0___Initialize___must_be_called_before_Execute__, Status)); } if (Status != ActivityStatus.Executed && Status != ActivityStatus.Initialized) { - throw new InvalidOperationException(string.Format("Can't call Execute() for activity in {0} state.", Status)); + throw new InvalidOperationException(string.Format(Resources.Activity_Execute_Can_t_call_Execute___for_activity_in__0__state_, Status)); } try Index: Core/Common/src/Core.Common.Base/Workflow/ActivityRunner.cs =================================================================== diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Base/Workflow/ActivityRunner.cs (.../ActivityRunner.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755) +++ Core/Common/src/Core.Common.Base/Workflow/ActivityRunner.cs (.../ActivityRunner.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -3,6 +3,7 @@ using System.Diagnostics; using System.Linq; using System.Threading; +using Core.Common.Base.Properties; using Core.Common.Utils.Collections; using Core.Common.Utils.Collections.Generic; using log4net; @@ -138,8 +139,8 @@ var task = (AsyncActivityRunner) sender; Debug.WriteLine(task.Activity.Status == ActivityStatus.Cancelled - ? string.Format("Cancelled activity {0}", task.Activity.Name) - : string.Format("Finished activity {0}", task.Activity.Name)); + ? string.Format(Resources.ActivityRunner_Completed_Cancelled_activity__0_, task.Activity.Name) + : string.Format(Resources.ActivityRunner_Completed_Finished_activity__0_, task.Activity.Name)); try { @@ -189,8 +190,8 @@ if (!sender.CompletedSuccesfully) { log.Error(String.IsNullOrEmpty(sender.Activity.Name) - ? "An error occured while running a background activity: " - : String.Format("An error occured while running activity {0}: ", sender.Activity.Name), sender.Exception); + ? Resources.ActivityRunner_OnTaskCompleted_An_error_occured_while_running_a_background_activity__ + : String.Format(Resources.ActivityRunner_OnTaskCompleted_An_error_occured_while_running_activity__0___, sender.Activity.Name), sender.Exception); } if (ActivityCompleted != null) @@ -243,7 +244,7 @@ activities.Add(activity); } - Debug.WriteLine(string.Format("Enqueued activity {0}", activity.Name)); + Debug.WriteLine(string.Format(Resources.ActivityRunner_Enqueue_Enqueued_activity__0_, activity.Name)); //TODO: it might already be running so running would not be changed. //fix and review @@ -258,14 +259,14 @@ if (activity.Status == ActivityStatus.Failed) { - throw new Exception(string.Format("Initialization of {0} has failed.", activity.Name)); + throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Initialization_of__0__has_failed_, activity.Name)); } while (activity.Status != ActivityStatus.Done) { if (activity.Status == ActivityStatus.Cancelled) { - log.WarnFormat("Execution of {0} has been canceled.", activity.Name); + log.WarnFormat(Resources.ActivityRunner_RunActivity_Execution_of__0__has_been_canceled_, activity.Name); break; } @@ -276,7 +277,7 @@ if (activity.Status == ActivityStatus.Failed) { - throw new Exception(string.Format("Execution of {0} has failed.", activity.Name)); + throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Execution_of__0__has_failed_, activity.Name)); } } @@ -286,15 +287,15 @@ if (activity.Status == ActivityStatus.Failed) { - throw new Exception(string.Format("Finishing of {0} has failed.", activity.Name)); + throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Finishing_of__0__has_failed_, activity.Name)); } } activity.Cleanup(); if (activity.Status == ActivityStatus.Failed) { - throw new Exception(string.Format("Clean up of {0} has failed.", activity.Name)); + throw new Exception(string.Format(Resources.ActivityRunner_RunActivity_Clean_up_of__0__has_failed_, activity.Name)); } } catch (Exception exception) @@ -313,7 +314,7 @@ } catch (Exception) { - log.ErrorFormat("Clean up of {0} has failed.", activity.Name); + log.ErrorFormat(Resources.ActivityRunner_RunActivity_Clean_up_of__0__has_failed_, activity.Name); } } } Index: Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs =================================================================== diff -u -r8546b20b128723309b8b663858f32b7e399f75d8 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs (.../FileImportActivity.cs) (revision 8546b20b128723309b8b663858f32b7e399f75d8) +++ Core/Common/src/Core.Common.Base/Workflow/FileImportActivity.cs (.../FileImportActivity.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -1,3 +1,5 @@ +using Core.Common.Base.Properties; + namespace Core.Common.Base.Workflow { public class FileImportActivity : Activity @@ -98,7 +100,7 @@ importer.ProgressChanged = (currentStepName, currentStep, totalSteps) => { Name = importer.Name + " - " + currentStepName; - progressText = string.Format("{0} of {1}", currentStep, totalSteps); + progressText = string.Format(Resources.FileImportActivity_ImportFromFile__0__of__1_, currentStep, totalSteps); SetProgressText(progressText); }; Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs =================================================================== diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Chart.cs (.../Chart.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -254,7 +254,7 @@ Series.OfType().Any(cs => cs.UseHatch); if (hatchStyleIgnored) { - log.WarnFormat("Hatch style is not supported for exports and will be ignored."); + log.WarnFormat(Resources.Chart_ExportAsImage_Hatch_style_is_not_supported_for_exports_and_will_be_ignored_); } chart.Export.Image.SVG.Save(filename); @@ -323,7 +323,7 @@ case ".bmp": return ImageFormat.Bmp; default: - throw new ArgumentException(string.Format("Extension ({0}) not supported", ext), "filename"); + throw new ArgumentException(string.Format(Resources.Chart_GetImageFormatByExtension_Extension___0___not_supported, ext), "filename"); } } @@ -355,7 +355,7 @@ format = chart.Export.Image.EPS; break; default: - throw new ArgumentException(string.Format("Extension ({0}) not supported", ext), "filename"); + throw new ArgumentException(string.Format(Resources.Chart_GetImageFormatByExtension_Extension___0___not_supported, ext), "filename"); } return format; } Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Series/ChartSeries.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Charting/Series/ChartSeries.cs (.../ChartSeries.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Series/ChartSeries.cs (.../ChartSeries.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Drawing; using System.Windows.Forms; +using Core.Common.Controls.Swf.Properties; using Steema.TeeChart.Drawing; using Steema.TeeChart.Styles; @@ -91,7 +92,7 @@ } catch (InvalidCastException ex) { - throw new ArgumentException("Invalid argument for series datasource. Are you passing IEnumerable? IList and IListSource are supported", ex); + throw new ArgumentException(Resources.ChartSeries_DataSource_Invalid_argument_for_series_datasource__Are_you_passing_IEnumerable__IList_and_IListSource_are_supported, ex); } } } @@ -397,7 +398,7 @@ if (!yIsNumeric) { - throw new NotSupportedException(String.Format("Input format not supported, y must be numeric but is of type: {0}.", y.GetType())); + throw new NotSupportedException(String.Format(Resources.ChartSeries_Add_Input_format_not_supported__y_must_be_numeric_but_is_of_type___0__, y.GetType())); } double yValue = Convert.ToDouble(y); Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ChartViewSeriesToolBase.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ChartViewSeriesToolBase.cs (.../ChartViewSeriesToolBase.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/ChartViewSeriesToolBase.cs (.../ChartViewSeriesToolBase.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -3,6 +3,7 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Controls.Swf.Charting.Series; +using Core.Common.Controls.Swf.Properties; using Steema.TeeChart; using Steema.TeeChart.Styles; using Steema.TeeChart.Tools; @@ -136,7 +137,7 @@ { if (iSeries != null && iSeries != value) { - throw new ArgumentException(String.Format("This tool only accepts {0} as series", iSeries)); + throw new ArgumentException(String.Format(Resources.ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts__0__as_series, iSeries)); } lastSelectedSeries = value; } Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/EditPointTool.cs =================================================================== diff -u -rf1c02b2d47dc561deec70a24128d8dd49d9bed6a -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/EditPointTool.cs (.../EditPointTool.cs) (revision f1c02b2d47dc561deec70a24128d8dd49d9bed6a) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/EditPointTool.cs (.../EditPointTool.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -5,6 +5,7 @@ using System.Windows.Forms; using Core.Common.Controls.Swf.Charting.Customized; using Core.Common.Controls.Swf.Charting.Series; +using Core.Common.Controls.Swf.Properties; using Core.Common.Utils; using log4net; using Steema.TeeChart.Styles; @@ -344,7 +345,7 @@ case DragStyle.Y: return Cursors.SizeNS; default: - throw new NotImplementedException(String.Format("No cursor assigned for {0}", dragStyle)); + throw new NotImplementedException(String.Format(Resources.EditPointTool_GetCursorIcon_No_cursor_assigned_for__0_, dragStyle)); } } Index: Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/RulerTool.cs =================================================================== diff -u -rf1c02b2d47dc561deec70a24128d8dd49d9bed6a -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/RulerTool.cs (.../RulerTool.cs) (revision f1c02b2d47dc561deec70a24128d8dd49d9bed6a) +++ Core/Common/src/Core.Common.Controls.Swf/Charting/Tools/RulerTool.cs (.../RulerTool.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -5,6 +5,7 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Controls.Swf.Charting.Customized; +using Core.Common.Controls.Swf.Properties; using log4net; using Steema.TeeChart.Drawing; @@ -187,13 +188,12 @@ private string GetDefaultDifferenceString(object dx, object dy) { var dxText = dx is TimeSpan - ? ((TimeSpan) dx).TotalSeconds.ToString("0.##", CultureInfo.InvariantCulture) + " seconds" + ? ((TimeSpan) dx).TotalSeconds.ToString("0.##", CultureInfo.InvariantCulture) + Resources.RulerTool_GetDefaultDifferenceString__seconds : ((double) dx).ToString("0.##", CultureInfo.InvariantCulture); var dyText = dy is TimeSpan - ? ((TimeSpan) dy).TotalSeconds.ToString("0.##", CultureInfo.InvariantCulture) + " seconds" + ? ((TimeSpan) dy).TotalSeconds.ToString("0.##", CultureInfo.InvariantCulture) + Resources.RulerTool_GetDefaultDifferenceString__seconds : ((double) dy).ToString("0.##", CultureInfo.InvariantCulture); - return string.Format("Difference:" + Environment.NewLine + " horizontal: {0}" + Environment.NewLine + - " vertical: {1}", dxText, dyText); + return string.Format(Resources.RulerTool_GetDefaultDifferenceString_Difference__2___horizontal___0__2___vertical___1_, dxText, dyText, Environment.NewLine); } private object GetAxesValue(double minValue, double maxValue, int minPixel, int maxPixel, int pixel) Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs =================================================================== diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845) +++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -98,6 +98,54 @@ } /// + /// Looks up a localized string similar to Hatch stijl wordt niet ondersteund voor exporteren en zal genegeerd worden.. + /// + internal static string Chart_ExportAsImage_Hatch_style_is_not_supported_for_exports_and_will_be_ignored_ { + get { + return ResourceManager.GetString("Chart_ExportAsImage_Hatch_style_is_not_supported_for_exports_and_will_be_ignored_" + + "", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Extensie ({0}) wordt niet ondersteund. + /// + internal static string Chart_GetImageFormatByExtension_Extension___0___not_supported { + get { + return ResourceManager.GetString("Chart_GetImageFormatByExtension_Extension___0___not_supported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Invoerformaat wordt niet ondersteund. Y moet numeriek zijn maar is van type: {0}.. + /// + internal static string ChartSeries_Add_Input_format_not_supported__y_must_be_numeric_but_is_of_type___0__ { + get { + return ResourceManager.GetString("ChartSeries_Add_Input_format_not_supported__y_must_be_numeric_but_is_of_type___0_" + + "_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Ongeldig argument for databron van series. Biedt u een IEnumerable aan? IList en IListSource worden ondersteund. + /// + internal static string ChartSeries_DataSource_Invalid_argument_for_series_datasource__Are_you_passing_IEnumerable__IList_and_IListSource_are_supported { + get { + return ResourceManager.GetString("ChartSeries_DataSource_Invalid_argument_for_series_datasource__Are_you_passing_IE" + + "numerable__IList_and_IListSource_are_supported", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Dit programma accepteert alleen {0} als series. + /// + internal static string ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts__0__as_series { + get { + return ResourceManager.GetString("ChartViewSeriesToolBase_LastSelectedSeries_This_tool_only_accepts__0__as_series", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap computer { @@ -188,6 +236,15 @@ } /// + /// Looks up a localized string similar to Geen cursor toegewezen aan {0}. + /// + internal static string EditPointTool_GetCursorIcon_No_cursor_assigned_for__0_ { + get { + return ResourceManager.GetString("EditPointTool_GetCursorIcon_No_cursor_assigned_for__0_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Exporteer als afbeelding. /// internal static string ExportImageHelper_ExportWithDialog_Export_as_image { @@ -276,6 +333,25 @@ } /// + /// Looks up a localized string similar to seconden. + /// + internal static string RulerTool_GetDefaultDifferenceString__seconds { + get { + return ResourceManager.GetString("RulerTool_GetDefaultDifferenceString__seconds", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Verschil: {2} horizontaal: {0} {2} verticaal: {1}. + /// + internal static string RulerTool_GetDefaultDifferenceString_Difference__2___horizontal___0__2___vertical___1_ { + get { + return ResourceManager.GetString("RulerTool_GetDefaultDifferenceString_Difference__2___horizontal___0__2___vertical" + + "___1_", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap table_edit { @@ -286,6 +362,15 @@ } /// + /// Looks up a localized string similar to Ongebonden kolommen van type {0} worden niet ondersteund.. + /// + internal static string TableView_AddUnboundColumn_Unbound_columns_of_type__0__not_supported_ { + get { + return ResourceManager.GetString("TableView_AddUnboundColumn_Unbound_columns_of_type__0__not_supported_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Kopiëren. /// internal static string TableView_ConfigureContextMenu_Copy { @@ -313,6 +398,25 @@ } /// + /// Looks up a localized string similar to Waarde wordt gewijzigd {0}. + /// + internal static string TableView_DxGridViewCellValueChanging_Value_Changing__0_ { + get { + return ResourceManager.GetString("TableView_DxGridViewCellValueChanging_Value_Changing__0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Actie {0} wordt niet ondersteund door de TableView. + /// + internal static string TableView_SelectedCellsCollectionChanged_Action__0__is_not_supported_by_the_TableView { + get { + return ResourceManager.GetString("TableView_SelectedCellsCollectionChanged_Action__0__is_not_supported_by_the_Table" + + "View", resourceCulture); + } + } + + /// /// Looks up a localized string similar to nieuwe Tabel. /// internal static string TableView_TableView_new_Table { @@ -322,6 +426,15 @@ } /// + /// Looks up a localized string similar to Ongeldige rijnummer {0}. + /// + internal static string TableViewPasteController_PasteValuesCore_Invalid_row_number__0_ { + get { + return ResourceManager.GetString("TableViewPasteController_PasteValuesCore_Invalid_row_number__0_", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// internal static System.Drawing.Bitmap tick { @@ -330,5 +443,24 @@ return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Looks up a localized string similar to Weet u zeker dat u het volgende item wilt verwijderen: {0}. + /// + internal static string TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item___0_ { + get { + return ResourceManager.GetString("TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item___0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kan INodePresenter voor {0} niet vinden, zorg ervoor dat u het aan de Presenters verzameling voor een TreeView hebt toegevoegd. + /// + internal static string TreeViewController_UpdateNode_Can_t_find_INodePresenter_for__0___make_sure_you_added_it_to_Presenters_collection_of_a_TreeView { + get { + return ResourceManager.GetString("TreeViewController_UpdateNode_Can_t_find_INodePresenter_for__0___make_sure_you_ad" + + "ded_it_to_Presenters_collection_of_a_TreeView", resourceCulture); + } + } } } Index: Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx =================================================================== diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx (.../Resources.resx) (revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845) +++ Core/Common/src/Core.Common.Controls.Swf/Properties/Resources.resx (.../Resources.resx) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -202,4 +202,46 @@ Verwijderen + + Hatch stijl wordt niet ondersteund voor exporteren en zal genegeerd worden. + + + Extensie ({0}) wordt niet ondersteund + + + Invoerformaat wordt niet ondersteund. Y moet numeriek zijn maar is van type: {0}. + + + Ongeldig argument for databron van series. Biedt u een IEnumerable aan? IList en IListSource worden ondersteund + + + Dit programma accepteert alleen {0} als series + + + Geen cursor toegewezen aan {0} + + + Verschil: {2} horizontaal: {0} {2} verticaal: {1} + + + seconden + + + Actie {0} wordt niet ondersteund door de TableView + + + Ongebonden kolommen van type {0} worden niet ondersteund. + + + Waarde wordt gewijzigd {0} + + + Ongeldige rijnummer {0} + + + Weet u zeker dat u het volgende item wilt verwijderen: {0} + + + Kan INodePresenter voor {0} niet vinden, zorg ervoor dat u het aan de Presenters verzameling voor een TreeView hebt toegevoegd + \ No newline at end of file Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs =================================================================== diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs (.../TableView.cs) (revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845) +++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs (.../TableView.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -414,7 +414,7 @@ dxGridView.UnselectCell(cell.RowIndex, gridColumn); break; default: - throw new NotSupportedException(string.Format("Action {0} is not supported by the TableView", e.Action)); + throw new NotSupportedException(string.Format(Resources.TableView_SelectedCellsCollectionChanged_Action__0__is_not_supported_by_the_TableView, e.Action)); } } @@ -1321,7 +1321,7 @@ /// [Browsable(false)] [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)] - public Func> InputValidator { get; set; } + public Func> InputValidator { get; set; } /// /// Gets or sets the function that checks if the current selection can be deleted. @@ -1858,7 +1858,7 @@ } else { - throw new ArgumentException(string.Format("Unbound columns of type {0} not supported.", columnType)); + throw new ArgumentException(string.Format(Resources.TableView_AddUnboundColumn_Unbound_columns_of_type__0__not_supported_, columnType)); } if (editor != null) { @@ -2073,7 +2073,7 @@ private void DxGridViewCellValueChanging(object sender, CellValueChangedEventArgs e) { - Trace.WriteLine(string.Format("Value Changing {0}", e.Value)); + Trace.WriteLine(string.Format(Resources.TableView_DxGridViewCellValueChanging_Value_Changing__0_, e.Value)); } private void DxGridViewCustomDrawRowIndicator(object sender, RowIndicatorCustomDrawEventArgs e) Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableViewPasteController.cs =================================================================== diff -u -r22469012664426d8196f8cd350cde57a8a50bc70 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Table/TableViewPasteController.cs (.../TableViewPasteController.cs) (revision 22469012664426d8196f8cd350cde57a8a50bc70) +++ Core/Common/src/Core.Common.Controls.Swf/Table/TableViewPasteController.cs (.../TableViewPasteController.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using Core.Common.Controls.Swf.Properties; using Core.Common.Utils; using log4net; @@ -388,7 +389,7 @@ var startColumnIndex = targetSelection.Left; if (startRowIndex < 0) { - throw new ArgumentException(string.Format("Invalid row number {0}", startRowIndex), + throw new ArgumentException(string.Format(Resources.TableViewPasteController_PasteValuesCore_Invalid_row_number__0_, startRowIndex), "targetSelection"); } Index: Core/Common/src/Core.Common.Controls.Swf/Table/Validation/TableViewValidator.cs =================================================================== diff -u -rdd1a980616ea0f7eaf5593353dc8012a09f4c8c1 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/Table/Validation/TableViewValidator.cs (.../TableViewValidator.cs) (revision dd1a980616ea0f7eaf5593353dc8012a09f4c8c1) +++ Core/Common/src/Core.Common.Controls.Swf/Table/Validation/TableViewValidator.cs (.../TableViewValidator.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -58,9 +58,9 @@ if (tableView.InputValidator != null) { var result = tableView.InputValidator(cell, newValue); - if (!result.Second) + if (!result.Item2) { - error = "Validation of cell failed: " + result.First; + error = "Validation of cell failed: " + result.Item1; return false; } } Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs (.../TreeView.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeView.cs (.../TreeView.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -7,6 +7,7 @@ using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; +using Core.Common.Controls.Swf.Properties; using log4net; using ValidationAspects; @@ -299,7 +300,7 @@ return; } - var message = string.Format("Are you sure you want to delete the following item: {0}", SelectedNode.Text); + var message = string.Format(Resources.TreeView_DeleteNodeData_Are_you_sure_you_want_to_delete_the_following_item___0_, SelectedNode.Text); if (MessageBox.Show(message, "Confirm", MessageBoxButtons.OKCancel) != DialogResult.OK) { return; Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs (.../TreeViewController.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/TreeViewController.cs (.../TreeViewController.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Windows.Forms; +using Core.Common.Controls.Swf.Properties; using Core.Common.Utils.Collections; using Core.Common.Utils.Collections.Generic; using log4net; @@ -438,8 +439,7 @@ if (presenter == null) { - var message = String.Format("Can't find INodePresenter for {0}, " + - "make sure you added it to Presenters collection of a TreeView", nodeData); + var message = String.Format(Resources.TreeViewController_UpdateNode_Can_t_find_INodePresenter_for__0___make_sure_you_added_it_to_Presenters_collection_of_a_TreeView, nodeData); throw new ArgumentNullException(message); } Index: Core/Common/src/Core.Common.Controls/ITableView.cs =================================================================== diff -u -r22469012664426d8196f8cd350cde57a8a50bc70 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Controls/ITableView.cs (.../ITableView.cs) (revision 22469012664426d8196f8cd350cde57a8a50bc70) +++ Core/Common/src/Core.Common.Controls/ITableView.cs (.../ITableView.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -116,7 +116,7 @@ /// IList SelectedCells { get; } - Func> InputValidator { get; set; } + Func> InputValidator { get; set; } /// /// Gets or sets the row values validator. The validator should return a RowValidationResult Index: Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.Designer.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -1,14 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.17929 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ namespace Core.Common.Gui.Swf.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -216,5 +219,14 @@ return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Looks up a localized string similar to ({0} meer problemen...). + /// + internal static string ValidationReportControl_AddReport___0__more_issues____ { + get { + return ResourceManager.GetString("ValidationReportControl_AddReport___0__more_issues____", resourceCulture); + } + } } } Index: Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.resx =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.resx (.../Resources.resx) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Gui.Swf/Properties/Resources.resx (.../Resources.resx) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -166,4 +166,7 @@ ..\Resources\restart_empty.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ({0} meer problemen...) + \ No newline at end of file Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs =================================================================== diff -u -r125002b7df54bc7ec7190146cd9b23458999c60e -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs (.../ValidationReportControl.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) +++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs (.../ValidationReportControl.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -185,7 +185,7 @@ { AddIssues(categoryNode.Nodes, issues.Take(2)); - var additionalIssuesNode = new TreeNode(String.Format("({0} more issues...)", issueCount - 2)); + var additionalIssuesNode = new TreeNode(String.Format(Resources.ValidationReportControl_AddReport___0__more_issues____, issueCount - 2)); AddIssues(additionalIssuesNode.Nodes, issues.Skip(2)); additionalIssuesNode.Collapse(); categoryNode.Nodes.Add(additionalIssuesNode); Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs =================================================================== diff -u -r433c616fe5bea47bcc0645eb61991623530e337e -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 433c616fe5bea47bcc0645eb61991623530e337e) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18063 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -1275,7 +1275,7 @@ } /// - /// Looks up a localized string similar to Loading project from selected file.. + /// Looks up a localized string similar to Loading Ringtoets project from selected file.. /// public static string Loading_project_from_selected_file { get { @@ -1569,7 +1569,7 @@ } /// - /// Looks up a localized string similar to Openen van bestaand project.. + /// Looks up a localized string similar to Openen van bestaand Ringtoets project.. /// public static string Opening_existing_project { get { @@ -1578,7 +1578,7 @@ } /// - /// Looks up a localized string similar to Openen van bestaand project geannuleerd.. + /// Looks up a localized string similar to Openen van bestaand Ringtoets project geannuleerd.. /// public static string Opening_existing_project_cancelled { get { @@ -1587,7 +1587,7 @@ } /// - /// Looks up a localized string similar to Openen van nieuw project.. + /// Looks up a localized string similar to Openen van nieuw Ringtoets project.. /// public static string Opening_new_project { get { @@ -1596,7 +1596,7 @@ } /// - /// Looks up a localized string similar to Openen van nieuw project geannuleerd.. + /// Looks up a localized string similar to Openen van nieuw Ringtoets project geannuleerd.. /// public static string Opening_new_project_cancelled { get { @@ -1635,6 +1635,24 @@ } /// + /// Looks up a localized string similar to Kan node uit boom van type {0} niet hernoemen.. + /// + public static string PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__ { + get { + return ResourceManager.GetString("PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kan node uit boom van type {0} niet verwijderen.. + /// + public static string PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__ { + get { + return ResourceManager.GetString("PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__", resourceCulture); + } + } + + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// public static System.Drawing.Bitmap PlayAll { @@ -1997,7 +2015,7 @@ } /// - /// Looks up a localized string similar to project files (.rtx)|*.rtx. + /// Looks up a localized string similar to Ringtoets project files (.rtx)|*.rtx. /// public static string Ringtoets_project_file_filter { get { Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx =================================================================== diff -u -r433c616fe5bea47bcc0645eb61991623530e337e -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision 433c616fe5bea47bcc0645eb61991623530e337e) +++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx (.../Resources.resx) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -872,4 +872,10 @@ Versie + + Kan node uit boom van type {0} niet hernoemen. + + + Kan node uit boom van type {0} niet verwijderen. + \ No newline at end of file Index: Core/Common/src/Core.Common.Utils/Aop/InvokeRequiredAttribute.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/Aop/InvokeRequiredAttribute.cs (.../InvokeRequiredAttribute.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/Aop/InvokeRequiredAttribute.cs (.../InvokeRequiredAttribute.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -2,6 +2,7 @@ using System.ComponentModel; using System.Runtime.Remoting.Contexts; using System.Threading; +using Core.Common.Utils.Properties; using log4net; using PostSharp.Aspects; @@ -66,7 +67,7 @@ private static void LogInvokeError(string methodName, Exception e, bool beforeCall) { - log.Error(string.Format("Thread synchronization error (call {1}): {0}", methodName, + log.Error(string.Format(Resource.InvokeRequiredAttribute_LogInvokeError_Thread_synchronization_error__call__1_____0_, methodName, beforeCall ? "skipping" : "aborted"), e); } Index: Core/Common/src/Core.Common.Utils/ComponentModel/DynamicReadOnlyAttribute.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/ComponentModel/DynamicReadOnlyAttribute.cs (.../DynamicReadOnlyAttribute.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/ComponentModel/DynamicReadOnlyAttribute.cs (.../DynamicReadOnlyAttribute.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Reflection; +using Core.Common.Utils.Properties; namespace Core.Common.Utils.ComponentModel { @@ -22,7 +23,7 @@ var propertyInfo = obj.GetType().GetProperty(propertyName); if (propertyInfo == null) { - throw new MissingMemberException(string.Format("Could not find property {0} on type {1}", propertyName, + throw new MissingMemberException(string.Format(Resource.DynamicReadOnlyAttribute_IsDynamicReadOnly_Could_not_find_property__0__on_type__1_, propertyName, obj.GetType())); } @@ -37,7 +38,7 @@ if (validationMethod == null) { throw new MissingMethodException( - String.Format("{0} uses DynanamicReadOnlyAttribute but does not have method marked using DynamicReadOnlyValidationMethodAttribute", obj)); + String.Format(Resource.DynamicReadOnlyAttribute_IsDynamicReadOnly__0__uses_DynanamicReadOnlyAttribute_but_does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute, obj)); } var shouldBeReadOnly = (bool) validationMethod.Invoke(obj, new[] @@ -60,30 +61,30 @@ if (!validationMethods.Any()) { - throw new MissingMethodException("DynamicReadOnlyValidationMethod not found (or not public), class: " + type); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_not_found__or_not_public___class___0_, type)); } if (validationMethods.Count() > 1) { - throw new MissingMethodException("Only one DynamicReadOnlyValidationMethod is allowed per class: " + type); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_Only_one_DynamicReadOnlyValidationMethod_is_allowed_per_class___0_, type)); } var validationMethod = validationMethods.First(); // check return type and arguments if (validationMethod.ReturnType != typeof(bool)) { - throw new MissingMethodException("DynamicReadOnlyValidationMethod must use bool as a return type, class: " + type); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_must_use_bool_as_a_return_type__class___0_, type)); } if (validationMethod.GetParameters().Length != 1) { - throw new MissingMethodException("DynamicReadOnlyValidationMethod has incorrect number of arguments, should be 1 of type string, class: " + type); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_number_of_arguments__should_be_1_of_type_string__class___0_, type)); } if (validationMethod.GetParameters()[0].ParameterType != typeof(string)) { - throw new MissingMethodException("DynamicReadOnlyValidationMethod has incorrect argument type, should be of type string, class: " + type); + throw new MissingMethodException(string.Format(Resource.DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_argument_type__should_be_of_type_string__class___0_, type)); } return validationMethod; Index: Core/Common/src/Core.Common.Utils/ComponentModel/DynamicVisibleAttribute.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/ComponentModel/DynamicVisibleAttribute.cs (.../DynamicVisibleAttribute.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/ComponentModel/DynamicVisibleAttribute.cs (.../DynamicVisibleAttribute.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -1,6 +1,7 @@ using System; using System.Linq; using System.Reflection; +using Core.Common.Utils.Properties; namespace Core.Common.Utils.ComponentModel { @@ -23,7 +24,7 @@ var propertyInfo = obj.GetType().GetProperty(propertyName); if (propertyInfo == null) { - throw new MissingMemberException(string.Format("Could not find property {0} on type {1}", propertyName, + throw new MissingMemberException(string.Format(Resource.DynamicVisibleAttribute_IsDynamicVisible_Could_not_find_property__0__on_type__1_, propertyName, obj.GetType())); } @@ -38,7 +39,7 @@ if (validationMethod == null) { throw new MissingMethodException( - String.Format("{0} uses DynamicVisibleAttribute but does not have method marked using DynamicVisibleValidationMethodAttribute", obj)); + String.Format(Resource.DynamicVisibleAttribute_IsDynamicVisible__0__uses_DynamicVisibleAttribute_but_does_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute, obj)); } return (bool) validationMethod.Invoke(obj, new[] Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj =================================================================== diff -u -r79b1cdcf9dcdbe4c015f5fc6b42605a00386b120 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj (.../Core.Common.Utils.csproj) (revision 79b1cdcf9dcdbe4c015f5fc6b42605a00386b120) +++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj (.../Core.Common.Utils.csproj) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -182,7 +182,6 @@ - Index: Core/Common/src/Core.Common.Utils/IO/FileUtils.cs =================================================================== diff -u -r125002b7df54bc7ec7190146cd9b23458999c60e -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/IO/FileUtils.cs (.../FileUtils.cs) (revision 125002b7df54bc7ec7190146cd9b23458999c60e) +++ Core/Common/src/Core.Common.Utils/IO/FileUtils.cs (.../FileUtils.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -404,10 +404,6 @@ /// public static bool FileMatchesFileFilterByExtension(string fileFilter, string path) { - /* if (!fileFilterRegex.Match(fileFilter).Success) - { - throw new ArgumentException(string.Format("Invalid filefilter: {0}", fileFilter)); - }*/ if (String.IsNullOrEmpty(Path.GetExtension(path))) { return false; Index: Core/Common/src/Core.Common.Utils/Interop/NativeLibrary.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/Interop/NativeLibrary.cs (.../NativeLibrary.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/Interop/NativeLibrary.cs (.../NativeLibrary.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -3,6 +3,7 @@ using System.IO; using System.Runtime.InteropServices; using System.Text; +using Core.Common.Utils.Properties; namespace Core.Common.Utils.Interop { @@ -68,7 +69,7 @@ var error = Marshal.GetLastWin32Error(); var exception = new Win32Exception(error); throw new FileNotFoundException( - string.Format("Could not find / load {3}.{2}Error: {4} - {0}{2}File: {5}\\{1}", + string.Format(Resource.NativeLibrary_LoadNativeDll_Could_not_find___load__3___2_Error___4_____0__2_File___5___1_, exception.Message, dllFileName, Environment.NewLine, dllFileName, error, directory)); } } Index: Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs =================================================================== diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs (.../Resource.Designer.cs) (revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845) +++ Core/Common/src/Core.Common.Utils/Properties/Resource.Designer.cs (.../Resource.Designer.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -61,6 +61,96 @@ } /// + /// Looks up a localized string similar to Argument van DynamicReadOnlyValidationMethod heeft een incorrect type. Zou van het type string moeten zijn. Klasse: {0}. + /// + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_argument_type__should_be_of_type_string__class___0_ { + get { + return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValida" + + "tionMethod_has_incorrect_argument_type__should_be_of_type_string__class___0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DynamicReadOnlyValidationMethod heeft een incorrecte aantal argumenten. Zou er één moeten zijn. Klasse: {0}. + /// + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_has_incorrect_number_of_arguments__should_be_1_of_type_string__class___0_ { + get { + return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValida" + + "tionMethod_has_incorrect_number_of_arguments__should_be_1_of_type_string__class_" + + "__0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DynamicReadOnlyValidationMethod moet 'bool' als 'return type' hebben. Klasse: {0}. + /// + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_must_use_bool_as_a_return_type__class___0_ { + get { + return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValida" + + "tionMethod_must_use_bool_as_a_return_type__class___0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to DynamicReadOnlyValidationMethod niet gevonden (of geen 'public' toegankelijkheid). Klasse: {0}. + /// + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValidationMethod_not_found__or_not_public___class___0_ { + get { + return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_DynamicReadOnlyValida" + + "tionMethod_not_found__or_not_public___class___0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Slechts één DynamicReadOnlyValidationMethod toegestaan per klasse: {0}. + /// + internal static string DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_Only_one_DynamicReadOnlyValidationMethod_is_allowed_per_class___0_ { + get { + return ResourceManager.GetString("DynamicReadOnlyAttribute_GetDynamicReadOnlyValidationMethod_Only_one_DynamicReadO" + + "nlyValidationMethod_is_allowed_per_class___0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} gebruikt DynanamicReadOnlyAttribute, maar heeft geen methode gemarkeerd met DynamicReadOnlyValidationMethodAttribute. + /// + internal static string DynamicReadOnlyAttribute_IsDynamicReadOnly__0__uses_DynanamicReadOnlyAttribute_but_does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute { + get { + return ResourceManager.GetString("DynamicReadOnlyAttribute_IsDynamicReadOnly__0__uses_DynanamicReadOnlyAttribute_bu" + + "t_does_not_have_method_marked_using_DynamicReadOnlyValidationMethodAttribute", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kon eigenschap {0} op type {1} niet vinden.. + /// + internal static string DynamicReadOnlyAttribute_IsDynamicReadOnly_Could_not_find_property__0__on_type__1_ { + get { + return ResourceManager.GetString("DynamicReadOnlyAttribute_IsDynamicReadOnly_Could_not_find_property__0__on_type__1" + + "_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0} gebruikt DynamicVisibleAttribute, maar heeft geen methode gemarkeerd met DynamicVisibleValidationMethodAttribute. + /// + internal static string DynamicVisibleAttribute_IsDynamicVisible__0__uses_DynamicVisibleAttribute_but_does_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute { + get { + return ResourceManager.GetString("DynamicVisibleAttribute_IsDynamicVisible__0__uses_DynamicVisibleAttribute_but_doe" + + "s_not_have_method_marked_using_DynamicVisibleValidationMethodAttribute", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kon eigenschap {0} van type {1} niet vinden. + /// + internal static string DynamicVisibleAttribute_IsDynamicVisible_Could_not_find_property__0__on_type__1_ { + get { + return ResourceManager.GetString("DynamicVisibleAttribute_IsDynamicVisible_Could_not_find_property__0__on_type__1_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Parameter 'GroupSize' moet groter zijn dan 0. /// internal static string EnumerableExtensions_SplitInGroups_GroupSize_must_be_greater_than_0 { @@ -70,6 +160,26 @@ } /// + /// Looks up a localized string similar to Thread synchronisatiefout (aanroep {1}): {0}. + /// + internal static string InvokeRequiredAttribute_LogInvokeError_Thread_synchronization_error__call__1_____0_ { + get { + return ResourceManager.GetString("InvokeRequiredAttribute_LogInvokeError_Thread_synchronization_error__call__1_____" + + "0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kon {3} niet vinden, dan wel laden.{2}Fout: {4} - {0}{2}Bestand: {5}\{1}. + /// + internal static string NativeLibrary_LoadNativeDll_Could_not_find___load__3___2_Error___4_____0__2_File___5___1_ { + get { + return ResourceManager.GetString("NativeLibrary_LoadNativeDll_Could_not_find___load__3___2_Error___4_____0__2_File_" + + "__5___1_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Geprobeerd te vervangen "features" in "feature spatial data", maar kon "feature" niet vinden in de oorspronkelijke "context": {0}. /// internal static string ObjectHelper_CouldNotFindFeatureInOriginalContext { @@ -88,6 +198,15 @@ } /// + /// Looks up a localized string similar to Kan methode {0}.TryParse(string, out {0}) niet vinden. + /// + internal static string ParseHelper_ParseHelper_Cannot_find_method__0__TryParse_string__out__0__ { + get { + return ResourceManager.GetString("ParseHelper_ParseHelper_Cannot_find_method__0__TryParse_string__out__0__", resourceCulture); + } + } + + /// /// Looks up a localized string similar to tot. /// internal static string strTill { @@ -97,6 +216,44 @@ } /// + /// Looks up a localized string similar to Exceptie opgetreden. + /// + internal static string TypeUtils_CallMethod_Exception_occured { + get { + return ResourceManager.GetString("TypeUtils_CallMethod_Exception_occured", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Geen 'default constructor' gevonden voor type {0}. + /// + internal static string TypeUtils_CreateInstance_No_default_constructor_available_for_type__0_ { + get { + return ResourceManager.GetString("TypeUtils_CreateInstance_No_default_constructor_available_for_type__0_", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Parameter 'member' is geen geldige expressie voor deze methode. + /// + internal static string TypeUtils_GetMemberNameFromMemberExpression__member__not_a_valid_expression_for_this_method { + get { + return ResourceManager.GetString("TypeUtils_GetMemberNameFromMemberExpression__member__not_a_valid_expression_for_t" + + "his_method", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to {0}, ernst: {1} ({2} fout(en), {3} waarschuwing(en), {4} info). + /// + internal static string ValidationReport_ToString__0___severity___1____2__error_s____3__warning_s____4__info_ { + get { + return ResourceManager.GetString("ValidationReport_ToString__0___severity___1____2__error_s____3__warning_s____4__i" + + "nfo_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to De buffer is te klein: buffer moet minstens {0} byte groot zijn.. /// internal static string ZipFileUtils_StreamUtilsCopy_Buffer_is_too_small_Should_be_at_least_0_ { Index: Core/Common/src/Core.Common.Utils/Properties/Resource.resx =================================================================== diff -u -r6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/Properties/Resource.resx (.../Resource.resx) (revision 6a3a7c7e3442a1c99598c8f0fe7bd95062bc8845) +++ Core/Common/src/Core.Common.Utils/Properties/Resource.resx (.../Resource.resx) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -132,4 +132,52 @@ De buffer is te klein: buffer moet minstens {0} byte groot zijn. + + Thread synchronisatiefout (aanroep {1}): {0} + + + Kon eigenschap {0} op type {1} niet vinden. + + + {0} gebruikt DynanamicReadOnlyAttribute, maar heeft geen methode gemarkeerd met DynamicReadOnlyValidationMethodAttribute + + + DynamicReadOnlyValidationMethod niet gevonden (of geen 'public' toegankelijkheid). Klasse: {0} + + + Slechts één DynamicReadOnlyValidationMethod toegestaan per klasse: {0} + + + DynamicReadOnlyValidationMethod moet 'bool' als 'return type' hebben. Klasse: {0} + + + DynamicReadOnlyValidationMethod heeft een incorrecte aantal argumenten. Zou er één moeten zijn. Klasse: {0} + + + Argument van DynamicReadOnlyValidationMethod heeft een incorrect type. Zou van het type string moeten zijn. Klasse: {0} + + + Kon eigenschap {0} van type {1} niet vinden + + + {0} gebruikt DynamicVisibleAttribute, maar heeft geen methode gemarkeerd met DynamicVisibleValidationMethodAttribute + + + Kon {3} niet vinden, dan wel laden.{2}Fout: {4} - {0}{2}Bestand: {5}\{1} + + + Geen 'default constructor' gevonden voor type {0} + + + Exceptie opgetreden + + + Parameter 'member' is geen geldige expressie voor deze methode + + + Kan methode {0}.TryParse(string, out {0}) niet vinden + + + {0}, ernst: {1} ({2} fout(en), {3} waarschuwing(en), {4} info) + \ No newline at end of file Index: Core/Common/src/Core.Common.Utils/PropertyBag/PropertyBag.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/PropertyBag/PropertyBag.cs (.../PropertyBag.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/PropertyBag/PropertyBag.cs (.../PropertyBag.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -628,7 +628,7 @@ } } - var orderedProperties = propsToOrder.OrderBy(p => p.First).Select(p => p.Second).ToList(); + var orderedProperties = propsToOrder.OrderBy(p => p.Item1).Select(p => p.Item2).ToList(); // Convert the list of PropertyDescriptors to a collection that the // ICustomTypeDescriptor can use, and return it. Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs =================================================================== diff -u -rf1c02b2d47dc561deec70a24128d8dd49d9bed6a -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision f1c02b2d47dc561deec70a24128d8dd49d9bed6a) +++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -6,6 +6,7 @@ using System.Linq.Expressions; using System.Reflection; using Core.Common.Utils.Aop; +using Core.Common.Utils.Properties; using log4net; namespace Core.Common.Utils.Reflection @@ -492,7 +493,7 @@ if (defaultConstructor == null) { - throw new NotImplementedException(string.Format("No default constructor available for type {0}", type)); + throw new NotImplementedException(string.Format(Resource.TypeUtils_CreateInstance_No_default_constructor_available_for_type__0_, type)); } return (T) Activator.CreateInstance(type, true); @@ -545,7 +546,7 @@ // re-throw original exception if (e.InnerException != null) { - log.Error("Exception occured", e); // log outer exception + log.Error(Resource.TypeUtils_CallMethod_Exception_occured, e); // log outer exception throw e.InnerException; } @@ -574,7 +575,7 @@ { return member.Member.Name; } - throw new ArgumentException("'member' not a valid expression for this method"); + throw new ArgumentException(Resource.TypeUtils_GetMemberNameFromMemberExpression__member__not_a_valid_expression_for_this_method); } private static FieldInfo GetFieldInfo(Type type, string fieldName) Index: Core/Common/src/Core.Common.Utils/StringExtensions.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/StringExtensions.cs (.../StringExtensions.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/StringExtensions.cs (.../StringExtensions.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -9,6 +9,7 @@ using System.Linq.Expressions; using System.Reflection; using System.Threading; +using Core.Common.Utils.Properties; namespace Core.Common.Utils { @@ -118,7 +119,7 @@ if (tryParseMethod == null) { - throw new InvalidOperationException(String.Format("Cannot find method {0}.TryParse(string, out {0})", type.FullName)); + throw new InvalidOperationException(String.Format(Resource.ParseHelper_ParseHelper_Cannot_find_method__0__TryParse_string__out__0__, type.FullName)); } _parser = Expression.Lambda>( Expression.Condition( @@ -155,7 +156,7 @@ if (tryParseMethod == null) { - throw new InvalidOperationException(String.Format("Cannot find method {0}.TryParse(string, out {0})", typeof(TBase).FullName)); + throw new InvalidOperationException(String.Format(Resource.ParseHelper_ParseHelper_Cannot_find_method__0__TryParse_string__out__0__, typeof(TBase).FullName)); } ParameterExpression target = Expression.Parameter(typeof(string), "target"); ParameterExpression defaultValue = Expression.Parameter(typeof(TBase?), "defaultValue"); Fisheye: Tag d6de3bdcd7e2211019e39ddf883926fb8d7b13bd refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Tuple.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs (.../ValidationReport.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/Validation/ValidationReport.cs (.../ValidationReport.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; +using Core.Common.Utils.Properties; namespace Core.Common.Utils.Validation { @@ -160,7 +161,7 @@ public override string ToString() { - return string.Format("{0}, severity: {1} ({2} error(s), {3} warning(s), {4} info)", + return string.Format(Resource.ValidationReport_ToString__0___severity___1____2__error_s____3__warning_s____4__info_, Category, Severity, ErrorCount, WarningCount, InfoCount); } Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/ChartTest.cs =================================================================== diff -u -r3debb2835679b29531ce363c17d5fde650cbdca3 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/ChartTest.cs (.../ChartTest.cs) (revision 3debb2835679b29531ce363c17d5fde650cbdca3) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/ChartTest.cs (.../ChartTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -46,32 +46,32 @@ }; chart.Series.Add(areaSeries); - TestHelper.AssertLogMessageIsGenerated(() => SaveDeleteAndAssertExport("test.svg", chart), "Hatch style is not supported for exports and will be ignored.", 1); + TestHelper.AssertLogMessageIsGenerated(() => SaveDeleteAndAssertExport("test.svg", chart), "Hatch stijl wordt niet ondersteund voor exporteren en zal genegeerd worden.", 1); } [Test] - [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Argument did not contain a filename\r\nParameter name: filename")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Argument bevat geen bestandsnaam\r\nParameter name: filename")] public void ExportAsImageThrowsOnIncompleteFileName() { SaveDeleteAndAssertExport(".noname"); } [Test] - [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Extension (.ext) not supported\r\nParameter name: filename")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Extensie (.ext) wordt niet ondersteund\r\nParameter name: filename")] public void ExportAsImageThrowsOnUnSupportedExtension() { SaveDeleteAndAssertExport("incorrect.ext"); } [Test] - [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Argument should not be null\r\nParameter name: filename")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Argument kan niet de waarde 'null' hebben\r\nParameter name: filename")] public void ExportAsImageThrowsOnNullArgument() { SaveDeleteAndAssertExport(null); } [Test] - [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Argument should have an extension\r\nParameter name: filename")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Bestandsnaam moet een extensie hebben.\r\nParameter name: filename")] public void ExportAsImageThrowsOnMissingExtension() { SaveDeleteAndAssertExport("noextension"); Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/Series/TeeChartSeriesDecoratorTest.cs =================================================================== diff -u -r3debb2835679b29531ce363c17d5fde650cbdca3 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/Series/TeeChartSeriesDecoratorTest.cs (.../TeeChartSeriesDecoratorTest.cs) (revision 3debb2835679b29531ce363c17d5fde650cbdca3) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Charting/Series/TeeChartSeriesDecoratorTest.cs (.../TeeChartSeriesDecoratorTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -9,7 +9,7 @@ public class TeeChartSeriesDecoratorTest { [Test] - [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Invalid argument for series datasource. Are you passing IEnumerable? IList and IListSource are supported")] + [ExpectedException(typeof(ArgumentException), ExpectedMessage = "Ongeldig argument for databron van series. Biedt u een IEnumerable aan? IList en IListSource worden ondersteund")] public void ThrowExceptionOnSettingInvalidDataSource() { ILineChartSeries lineChartSeries = ChartSeriesFactory.CreateLineSeries(); Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewPasteControllerTest.cs =================================================================== diff -u -r3debb2835679b29531ce363c17d5fde650cbdca3 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewPasteControllerTest.cs (.../TableViewPasteControllerTest.cs) (revision 3debb2835679b29531ce363c17d5fde650cbdca3) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewPasteControllerTest.cs (.../TableViewPasteControllerTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -469,10 +469,10 @@ { if (c.Column.AbsoluteIndex == 0 && (v.ToString() == "b")) { - return new Core.Common.Utils.Tuple("b not allowed", false); + return new Tuple("b not allowed", false); } - return new Core.Common.Utils.Tuple("", true); + return new Tuple("", true); }; var tableViewCopyPasteController = new TableViewPasteController(tableView); @@ -502,10 +502,10 @@ return tableView; } - private static Core.Common.Utils.Tuple TableViewEditorValidator(TableViewCell tableViewCell, object value) + private static Tuple TableViewEditorValidator(TableViewCell tableViewCell, object value) { // do not accept "d" - return ((string) value).Contains("d") ? new Core.Common.Utils.Tuple("", false) : new Core.Common.Utils.Tuple("", true); + return ((string) value).Contains("d") ? new Tuple("", false) : new Tuple("", true); } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs =================================================================== diff -u -reccf87bde3fc69050381990d34c439c132e3c093 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs (.../TableViewTest.cs) (revision eccf87bde3fc69050381990d34c439c132e3c093) +++ Core/Common/test/Core.Common.Base.Tests/Controls/Swf/Table/TableViewTest.cs (.../TableViewTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -853,7 +853,7 @@ var tableView = new TableView { Data = persons, - InputValidator = (tvc, obj) => new Core.Common.Utils.Tuple("first", false) + InputValidator = (tvc, obj) => new Tuple("first", false) }; //try to set the name on the first column...should fail Index: Core/Common/test/Core.Common.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/Common/test/Core.Common.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs (.../DynamicPropertyBagTest.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/test/Core.Common.Utils.Tests/PropertyBag/DynamicPropertyBagTest.cs (.../DynamicPropertyBagTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -123,7 +123,7 @@ } [Test] - [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "DynamicReadOnlyValidationMethod not found (or not public), class: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestWithoutValidationMethodClassProperties")] + [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "DynamicReadOnlyValidationMethod niet gevonden (of geen 'public' toegankelijkheid). Klasse: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestWithoutValidationMethodClassProperties")] public void ThrowsExceptionOnTypoInDynamicAttributeFunction() { var dynamicPropertyBag = new DynamicPropertyBag(new TestWithoutValidationMethodClassProperties()); @@ -187,7 +187,7 @@ } [Test] - [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "DynamicReadOnlyValidationMethod has incorrect number of arguments, should be 1 of type string, class: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestInvalidValidationMethodClassProperties")] + [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "DynamicReadOnlyValidationMethod heeft een incorrecte aantal argumenten. Zou er één moeten zijn. Klasse: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestInvalidValidationMethodClassProperties")] public void ThrowsExceptionOnInvalidValidationMethod() { var dynamicPropertyBag = new DynamicPropertyBag(new TestInvalidValidationMethodClassProperties()); @@ -209,7 +209,7 @@ } [Test] - [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "Only one DynamicReadOnlyValidationMethod is allowed per class: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestWithTwoValidationMethodsClassProperties")] + [ExpectedException(typeof(MissingMethodException), ExpectedMessage = "Slechts één DynamicReadOnlyValidationMethod toegestaan per klasse: Core.Common.Utils.Tests.PropertyBag.DynamicPropertyBagTest+TestWithTwoValidationMethodsClassProperties")] public void OnlySingleValidationMethodIsAllowed() { var dynamicPropertyBag = new DynamicPropertyBag(new TestWithTwoValidationMethodsClassProperties()); Index: Core/GIS/src/Core.GIS.NetTopologySuite.Extensions/Geometries/GeometryHelper.cs =================================================================== diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/GIS/src/Core.GIS.NetTopologySuite.Extensions/Geometries/GeometryHelper.cs (.../GeometryHelper.cs) (revision 9f01c4daf5b7af6549045ed6ac404d18419c2555) +++ Core/GIS/src/Core.GIS.NetTopologySuite.Extensions/Geometries/GeometryHelper.cs (.../GeometryHelper.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -438,13 +438,13 @@ /// /// /// - public static Common.Utils.Tuple SplitGeometryVerticalAt(IGeometry geometry, double splitPointX) + public static Tuple SplitGeometryVerticalAt(IGeometry geometry, double splitPointX) { ThrowIfArgumentInvalid(geometry, splitPointX); var rightHalf = GetRightHalfGeometry(geometry, splitPointX); var leftHalf = GetLeftHalfGeometry(geometry, splitPointX); - return new Common.Utils.Tuple(leftHalf, rightHalf); + return new Tuple(leftHalf, rightHalf); } public static IGeometry NormalizeGeometry(IGeometry geometryToNormalize) Index: Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs =================================================================== diff -u -r2a90c0c1be6114f72af65c42f0a6f334b30e4755 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs (.../GeometryHelperTest.cs) (revision 2a90c0c1be6114f72af65c42f0a6f334b30e4755) +++ Core/GIS/test/Core.GIS.NetTopologySuite.Extensions.Tests/Geometries/GeometryHelperTest.cs (.../GeometryHelperTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -86,7 +86,7 @@ new Coordinate(10, 0), new Coordinate(0, 0) }, - polygonHalfs.First.Coordinates); + polygonHalfs.Item1.Coordinates); Assert.AreEqual( new[] @@ -96,7 +96,7 @@ new Coordinate(10, 0), new Coordinate(10, 10) }, - polygonHalfs.Second.Coordinates); + polygonHalfs.Item2.Coordinates); } [Test] @@ -122,7 +122,7 @@ new Coordinate(10, 0), new Coordinate(0, 0) }, - polygonHalfs.First.Coordinates); + polygonHalfs.Item1.Coordinates); Assert.AreEqual( new[] @@ -132,7 +132,7 @@ new Coordinate(10, 0), new Coordinate(10, 10) }, - polygonHalfs.Second.Coordinates); + polygonHalfs.Item2.Coordinates); } catch (Exception ex) { @@ -169,7 +169,7 @@ new Coordinate(10, 0), new Coordinate(0, 0) }, - polygonHalfs.First.Coordinates); + polygonHalfs.Item1.Coordinates); Assert.AreEqual( new[] @@ -181,7 +181,7 @@ new Coordinate(10, 0), new Coordinate(10, 5) }, - polygonHalfs.Second.Coordinates); + polygonHalfs.Item2.Coordinates); } [Test] Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingNodePresenterBase.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingNodePresenterBase.cs (.../PipingNodePresenterBase.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingNodePresenterBase.cs (.../PipingNodePresenterBase.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -5,6 +5,7 @@ using System.Windows.Forms; using Core.Common.Controls; using Core.Common.Utils.Collections; +using Ringtoets.Piping.Forms.Properties; namespace Ringtoets.Piping.Forms.NodePresenters { @@ -127,7 +128,7 @@ /// protected virtual void OnNodeRenamed(T nodeData, string newName) { - throw new InvalidOperationException(string.Format("Cannot rename tree node of type {0}.", GetType().Name)); + throw new InvalidOperationException(string.Format(Resources.PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__, GetType().Name)); } /// @@ -217,7 +218,7 @@ /// protected virtual bool RemoveNodeData(object parentNodeData, T nodeData) { - throw new InvalidOperationException(String.Format("Cannot delete node of type {0}.", GetType().Name)); + throw new InvalidOperationException(String.Format(Resources.PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__, GetType().Name)); } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineCollectionNodePresenter.cs =================================================================== diff -u -r8df04aa7166563cc67a1b7e70f9f4b8867e454b7 -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineCollectionNodePresenter.cs (.../PipingSurfaceLineCollectionNodePresenter.cs) (revision 8df04aa7166563cc67a1b7e70f9f4b8867e454b7) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingSurfaceLineCollectionNodePresenter.cs (.../PipingSurfaceLineCollectionNodePresenter.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -65,7 +65,7 @@ public void OnNodeRenamed(object nodeData, string newName) { - throw new InvalidOperationException(string.Format("Cannot rename tree node of type {0}.", GetType().Name)); + throw new InvalidOperationException(string.Format(Resources.PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__, GetType().Name)); } public void OnNodeChecked(ITreeNode node) {} @@ -109,7 +109,7 @@ public bool RemoveNodeData(object parentNodeData, object nodeData) { - throw new InvalidOperationException(String.Format("Cannot delete node of type {0}.", GetType().Name)); + throw new InvalidOperationException(String.Format(Resources.PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__, GetType().Name)); } private ContextMenuStrip CreateContextMenu() Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r433c616fe5bea47bcc0645eb61991623530e337e -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 433c616fe5bea47bcc0645eb61991623530e337e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.18063 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -804,6 +804,24 @@ } /// + /// Looks up a localized string similar to Kan node uit boom van type {0} niet hernoemen.. + /// + public static string PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__ { + get { + return ResourceManager.GetString("PipingNodePresenterBase_OnNodeRenamed_Cannot_rename_tree_node_of_type__0__", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Kan node uit boom van type {0} niet verwijderen.. + /// + public static string PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__ { + get { + return ResourceManager.GetString("PipingNodePresenterBase_RemoveNodeData_Cannot_delete_node_of_type__0__", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Piping resultaat. /// public static string PipingOutput_DisplayName { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -r433c616fe5bea47bcc0645eb61991623530e337e -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision 433c616fe5bea47bcc0645eb61991623530e337e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -493,4 +493,10 @@ Algemeen + + Kan node uit boom van type {0} niet hernoemen. + + + Kan node uit boom van type {0} niet verwijderen. + \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs =================================================================== diff -u -r4d688bb446eb4508ff3b54b06baefbb71f60237a -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs (.../PipingCalculationInputsNodePresenterTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationInputsNodePresenterTest.cs (.../PipingCalculationInputsNodePresenterTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -439,7 +439,7 @@ // Assert var exception = Assert.Throws(removeAction); - var expectedMessage = string.Format("Cannot delete node of type {0}.", nodePresenter.GetType().Name); + var expectedMessage = string.Format("Kan node uit boom van type {0} niet verwijderen.", nodePresenter.GetType().Name); Assert.AreEqual(expectedMessage, exception.Message); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs =================================================================== diff -u -r433c616fe5bea47bcc0645eb61991623530e337e -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs (.../PipingFailureMechanismNodePresenterTest.cs) (revision 433c616fe5bea47bcc0645eb61991623530e337e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs (.../PipingFailureMechanismNodePresenterTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -141,7 +141,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = string.Format("Cannot rename tree node of type {0}.", nodePresenter.GetType().Name); + var expectedMessage = string.Format("Kan node uit boom van type {0} niet hernoemen.", nodePresenter.GetType().Name); Assert.AreEqual(expectedMessage, exception.Message); mocks.ReplayAll(); // Expect no calls on tree node } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingNodePresenterBaseTest.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingNodePresenterBaseTest.cs (.../PipingNodePresenterBaseTest.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingNodePresenterBaseTest.cs (.../PipingNodePresenterBaseTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -114,7 +114,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = string.Format("Cannot rename tree node of type {0}.", nodePresenter.GetType().Name); + var expectedMessage = string.Format("Kan node uit boom van type {0} niet hernoemen.", nodePresenter.GetType().Name); Assert.AreEqual(expectedMessage, exception.Message); mocks.ReplayAll(); // Expect no calls on tree node } @@ -316,7 +316,7 @@ // Assert var exception = Assert.Throws(call); - Assert.AreEqual(String.Format("Cannot delete node of type {0}.", nodePresenter.GetType().Name), exception.Message); + Assert.AreEqual(String.Format("Kan node uit boom van type {0} niet verwijderen.", nodePresenter.GetType().Name), exception.Message); } private class SimplePipingNodePresenterBase : PipingNodePresenterBase Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs =================================================================== diff -u -r4d688bb446eb4508ff3b54b06baefbb71f60237a -rd6de3bdcd7e2211019e39ddf883926fb8d7b13bd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs (.../PipingSurfaceLineCollectionNodePresenterTest.cs) (revision 4d688bb446eb4508ff3b54b06baefbb71f60237a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingSurfaceLineCollectionNodePresenterTest.cs (.../PipingSurfaceLineCollectionNodePresenterTest.cs) (revision d6de3bdcd7e2211019e39ddf883926fb8d7b13bd) @@ -150,7 +150,7 @@ // Assert var exception = Assert.Throws(call); - var expectedMessage = string.Format("Cannot rename tree node of type {0}.", nodePresenter.GetType().Name); + var expectedMessage = string.Format("Kan node uit boom van type {0} niet hernoemen.", nodePresenter.GetType().Name); Assert.AreEqual(expectedMessage, exception.Message); mocks.ReplayAll(); // Expect no calls on tree node } @@ -388,7 +388,7 @@ // assert var exception = Assert.Throws(call); - var expectedMessage = string.Format("Cannot delete node of type {0}.", nodePresenter.GetType().Name); + var expectedMessage = string.Format("Kan node uit boom van type {0} niet verwijderen.", nodePresenter.GetType().Name); Assert.AreEqual(expectedMessage, exception.Message); mocks.VerifyAll(); // Expect no calls on arguments }