diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs index 43e4465b4209f77b57b67825f0b1091197b898d9..ff7190924fb7456f9c7aa8ee593ed667e808d89c 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/InterimStageBusVehicleViewModel_v2_8.cs @@ -1185,7 +1185,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation case nameof(PredictiveCruiseControlNullable): case nameof(ATEcoRollReleaseLockupClutch): if (AdasEditingEnabled == true && this.GetType().GetProperty(propertyName).GetValue(this) == null){ - result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}"; + result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled."; } break; default: @@ -1193,12 +1193,12 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation var propertyValue = this.GetType().GetProperty(propertyName)?.GetValue(this); if (propertyValue == null) { result = - $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}"; + $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled."; } else { if (propertyValue.GetType() == typeof(string) && string.IsNullOrWhiteSpace(propertyValue as string)) { result = - $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}"; + $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled."; } } } diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs index 99eb26c63108101ffe0dedb2b332902b2a0ffe8d..711b9bce5ee50f17ffc5f82927e7ae4157edfa7b 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/MultistageAuxiliariesViewModel.cs @@ -632,13 +632,13 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation case nameof(SystemConfiguration): if (HeatPumpGroupEditingEnabled == true && this.GetType().GetProperty(propertyName).GetValue(this) == null) { - result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}"; + result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled."; } break; default: if (_parameterViewModels[propertyName].EditingEnabled == true && this.GetType().GetProperty(propertyName).GetValue(this) == null) { - result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled}}"; + result = $"{NameResolver.ResolveName(propertyName, BusStrings.ResourceManager, Strings.ResourceManager)} has to be set if editing is enabled."; } break; } diff --git a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs index a4284ead6662d92695071321439e4481a70bd026..3bb13847a8ed793a7b530ae7e39a991e36cf34c3 100644 --- a/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs +++ b/VECTO3GUI2020/ViewModel/MultiStage/Implementation/StageViewModelBase.cs @@ -154,7 +154,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation { var dialogHelper = _multistageDependencies.DialogHelper; if (VehicleViewModel.HasErrors) { - var errorMessage = "Vehicle\n"; + var errorMessage = "Vehicle:\n"; var vehicleErrorInfo = VehicleViewModel as IDataErrorInfo; errorMessage += vehicleErrorInfo.Error.Replace(",", "\n"); @@ -163,7 +163,7 @@ namespace VECTO3GUI2020.ViewModel.MultiStage.Implementation VehicleViewModel.MultistageAuxiliariesViewModel as IDataErrorInfo; if (auxiliariesErrorInfo != null && !auxiliariesErrorInfo.Error.IsNullOrEmpty()) { - errorMessage += "\n Auxiliaries \n"; + errorMessage += "\nAuxiliaries:\n"; errorMessage += auxiliariesErrorInfo.Error.Replace(",", "\n"); }